From a321a765cdacd448ebcba9948e3c131b24336c5a Mon Sep 17 00:00:00 2001 From: akarnokd Date: Tue, 25 Jun 2019 13:37:08 +0200 Subject: [PATCH 001/203] Adapt to RxJava 3.x --- README.md | 80 ++-- build.gradle | 6 +- gradle.properties | 2 +- settings.gradle | 2 +- .../{rxjava2 => rxjava3}/ExamplePerf.java | 2 +- .../{rxjava2 => rxjava3}/FlatMapExPerf.java | 4 +- .../PerfAsyncConsumer.java | 2 +- .../{rxjava2 => rxjava3}/PerfConsumer.java | 2 +- ...owableOnAssemblyConnectableResettable.java | 63 --- ...rvableOnAssemblyConnectableResettable.java | 57 --- .../{rxjava2 => rxjava3}/async/AnyValue.java | 2 +- .../async/AsyncFlowable.java | 231 ++++++----- .../async/AsyncObservable.java | 179 +++++---- .../async/DisposableFlowable.java | 2 +- .../async/DisposableObservable.java | 2 +- .../async/FlowableFromCallableNull.java | 21 +- .../async/FutureCompletable.java | 2 +- .../async/ObservableFromSupplierNull.java} | 27 +- .../async/package-info.java | 6 +- .../BasicEmptyQueueSubscription.java | 2 +- .../BasicNonoIntQueueSubscription.java | 2 +- .../basetypes/BasicNonoSubscriber.java | 2 +- .../basetypes/BasicRefNonoSubscriber.java | 2 +- .../basetypes/BasicRefQueueSubscription.java | 2 +- .../basetypes/BasicSoloQueueSubscription.java | 2 +- .../basetypes/BlockingGetSubscriber.java | 2 +- .../basetypes/FuturePerhapsSubscriber.java | 2 +- .../{rxjava2 => rxjava3}/basetypes/Nono.java | 24 +- .../basetypes/NonoAmbArray.java | 4 +- .../basetypes/NonoAmbIterable.java | 4 +- .../basetypes/NonoAndThen.java | 2 +- .../basetypes/NonoAndThenPublisher.java | 2 +- .../NonoBlockingAwaitSubscriber.java | 2 +- .../basetypes/NonoCache.java | 2 +- .../basetypes/NonoComplete.java | 9 +- .../basetypes/NonoConcat.java | 2 +- .../basetypes/NonoConcatArray.java | 2 +- .../basetypes/NonoConcatIterable.java | 2 +- .../basetypes/NonoCreate.java | 2 +- .../basetypes/NonoDefer.java | 11 +- .../basetypes/NonoDelay.java | 2 +- .../basetypes/NonoDelaySubscription.java | 2 +- .../basetypes/NonoDoFinally.java | 2 +- .../basetypes/NonoDoOnLifecycle.java | 2 +- .../basetypes/NonoError.java | 12 +- .../basetypes/NonoErrorSupplier.java | 20 +- .../basetypes/NonoFlatMapSignal.java | 15 +- .../basetypes/NonoFromAction.java | 10 +- .../basetypes/NonoFromCompletable.java | 2 +- .../basetypes/NonoFromFuture.java | 7 +- .../basetypes/NonoFromMaybe.java | 2 +- .../basetypes/NonoFromObservable.java | 2 +- .../basetypes/NonoFromPublisher.java | 2 +- .../basetypes/NonoFromSingle.java | 2 +- .../basetypes/NonoHide.java | 4 +- .../basetypes/NonoLambdaSubscriber.java | 2 +- .../basetypes/NonoLift.java | 2 +- .../basetypes/NonoMapError.java | 2 +- .../basetypes/NonoMerge.java | 2 +- .../basetypes/NonoMergeArray.java | 4 +- .../basetypes/NonoMergeIterable.java | 6 +- .../basetypes/NonoNever.java | 2 +- .../basetypes/NonoObserveOn.java | 2 +- .../basetypes/NonoOnErrorComplete.java | 2 +- .../basetypes/NonoOnErrorResume.java | 2 +- .../basetypes/NonoProcessor.java | 2 +- .../basetypes/NonoRepeat.java | 2 +- .../basetypes/NonoRepeatUntil.java | 2 +- .../basetypes/NonoRepeatWhen.java | 2 +- .../basetypes/NonoRetry.java | 4 +- .../basetypes/NonoRetryWhen.java | 4 +- .../basetypes/NonoRetryWhile.java | 2 +- .../basetypes/NonoSubscribeOn.java | 2 +- .../basetypes/NonoTakeUntil.java | 2 +- .../basetypes/NonoTimeout.java | 2 +- .../basetypes/NonoTimer.java | 2 +- .../basetypes/NonoToMaybe.java | 2 +- .../basetypes/NonoToPerhaps.java | 2 +- .../basetypes/NonoUnsubscribeOn.java | 2 +- .../basetypes/NonoUsing.java | 10 +- .../basetypes/Perhaps.java | 16 +- .../basetypes/PerhapsAmbArray.java | 4 +- .../basetypes/PerhapsAmbIterable.java | 4 +- .../basetypes/PerhapsAndThenNono.java | 2 +- .../basetypes/PerhapsCache.java | 2 +- .../basetypes/PerhapsCreate.java | 2 +- .../basetypes/PerhapsDefaultIfEmpty.java | 2 +- .../basetypes/PerhapsDefer.java | 11 +- .../basetypes/PerhapsDelay.java | 2 +- .../basetypes/PerhapsDelayPublisher.java | 2 +- .../basetypes/PerhapsDelaySubscription.java | 2 +- .../basetypes/PerhapsDoFinally.java | 4 +- .../basetypes/PerhapsDoOnLifecycle.java | 4 +- .../basetypes/PerhapsEmpty.java | 9 +- .../basetypes/PerhapsError.java | 12 +- .../basetypes/PerhapsErrorSupplier.java | 20 +- .../basetypes/PerhapsFilter.java | 4 +- .../basetypes/PerhapsFlatMap.java | 2 +- .../basetypes/PerhapsFlatMapPublisher.java | 2 +- .../basetypes/PerhapsFlatMapSignal.java | 15 +- .../basetypes/PerhapsFromAction.java | 12 +- .../basetypes/PerhapsFromCallable.java | 2 +- .../basetypes/PerhapsFromCompletable.java | 2 +- .../basetypes/PerhapsFromFuture.java | 2 +- .../basetypes/PerhapsFromMaybe.java | 2 +- .../basetypes/PerhapsFromPublisher.java | 2 +- .../basetypes/PerhapsFromSingle.java | 4 +- .../basetypes/PerhapsHide.java | 4 +- .../basetypes/PerhapsJust.java | 8 +- .../basetypes/PerhapsLift.java | 2 +- .../basetypes/PerhapsMap.java | 4 +- .../basetypes/PerhapsMapError.java | 4 +- .../basetypes/PerhapsNever.java | 2 +- .../basetypes/PerhapsObserveOn.java | 4 +- .../basetypes/PerhapsOnErrorResumeNext.java | 2 +- .../basetypes/PerhapsOnErrorResumeWith.java | 2 +- .../basetypes/PerhapsOnErrorReturnItem.java | 2 +- .../basetypes/PerhapsProcessor.java | 2 +- .../basetypes/PerhapsRetry.java | 2 +- .../basetypes/PerhapsRetryWhen.java | 2 +- .../basetypes/PerhapsRetryWhile.java | 2 +- .../basetypes/PerhapsSubscribeOn.java | 4 +- .../basetypes/PerhapsSwitchIfEmpty.java | 2 +- .../basetypes/PerhapsTakeUntil.java | 2 +- .../basetypes/PerhapsTimeout.java | 2 +- .../basetypes/PerhapsTimer.java | 4 +- .../basetypes/PerhapsToFlowable.java | 2 +- .../basetypes/PerhapsToMaybe.java | 2 +- .../basetypes/PerhapsToObservable.java | 2 +- .../basetypes/PerhapsUnsubscribeOn.java | 4 +- .../basetypes/PerhapsUsing.java | 12 +- .../basetypes/PerhapsZipArray.java | 2 +- .../basetypes/PerhapsZipIterable.java | 4 +- .../{rxjava2 => rxjava3}/basetypes/Solo.java | 10 +- .../basetypes/SoloAmbArray.java | 4 +- .../basetypes/SoloAmbIterable.java | 4 +- .../basetypes/SoloAndThen.java | 2 +- .../basetypes/SoloCache.java | 2 +- .../basetypes/SoloCreate.java | 2 +- .../basetypes/SoloDefer.java | 11 +- .../basetypes/SoloDelay.java | 2 +- .../basetypes/SoloDelayPublisher.java | 2 +- .../basetypes/SoloDelaySubscription.java | 2 +- .../basetypes/SoloDoFinally.java | 4 +- .../basetypes/SoloDoOnLifecycle.java | 4 +- .../basetypes/SoloError.java | 12 +- .../basetypes/SoloErrorSupplier.java | 20 +- .../basetypes/SoloFilter.java | 4 +- .../basetypes/SoloFlatMap.java | 2 +- .../basetypes/SoloFlatMapPublisher.java | 2 +- .../basetypes/SoloFlatMapSignal.java | 2 +- .../basetypes/SoloFromCallable.java | 2 +- .../basetypes/SoloFromFuture.java | 2 +- .../basetypes/SoloFromPublisher.java | 2 +- .../basetypes/SoloFromSingle.java | 2 +- .../basetypes/SoloHide.java | 2 +- .../basetypes/SoloJust.java | 8 +- .../basetypes/SoloLift.java | 2 +- .../basetypes/SoloMap.java | 4 +- .../basetypes/SoloMapError.java | 4 +- .../basetypes/SoloNever.java | 2 +- .../basetypes/SoloObserveOn.java | 6 +- .../basetypes/SoloOnErrorResumeNext.java | 2 +- .../basetypes/SoloOnErrorResumeWith.java | 2 +- .../basetypes/SoloOnErrorReturnItem.java | 2 +- .../basetypes/SoloProcessor.java | 2 +- .../basetypes/SoloRetry.java | 2 +- .../basetypes/SoloRetryWhen.java | 2 +- .../basetypes/SoloRetryWhile.java | 2 +- .../basetypes/SoloSubscribeOn.java | 2 +- .../basetypes/SoloTakeUntil.java | 2 +- .../basetypes/SoloTimeout.java | 2 +- .../basetypes/SoloTimer.java | 2 +- .../basetypes/SoloToFlowable.java | 2 +- .../basetypes/SoloToObservable.java | 2 +- .../basetypes/SoloToSingle.java | 2 +- .../basetypes/SoloUnsubscribeOn.java | 4 +- .../basetypes/SoloUsing.java | 9 +- .../basetypes/SoloZipArray.java | 2 +- .../basetypes/SoloZipIterable.java | 8 +- .../basetypes/package-info.java | 6 +- .../AbstractDisposableAutoRelease.java | 2 +- .../consumers/CompletableConsumers.java | 2 +- .../DisposableAutoReleaseMultiObserver.java | 2 +- .../DisposableAutoReleaseObserver.java | 2 +- .../DisposableAutoReleaseSubscriber.java | 2 +- .../consumers/FlowableConsumers.java | 2 +- .../consumers/MaybeConsumers.java | 2 +- .../consumers/ObservableConsumers.java | 2 +- .../consumers/SingleConsumers.java | 2 +- .../consumers/package-info.java | 12 +- .../debug/CompletableOnAssembly.java | 2 +- .../CompletableOnAssemblyScalarSupplier.java} | 14 +- .../debug/CompletableOnAssemblySupplier.java} | 19 +- .../debug/FlowableOnAssembly.java | 6 +- .../debug/FlowableOnAssemblyConnectable.java | 9 +- .../FlowableOnAssemblyScalarSupplier.java} | 12 +- .../debug/FlowableOnAssemblySupplier.java} | 19 +- .../debug/MaybeOnAssembly.java | 2 +- .../debug/MaybeOnAssemblyScalarSupplier.java} | 14 +- .../debug/MaybeOnAssemblySupplier.java} | 17 +- .../debug/ObservableOnAssembly.java | 4 +- .../ObservableOnAssemblyConnectable.java | 9 +- .../ObservableOnAssemblyScalarSupplier.java} | 14 +- .../debug/ObservableOnAssemblySupplier.java} | 19 +- .../debug/ParallelFlowableOnAssembly.java | 4 +- .../debug/RxJavaAssemblyException.java | 2 +- .../debug/RxJavaAssemblyTracking.java | 54 ++- .../debug/SavedHooks.java | 2 +- .../debug/SingleOnAssembly.java | 2 +- .../SingleOnAssemblyScalarSupplier.java} | 14 +- .../debug/SingleOnAssemblySupplier.java} | 19 +- .../debug/multihook/MultiHandlerManager.java | 2 +- .../OnScheduleMultiHandlerManager.java | 4 +- .../debug/multihook/package-info.java | 4 +- .../debug/package-info.java | 4 +- .../debug/validator/CompletableValidator.java | 4 +- .../ConnectableFlowableValidator.java | 9 +- .../ConnectableObservableValidator.java | 9 +- .../debug/validator/FlowableValidator.java | 4 +- .../debug/validator/MaybeValidator.java | 4 +- .../MultipleOnSubscribeCallsException.java | 2 +- .../MultipleTerminationsException.java | 2 +- .../NullOnErrorParameterException.java | 2 +- .../NullOnNextParameterException.java | 2 +- .../NullOnSubscribeParameterException.java | 2 +- .../NullOnSuccessParameterException.java | 2 +- .../debug/validator/ObservableValidator.java | 4 +- .../OnNextAfterTerminationException.java | 2 +- .../OnSubscribeNotCalledException.java | 2 +- .../OnSuccessAfterTerminationException.java | 2 +- .../validator/ParallelFlowableValidator.java | 4 +- .../ProtocolNonConformanceException.java | 2 +- .../validator/RxJavaProtocolValidator.java | 22 +- .../debug/validator/SingleValidator.java | 4 +- .../debug/validator/package-info.java | 4 +- .../expr/CompletableIfThen.java | 2 +- .../expr/CompletableSwitchCase.java | 18 +- .../expr/FlowableIfThen.java | 2 +- .../expr/FlowableSwitchCase.java | 10 +- .../expr/FlowableWhileDoWhile.java | 2 +- .../expr/MaybeIfThen.java | 2 +- .../expr/MaybeSwitchCase.java | 18 +- .../expr/ObservableIfThen.java | 2 +- .../expr/ObservableSwitchCase.java | 10 +- .../expr/ObservableWhileDoWhile.java | 2 +- .../expr/SingleIfThen.java | 2 +- .../expr/SingleSwitchCase.java | 18 +- .../expr/StatementCompletable.java | 21 +- .../expr/StatementFlowable.java | 13 +- .../expr/StatementMaybe.java | 19 +- .../expr/StatementObservable.java | 15 +- .../expr/StatementSingle.java | 18 +- .../expr/package-info.java | 6 +- .../functions/Consumer3.java | 6 +- .../functions/Consumer4.java | 6 +- .../functions/Consumer5.java | 6 +- .../functions/Consumer6.java | 6 +- .../functions/Consumer7.java | 6 +- .../functions/Consumer8.java | 6 +- .../functions/Consumer9.java | 6 +- .../functions/FunctionTagging.java | 2 +- .../functions/FunctionsEx.java | 2 +- .../functions/PlainBiConsumer.java | 2 +- .../functions/PlainBiFunction.java | 2 +- .../functions/PlainConsumer.java | 2 +- .../functions/PlainFunction.java | 2 +- .../functions/PlainFunction3.java | 2 +- .../functions/PlainFunction4.java | 2 +- .../functions/PlainFunction5.java | 2 +- .../functions/PlainFunction6.java | 2 +- .../functions/PlainFunction7.java | 2 +- .../functions/PlainFunction8.java | 2 +- .../functions/PlainFunction9.java | 2 +- .../functions/SimpleCallable.java} | 4 +- .../functions/package-info.java | 2 +- .../joins/ActivePlan0.java | 4 +- .../joins/ActivePlan1.java | 4 +- .../joins/ActivePlan2.java | 4 +- .../joins/ActivePlan3.java | 6 +- .../joins/ActivePlan4.java | 6 +- .../joins/ActivePlan5.java | 6 +- .../joins/ActivePlan6.java | 6 +- .../joins/ActivePlan7.java | 6 +- .../joins/ActivePlan8.java | 6 +- .../joins/ActivePlan9.java | 6 +- .../joins/ActivePlanN.java | 4 +- .../joins/JoinObservable.java | 2 +- .../joins/JoinObserver.java | 2 +- .../joins/JoinObserver1.java | 2 +- .../joins/JoinPatterns.java | 2 +- .../{rxjava2 => rxjava3}/joins/Pattern1.java | 2 +- .../{rxjava2 => rxjava3}/joins/Pattern2.java | 2 +- .../{rxjava2 => rxjava3}/joins/Pattern3.java | 2 +- .../{rxjava2 => rxjava3}/joins/Pattern4.java | 2 +- .../{rxjava2 => rxjava3}/joins/Pattern5.java | 2 +- .../{rxjava2 => rxjava3}/joins/Pattern6.java | 2 +- .../{rxjava2 => rxjava3}/joins/Pattern7.java | 2 +- .../{rxjava2 => rxjava3}/joins/Pattern8.java | 2 +- .../{rxjava2 => rxjava3}/joins/Pattern9.java | 2 +- .../{rxjava2 => rxjava3}/joins/PatternN.java | 2 +- .../{rxjava2 => rxjava3}/joins/Plan.java | 2 +- .../{rxjava2 => rxjava3}/joins/Plan1.java | 4 +- .../{rxjava2 => rxjava3}/joins/Plan2.java | 4 +- .../{rxjava2 => rxjava3}/joins/Plan3.java | 6 +- .../{rxjava2 => rxjava3}/joins/Plan4.java | 6 +- .../{rxjava2 => rxjava3}/joins/Plan5.java | 6 +- .../{rxjava2 => rxjava3}/joins/Plan6.java | 6 +- .../{rxjava2 => rxjava3}/joins/Plan7.java | 6 +- .../{rxjava2 => rxjava3}/joins/Plan8.java | 6 +- .../{rxjava2 => rxjava3}/joins/Plan9.java | 6 +- .../{rxjava2 => rxjava3}/joins/PlanN.java | 4 +- .../joins/package-info.java | 4 +- .../math/FlowableAverageDouble.java | 2 +- .../math/FlowableAverageFloat.java | 2 +- .../math/FlowableMinMax.java | 2 +- .../math/FlowableSource.java | 2 +- .../math/FlowableSumDouble.java | 2 +- .../math/FlowableSumFloat.java | 2 +- .../math/FlowableSumInt.java | 2 +- .../math/FlowableSumLong.java | 2 +- .../math/MathFlowable.java | 4 +- .../math/MathObservable.java | 4 +- .../math/ObservableAverageDouble.java | 2 +- .../math/ObservableAverageFloat.java | 2 +- .../math/ObservableMinMax.java | 2 +- .../math/ObservableSource.java | 2 +- .../math/ObservableSumDouble.java | 2 +- .../math/ObservableSumFloat.java | 2 +- .../math/ObservableSumInt.java | 2 +- .../math/ObservableSumLong.java | 2 +- .../math/package-info.java | 6 +- .../operators/BasicEmitter.java | 2 +- .../operators/BasicMergeSubscription.java | 2 +- .../CompletableFlatMapSignalCompletable.java | 15 +- .../CompletableFlatMapSignalFlowable.java | 15 +- .../CompletableFlatMapSignalMaybe.java | 15 +- .../CompletableFlatMapSignalObservable.java | 15 +- .../CompletableFlatMapSignalSingle.java | 15 +- .../operators/CompletableTransformers.java | 8 +- .../operators/Completables.java | 16 +- .../operators/ExpandStrategy.java | 2 +- .../operators/FlowableAsyncEmitter.java | 2 +- .../operators/FlowableBufferPredicate.java | 21 +- .../operators/FlowableCacheLast.java | 2 +- .../operators/FlowableCoalesce.java | 17 +- .../operators/FlowableDebounceFirst.java | 2 +- .../operators/FlowableErrorJump.java | 2 +- .../operators/FlowableEvery.java | 2 +- .../operators/FlowableExpand.java | 2 +- .../operators/FlowableFilterAsync.java | 13 +- .../operators/FlowableFlatMapAsync.java | 4 +- .../operators/FlowableFlatMapSync.java | 2 +- .../operators/FlowableGenerateAsync.java | 9 +- .../operators/FlowableIndexOf.java | 2 +- .../FlowableIntervalBackpressure.java | 2 +- .../operators/FlowableMapAsync.java | 7 +- .../operators/FlowableMapFilter.java | 6 +- .../FlowableOnBackpressureTimeout.java | 2 +- .../operators/FlowableOrderedMerge.java | 2 +- .../operators/FlowablePartialCollect.java | 2 +- .../operators/FlowableRepeatScalar.java | 2 +- .../operators/FlowableRepeatSupplier.java} | 55 ++- .../operators/FlowableRequestObserveOn.java | 2 +- .../operators/FlowableRequestSample.java | 2 +- .../operators/FlowableRequestSampleTime.java | 2 +- .../operators/FlowableSpanout.java | 2 +- .../operators/FlowableSwitchFlatMap.java | 2 +- .../operators/FlowableSwitchIfEmptyMany.java | 2 +- .../FlowableSwitchIfEmptyManyArray.java | 2 +- .../operators/FlowableSwitchOnFirst.java | 2 +- .../operators/FlowableTimeoutLast.java | 2 +- .../operators/FlowableTransformers.java | 23 +- .../operators/FlowableValve.java | 2 +- .../operators/FlowableWindowPredicate.java | 2 +- .../operators/FlowableZipLatest.java | 2 +- .../operators/Flowables.java | 18 +- .../MaybeFlatMapSignalCompletable.java | 15 +- .../operators/MaybeFlatMapSignalFlowable.java | 15 +- .../operators/MaybeFlatMapSignalMaybe.java | 15 +- .../MaybeFlatMapSignalObservable.java | 15 +- .../operators/MaybeFlatMapSignalSingle.java | 15 +- .../operators/MaybeTransformers.java | 8 +- .../operators/Maybes.java | 16 +- .../operators/ObservableErrorJump.java | 2 +- .../operators/ObservableFilterAsync.java | 2 +- .../operators/ObservableFlatMapDrop.java | 2 +- .../operators/ObservableFlatMapLatest.java | 2 +- .../operators/ObservableIndexOf.java | 2 +- .../operators/ObservableMapAsync.java | 2 +- .../operators/ObservableObserveOnDrop.java | 2 +- .../operators/ObservableObserveOnLatest.java | 2 +- .../operators/ObservableTransformers.java | 4 +- .../operators/ObservableValve.java | 2 +- .../operators/Observables.java | 2 +- .../operators/PartialCollectEmitter.java | 2 +- .../SingleFlatMapSignalCompletable.java | 2 +- .../SingleFlatMapSignalFlowable.java | 2 +- .../operators/SingleFlatMapSignalMaybe.java | 2 +- .../SingleFlatMapSignalObservable.java | 2 +- .../operators/SingleFlatMapSignalSingle.java | 2 +- .../operators/SingleTransformers.java | 2 +- .../operators/Singles.java | 4 +- .../operators/package-info.java | 22 +- .../parallel/ParallelOrderedMerge.java | 4 +- .../parallel/ParallelSumDouble.java | 2 +- .../parallel/ParallelSumInteger.java | 2 +- .../parallel/ParallelSumLong.java | 2 +- .../parallel/ParallelTransformers.java | 2 +- .../parallel/package-info.java | 4 +- .../processors/DispatchWorkProcessor.java | 4 +- .../processors/FlowableProcessorWrap.java | 2 +- .../processors/FlowableProcessors.java | 2 +- .../processors/RefCountProcessor.java | 2 +- .../processors/package-info.java | 6 +- .../schedulers/BlockingScheduler.java | 2 +- .../schedulers/ParallelScheduler.java | 2 +- .../schedulers/SharedScheduler.java | 2 +- .../schedulers/package-info.java | 8 +- .../string/FlowableCharSequence.java | 2 +- .../string/FlowableSplit.java | 2 +- .../string/ObservableCharSequence.java | 2 +- .../string/StringFlowable.java | 2 +- .../string/StringObservable.java | 2 +- .../string/package-info.java | 6 +- .../subjects/DispatchWorkSubject.java | 4 +- .../subjects/RefCountSubject.java | 2 +- .../subjects/Subjects.java | 2 +- .../subjects/UnicastWorkSubject.java | 2 +- .../subjects/package-info.java | 8 +- .../util/AlwaysFalseBooleanSupplier.java | 2 +- .../util/AlwaysTrueBooleanSupplier.java | 2 +- .../util/BiFunctionSecondIdentity.java | 2 +- .../util/CompositeSubscription.java | 2 +- .../util/SelfComparator.java | 2 +- .../util/SneakyThrows.java | 4 +- .../util/SpmcLinkedArrayQueue.java | 2 +- .../util/SpscOneQueue.java | 2 +- .../util/package-info.java | 2 +- .../async/AsyncFlowableTest.java | 149 ++++--- .../async/AsyncObservableTest.java | 226 +++-------- .../basetypes/NonoProcessorTest.java | 4 +- .../basetypes/NonoTest.java | 109 +++-- .../basetypes/PerhapsTest.java | 46 +-- .../basetypes/SoloTest.java | 38 +- .../consumers/CompletableConsumersTest.java | 4 +- .../consumers/FlowableConsumersTest.java | 4 +- .../consumers/MaybeConsumersTest.java | 4 +- .../consumers/ObservableConsumersTest.java | 4 +- .../consumers/SingleConsumersTest.java | 4 +- .../debug/RxJava3AssemblyTrackingTest.java} | 43 +- .../OnScheduleMultiHandlerManagerTest.java | 4 +- .../RxJavaProtocolValidatorTest.java | 16 +- .../expr/StatementCompletableTest.java | 35 +- .../expr/StatementFlowableTest.java | 27 +- .../expr/StatementMaybeTest.java | 30 +- .../expr/StatementObservableTest.java | 27 +- .../expr/StatementSingleTest.java | 31 +- .../functions/FunctionTaggingTest.java | 86 ++-- .../joins/OperatorJoinsTest.java | 8 +- .../math/MathFlowableTest.java | 6 +- .../math/MathObservableTest.java | 6 +- ...mpletableFlatMapSignalCompletableTest.java | 38 +- .../CompletableFlatMapSignalFlowableTest.java | 60 +-- .../CompletableFlatMapSignalMaybeTest.java | 56 +-- ...ompletableFlatMapSignalObservableTest.java | 56 +-- .../CompletableFlatMapSignalSingleTest.java | 50 +-- .../CompletableTransformersTest.java | 4 +- .../operators/CompletablesTest.java | 4 +- .../FlowableBufferPredicateTest.java | 23 +- .../operators/FlowableCacheLastTest.java | 4 +- .../operators/FlowableCoalesceTest.java | 9 +- .../operators/FlowableDebounceFirstTest.java | 2 +- .../operators/FlowableErrorJumpTest.java | 4 +- .../operators/FlowableEveryTest.java | 2 +- .../operators/FlowableExpandTest.java | 19 +- .../operators/FlowableFilterAsyncTest.java | 6 +- .../operators/FlowableFlatMapAsyncTest.java | 2 +- .../operators/FlowableFlatMapSyncTest.java | 2 +- .../operators/FlowableGenerateAsyncTest.java | 213 +++++----- .../operators/FlowableIndexOfTest.java | 2 +- .../FlowableIntervalBackpressureTest.java | 2 +- .../operators/FlowableMapAsyncTest.java | 6 +- .../FlowableMapFilterConditionalTest.java | 29 +- .../operators/FlowableMapFilterTest.java | 29 +- .../FlowableOnBackpressureTimeoutTest.java | 4 +- .../operators/FlowableOrderedMergeTest.java | 49 +-- .../operators/FlowablePartialCollectTest.java | 7 +- .../operators/FlowableRepeatCallableTest.java | 44 +- .../FlowableRequestObserveOnTest.java | 2 +- .../operators/FlowableRequestSampleTest.java | 8 +- .../FlowableRequestSampleTimeTest.java | 6 +- .../operators/FlowableSpanoutTest.java | 2 +- .../operators/FlowableSwitchFlatMapTest.java | 4 +- .../FlowableSwitchIfEmptyManyArrayTest.java | 2 +- .../FlowableSwitchIfEmptyManyTest.java | 2 +- .../operators/FlowableSwitchOnFirstTest.java | 4 +- .../operators/FlowableTimeoutLastTest.java | 2 +- .../operators/FlowableTransformersTest.java | 4 +- .../operators/FlowableValveTest.java | 4 +- .../FlowableWindowPredicateTest.java | 4 +- .../operators/FlowableZipLatestTest.java | 11 +- .../operators/FlowablesTest.java | 12 +- .../MaybeFlatMapSignalCompletableTest.java | 71 ++-- .../MaybeFlatMapSignalFlowableTest.java | 77 ++-- .../MaybeFlatMapSignalMaybeTest.java | 55 +-- .../MaybeFlatMapSignalObservableTest.java | 71 ++-- .../MaybeFlatMapSignalSingleTest.java | 71 ++-- .../operators/ObservableErrorJumpTest.java | 4 +- .../operators/ObservableFilterAsyncTest.java | 10 +- .../operators/ObservableFlatMapDropTest.java | 11 +- .../ObservableFlatMapLatestTest.java | 11 +- .../operators/ObservableIndexOfTest.java | 2 +- .../operators/ObservableMapAsyncTest.java | 10 +- .../ObservableObserveOnDropTest.java | 18 +- .../ObservableObserveOnLatestTest.java | 18 +- .../operators/ObservableTransformersTest.java | 4 +- .../operators/ObservableValveTest.java | 4 +- .../operators/ObservablesTest.java | 4 +- .../SingleFlatMapSignalCompletableTest.java | 22 +- .../SingleFlatMapSignalFlowableTest.java | 24 +- .../SingleFlatMapSignalMaybeTest.java | 24 +- .../SingleFlatMapSignalObservableTest.java | 22 +- .../SingleFlatMapSignalSingleTest.java | 10 +- .../operators/SingleTransformersTest.java | 4 +- .../operators/SinglesTest.java | 4 +- .../parallel/ParallelOrderedMergeTest.java | 2 +- .../parallel/ParallelSumTest.java | 4 +- .../processors/DispatchWorkProcessorTest.java | 6 +- .../processors/FlowableProcessorsTest.java | 4 +- .../processors/RefCountProcessorTest.java | 8 +- .../schedulers/BlockingSchedulerTest.java | 4 +- .../schedulers/ParallelSchedulerTest.java | 6 +- .../schedulers/SharedSchedulerTest.java | 6 +- .../string/FlowableCharSequenceTest.java | 2 +- .../string/StringFlowableTest.java | 4 +- .../string/StringObservableTest.java | 4 +- .../subjects/DispatchWorkSubjectTest.java | 8 +- .../subjects/RefCountSubjectTest.java | 18 +- .../subjects/SubjectsTest.java | 6 +- .../subjects/UnicastWorkSubjectTest.java | 8 +- .../{rxjava2 => rxjava3}/test/BaseTest.java | 2 +- .../rxjava3/test/BaseTestConsumerEx.java | 290 ++++++++++++++ .../test/TestException.java | 2 +- .../{rxjava2 => rxjava3}/test/TestHelper.java | 173 ++++---- .../akarnokd/rxjava3/test/TestObserverEx.java | 306 ++++++++++++++ .../rxjava3/test/TestSubscriberEx.java | 375 ++++++++++++++++++ .../util/SpmcLinkedArrayQueueTest.java | 4 +- .../CheckLocalVariablesInTests.java | 4 +- .../validation/NewLinesBeforeAnnotation.java | 4 +- .../validation/TooManyEmptyNewLines.java | 4 +- 551 files changed, 3582 insertions(+), 2698 deletions(-) rename src/jmh/java/hu/akarnokd/{rxjava2 => rxjava3}/ExamplePerf.java (97%) rename src/jmh/java/hu/akarnokd/{rxjava2 => rxjava3}/FlatMapExPerf.java (98%) rename src/jmh/java/hu/akarnokd/{rxjava2 => rxjava3}/PerfAsyncConsumer.java (98%) rename src/jmh/java/hu/akarnokd/{rxjava2 => rxjava3}/PerfConsumer.java (98%) delete mode 100644 src/main/java/hu/akarnokd/rxjava2/debug/FlowableOnAssemblyConnectableResettable.java delete mode 100644 src/main/java/hu/akarnokd/rxjava2/debug/ObservableOnAssemblyConnectableResettable.java rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/async/AnyValue.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/async/AsyncFlowable.java (91%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/async/AsyncObservable.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/async/DisposableFlowable.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/async/DisposableObservable.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/async/FlowableFromCallableNull.java (80%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/async/FutureCompletable.java (99%) rename src/main/java/hu/akarnokd/{rxjava2/async/ObservableFromCallableNull.java => rxjava3/async/ObservableFromSupplierNull.java} (71%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/async/package-info.java (82%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/BasicEmptyQueueSubscription.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/BasicNonoIntQueueSubscription.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/BasicNonoSubscriber.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/BasicRefNonoSubscriber.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/BasicRefQueueSubscription.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/BasicSoloQueueSubscription.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/BlockingGetSubscriber.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/FuturePerhapsSubscriber.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/Nono.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoAmbArray.java (93%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoAmbIterable.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoAndThen.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoAndThenPublisher.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoBlockingAwaitSubscriber.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoCache.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoComplete.java (84%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoConcat.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoConcatArray.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoConcatIterable.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoCreate.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoDefer.java (81%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoDelay.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoDelaySubscription.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoDoFinally.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoDoOnLifecycle.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoError.java (77%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoErrorSupplier.java (68%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoFlatMapSignal.java (91%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoFromAction.java (85%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoFromCompletable.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoFromFuture.java (90%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoFromMaybe.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoFromObservable.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoFromPublisher.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoFromSingle.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoHide.java (90%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoLambdaSubscriber.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoLift.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoMapError.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoMerge.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoMergeArray.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoMergeIterable.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoNever.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoObserveOn.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoOnErrorComplete.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoOnErrorResume.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoProcessor.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoRepeat.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoRepeatUntil.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoRepeatWhen.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoRetry.java (93%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoRetryWhen.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoRetryWhile.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoSubscribeOn.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoTakeUntil.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoTimeout.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoTimer.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoToMaybe.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoToPerhaps.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoUnsubscribeOn.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoUsing.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/Perhaps.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsAmbArray.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsAmbIterable.java (93%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsAndThenNono.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsCache.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsCreate.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsDefaultIfEmpty.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsDefer.java (81%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsDelay.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsDelayPublisher.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsDelaySubscription.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsDoFinally.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsDoOnLifecycle.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsEmpty.java (84%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsError.java (77%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsErrorSupplier.java (67%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsFilter.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsFlatMap.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsFlatMapPublisher.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsFlatMapSignal.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsFromAction.java (83%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsFromCallable.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsFromCompletable.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsFromFuture.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsFromMaybe.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsFromPublisher.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsFromSingle.java (91%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsHide.java (91%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsJust.java (84%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsLift.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsMap.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsMapError.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsNever.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsObserveOn.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsOnErrorResumeNext.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsOnErrorResumeWith.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsOnErrorReturnItem.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsProcessor.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsRetry.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsRetryWhen.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsRetryWhile.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsSubscribeOn.java (93%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsSwitchIfEmpty.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsTakeUntil.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsTimeout.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsTimer.java (93%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsToFlowable.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsToMaybe.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsToObservable.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsUnsubscribeOn.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsUsing.java (90%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsZipArray.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsZipIterable.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/Solo.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloAmbArray.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloAmbIterable.java (93%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloAndThen.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloCache.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloCreate.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloDefer.java (82%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloDelay.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloDelayPublisher.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloDelaySubscription.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloDoFinally.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloDoOnLifecycle.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloError.java (77%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloErrorSupplier.java (63%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloFilter.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloFlatMap.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloFlatMapPublisher.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloFlatMapSignal.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloFromCallable.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloFromFuture.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloFromPublisher.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloFromSingle.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloHide.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloJust.java (84%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloLift.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloMap.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloMapError.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloNever.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloObserveOn.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloOnErrorResumeNext.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloOnErrorResumeWith.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloOnErrorReturnItem.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloProcessor.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloRetry.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloRetryWhen.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloRetryWhile.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloSubscribeOn.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloTakeUntil.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloTimeout.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloTimer.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloToFlowable.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloToObservable.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloToSingle.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloUnsubscribeOn.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloUsing.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloZipArray.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloZipIterable.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/package-info.java (77%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/consumers/AbstractDisposableAutoRelease.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/consumers/CompletableConsumers.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/consumers/DisposableAutoReleaseMultiObserver.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/consumers/DisposableAutoReleaseObserver.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/consumers/DisposableAutoReleaseSubscriber.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/consumers/FlowableConsumers.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/consumers/MaybeConsumers.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/consumers/ObservableConsumers.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/consumers/SingleConsumers.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/consumers/package-info.java (68%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/CompletableOnAssembly.java (98%) rename src/main/java/hu/akarnokd/{rxjava2/debug/CompletableOnAssemblyScalarCallable.java => rxjava3/debug/CompletableOnAssemblyScalarSupplier.java} (73%) rename src/main/java/hu/akarnokd/{rxjava2/debug/CompletableOnAssemblyCallable.java => rxjava3/debug/CompletableOnAssemblySupplier.java} (71%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/FlowableOnAssembly.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/FlowableOnAssemblyConnectable.java (91%) rename src/main/java/hu/akarnokd/{rxjava2/debug/FlowableOnAssemblyScalarCallable.java => rxjava3/debug/FlowableOnAssemblyScalarSupplier.java} (81%) rename src/main/java/hu/akarnokd/{rxjava2/debug/FlowableOnAssemblyCallable.java => rxjava3/debug/FlowableOnAssemblySupplier.java} (77%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/MaybeOnAssembly.java (98%) rename src/main/java/hu/akarnokd/{rxjava2/debug/MaybeOnAssemblyScalarCallable.java => rxjava3/debug/MaybeOnAssemblyScalarSupplier.java} (74%) rename src/main/java/hu/akarnokd/{rxjava2/debug/MaybeOnAssemblyCallable.java => rxjava3/debug/MaybeOnAssemblySupplier.java} (76%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/ObservableOnAssembly.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/ObservableOnAssemblyConnectable.java (89%) rename src/main/java/hu/akarnokd/{rxjava2/debug/ObservableOnAssemblyScalarCallable.java => rxjava3/debug/ObservableOnAssemblyScalarSupplier.java} (74%) rename src/main/java/hu/akarnokd/{rxjava2/debug/ObservableOnAssemblyCallable.java => rxjava3/debug/ObservableOnAssemblySupplier.java} (72%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/ParallelFlowableOnAssembly.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/RxJavaAssemblyException.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/RxJavaAssemblyTracking.java (75%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/SavedHooks.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/SingleOnAssembly.java (98%) rename src/main/java/hu/akarnokd/{rxjava2/debug/SingleOnAssemblyScalarCallable.java => rxjava3/debug/SingleOnAssemblyScalarSupplier.java} (74%) rename src/main/java/hu/akarnokd/{rxjava2/debug/SingleOnAssemblyCallable.java => rxjava3/debug/SingleOnAssemblySupplier.java} (73%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/multihook/MultiHandlerManager.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/multihook/OnScheduleMultiHandlerManager.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/multihook/package-info.java (88%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/package-info.java (89%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/CompletableValidator.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/ConnectableFlowableValidator.java (90%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/ConnectableObservableValidator.java (90%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/FlowableValidator.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/MaybeValidator.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/MultipleOnSubscribeCallsException.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/MultipleTerminationsException.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/NullOnErrorParameterException.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/NullOnNextParameterException.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/NullOnSubscribeParameterException.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/NullOnSuccessParameterException.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/ObservableValidator.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/OnNextAfterTerminationException.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/OnSubscribeNotCalledException.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/OnSuccessAfterTerminationException.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/ParallelFlowableValidator.java (94%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/ProtocolNonConformanceException.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/RxJavaProtocolValidator.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/SingleValidator.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/package-info.java (87%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/CompletableIfThen.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/CompletableSwitchCase.java (84%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/FlowableIfThen.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/FlowableSwitchCase.java (89%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/FlowableWhileDoWhile.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/MaybeIfThen.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/MaybeSwitchCase.java (86%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/ObservableIfThen.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/ObservableSwitchCase.java (89%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/ObservableWhileDoWhile.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/SingleIfThen.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/SingleSwitchCase.java (85%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/StatementCompletable.java (90%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/StatementFlowable.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/StatementMaybe.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/StatementObservable.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/StatementSingle.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/package-info.java (83%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/Consumer3.java (89%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/Consumer4.java (89%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/Consumer5.java (89%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/Consumer6.java (94%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/Consumer7.java (93%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/Consumer8.java (93%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/Consumer9.java (93%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/FunctionTagging.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/FunctionsEx.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/PlainBiConsumer.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/PlainBiFunction.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/PlainConsumer.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/PlainFunction.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/PlainFunction3.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/PlainFunction4.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/PlainFunction5.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/PlainFunction6.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/PlainFunction7.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/PlainFunction8.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/PlainFunction9.java (97%) rename src/main/java/hu/akarnokd/{rxjava2/functions/Supplier.java => rxjava3/functions/SimpleCallable.java} (89%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/package-info.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/ActivePlan0.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/ActivePlan1.java (94%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/ActivePlan2.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/ActivePlan3.java (94%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/ActivePlan4.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/ActivePlan5.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/ActivePlan6.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/ActivePlan7.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/ActivePlan8.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/ActivePlan9.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/ActivePlanN.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/JoinObservable.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/JoinObserver.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/JoinObserver1.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/JoinPatterns.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Pattern1.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Pattern2.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Pattern3.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Pattern4.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Pattern5.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Pattern6.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Pattern7.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Pattern8.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Pattern9.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/PatternN.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Plan.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Plan1.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Plan2.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Plan3.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Plan4.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Plan5.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Plan6.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Plan7.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Plan8.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/Plan9.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/PlanN.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/package-info.java (89%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/FlowableAverageDouble.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/FlowableAverageFloat.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/FlowableMinMax.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/FlowableSource.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/FlowableSumDouble.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/FlowableSumFloat.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/FlowableSumInt.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/FlowableSumLong.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/MathFlowable.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/MathObservable.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/ObservableAverageDouble.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/ObservableAverageFloat.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/ObservableMinMax.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/ObservableSource.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/ObservableSumDouble.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/ObservableSumFloat.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/ObservableSumInt.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/ObservableSumLong.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/math/package-info.java (83%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/BasicEmitter.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/BasicMergeSubscription.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/CompletableFlatMapSignalCompletable.java (91%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/CompletableFlatMapSignalFlowable.java (91%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/CompletableFlatMapSignalMaybe.java (91%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/CompletableFlatMapSignalObservable.java (91%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/CompletableFlatMapSignalSingle.java (91%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/CompletableTransformers.java (91%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/Completables.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ExpandStrategy.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableAsyncEmitter.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableBufferPredicate.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableCacheLast.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableCoalesce.java (93%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableDebounceFirst.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableErrorJump.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableEvery.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableExpand.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableFilterAsync.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableFlatMapAsync.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableFlatMapSync.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableGenerateAsync.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableIndexOf.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableIntervalBackpressure.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableMapAsync.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableMapFilter.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableOnBackpressureTimeout.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableOrderedMerge.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowablePartialCollect.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableRepeatScalar.java (99%) rename src/main/java/hu/akarnokd/{rxjava2/operators/FlowableRepeatCallable.java => rxjava3/operators/FlowableRepeatSupplier.java} (80%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableRequestObserveOn.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableRequestSample.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableRequestSampleTime.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableSpanout.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableSwitchFlatMap.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableSwitchIfEmptyMany.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableSwitchIfEmptyManyArray.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableSwitchOnFirst.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableTimeoutLast.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableTransformers.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableValve.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableWindowPredicate.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableZipLatest.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/Flowables.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/MaybeFlatMapSignalCompletable.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/MaybeFlatMapSignalFlowable.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/MaybeFlatMapSignalMaybe.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/MaybeFlatMapSignalObservable.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/MaybeFlatMapSignalSingle.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/MaybeTransformers.java (92%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/Maybes.java (93%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableErrorJump.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableFilterAsync.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableFlatMapDrop.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableFlatMapLatest.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableIndexOf.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableMapAsync.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableObserveOnDrop.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableObserveOnLatest.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableTransformers.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableValve.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/Observables.java (95%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/PartialCollectEmitter.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/SingleFlatMapSignalCompletable.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/SingleFlatMapSignalFlowable.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/SingleFlatMapSignalMaybe.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/SingleFlatMapSignalObservable.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/SingleFlatMapSignalSingle.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/SingleTransformers.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/Singles.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/package-info.java (57%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/parallel/ParallelOrderedMerge.java (94%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/parallel/ParallelSumDouble.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/parallel/ParallelSumInteger.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/parallel/ParallelSumLong.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/parallel/ParallelTransformers.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/parallel/package-info.java (88%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/processors/DispatchWorkProcessor.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/processors/FlowableProcessorWrap.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/processors/FlowableProcessors.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/processors/RefCountProcessor.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/processors/package-info.java (82%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/schedulers/BlockingScheduler.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/schedulers/ParallelScheduler.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/schedulers/SharedScheduler.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/schedulers/package-info.java (75%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/string/FlowableCharSequence.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/string/FlowableSplit.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/string/ObservableCharSequence.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/string/StringFlowable.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/string/StringObservable.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/string/package-info.java (83%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/subjects/DispatchWorkSubject.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/subjects/RefCountSubject.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/subjects/Subjects.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/subjects/UnicastWorkSubject.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/subjects/package-info.java (76%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/util/AlwaysFalseBooleanSupplier.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/util/AlwaysTrueBooleanSupplier.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/util/BiFunctionSecondIdentity.java (97%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/util/CompositeSubscription.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/util/SelfComparator.java (96%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/util/SneakyThrows.java (88%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/util/SpmcLinkedArrayQueue.java (99%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/util/SpscOneQueue.java (98%) rename src/main/java/hu/akarnokd/{rxjava2 => rxjava3}/util/package-info.java (95%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/async/AsyncFlowableTest.java (89%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/async/AsyncObservableTest.java (83%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoProcessorTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/NonoTest.java (96%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/PerhapsTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/basetypes/SoloTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/consumers/CompletableConsumersTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/consumers/FlowableConsumersTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/consumers/MaybeConsumersTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/consumers/ObservableConsumersTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/consumers/SingleConsumersTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2/debug/RxJava2AssemblyTrackingTest.java => rxjava3/debug/RxJava3AssemblyTrackingTest.java} (84%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/multihook/OnScheduleMultiHandlerManagerTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/debug/validator/RxJavaProtocolValidatorTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/StatementCompletableTest.java (92%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/StatementFlowableTest.java (95%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/StatementMaybeTest.java (94%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/StatementObservableTest.java (95%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/expr/StatementSingleTest.java (93%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/functions/FunctionTaggingTest.java (96%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/joins/OperatorJoinsTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/math/MathFlowableTest.java (96%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/math/MathObservableTest.java (96%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/CompletableFlatMapSignalCompletableTest.java (83%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/CompletableFlatMapSignalFlowableTest.java (80%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/CompletableFlatMapSignalMaybeTest.java (80%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/CompletableFlatMapSignalObservableTest.java (79%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/CompletableFlatMapSignalSingleTest.java (79%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/CompletableTransformersTest.java (90%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/CompletablesTest.java (90%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableBufferPredicateTest.java (96%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableCacheLastTest.java (97%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableCoalesceTest.java (96%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableDebounceFirstTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableErrorJumpTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableEveryTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableExpandTest.java (97%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableFilterAsyncTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableFlatMapAsyncTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableFlatMapSyncTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableGenerateAsyncTest.java (83%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableIndexOfTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableIntervalBackpressureTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableMapAsyncTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableMapFilterConditionalTest.java (90%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableMapFilterTest.java (89%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableOnBackpressureTimeoutTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableOrderedMergeTest.java (93%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowablePartialCollectTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableRepeatCallableTest.java (75%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableRequestObserveOnTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableRequestSampleTest.java (96%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableRequestSampleTimeTest.java (94%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableSpanoutTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableSwitchFlatMapTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableSwitchIfEmptyManyArrayTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableSwitchIfEmptyManyTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableSwitchOnFirstTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableTimeoutLastTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableTransformersTest.java (90%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableValveTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableWindowPredicateTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowableZipLatestTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/FlowablesTest.java (87%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/MaybeFlatMapSignalCompletableTest.java (85%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/MaybeFlatMapSignalFlowableTest.java (85%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/MaybeFlatMapSignalMaybeTest.java (87%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/MaybeFlatMapSignalObservableTest.java (84%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/MaybeFlatMapSignalSingleTest.java (85%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableErrorJumpTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableFilterAsyncTest.java (97%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableFlatMapDropTest.java (96%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableFlatMapLatestTest.java (96%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableIndexOfTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableMapAsyncTest.java (97%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableObserveOnDropTest.java (84%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableObserveOnLatestTest.java (84%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableTransformersTest.java (90%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservableValveTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/ObservablesTest.java (90%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/SingleFlatMapSignalCompletableTest.java (92%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/SingleFlatMapSignalFlowableTest.java (92%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/SingleFlatMapSignalMaybeTest.java (92%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/SingleFlatMapSignalObservableTest.java (92%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/SingleFlatMapSignalSingleTest.java (95%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/SingleTransformersTest.java (90%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/operators/SinglesTest.java (90%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/parallel/ParallelOrderedMergeTest.java (97%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/parallel/ParallelSumTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/processors/DispatchWorkProcessorTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/processors/FlowableProcessorsTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/processors/RefCountProcessorTest.java (97%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/schedulers/BlockingSchedulerTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/schedulers/ParallelSchedulerTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/schedulers/SharedSchedulerTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/string/FlowableCharSequenceTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/string/StringFlowableTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/string/StringObservableTest.java (91%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/subjects/DispatchWorkSubjectTest.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/subjects/RefCountSubjectTest.java (95%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/subjects/SubjectsTest.java (85%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/subjects/UnicastWorkSubjectTest.java (97%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/test/BaseTest.java (97%) create mode 100644 src/test/java/hu/akarnokd/rxjava3/test/BaseTestConsumerEx.java rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/test/TestException.java (97%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/test/TestHelper.java (95%) create mode 100644 src/test/java/hu/akarnokd/rxjava3/test/TestObserverEx.java create mode 100644 src/test/java/hu/akarnokd/rxjava3/test/TestSubscriberEx.java rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/util/SpmcLinkedArrayQueueTest.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/validation/CheckLocalVariablesInTests.java (99%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/validation/NewLinesBeforeAnnotation.java (98%) rename src/test/java/hu/akarnokd/{rxjava2 => rxjava3}/validation/TooManyEmptyNewLines.java (98%) diff --git a/README.md b/README.md index 037098de..a65cf5a6 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # RxJavaExtensions -[![codecov.io](http://codecov.io/github/akarnokd/RxJavaExtensions/coverage.svg?branch=master)](http://codecov.io/github/akarnokd/RxJavaExtensions?branch=master) -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.akarnokd/rxjava2-extensions/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.akarnokd/rxjava2-extensions) -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava2/rxjava/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava2/rxjava) +[![codecov.io](http://codecov.io/github/akarnokd/RxJavaExtensions/coverage.svg?branch=3.x)](http://codecov.io/github/akarnokd/RxJavaExtensions?branch=3.x) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.akarnokd/rxjava3-extensions/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.akarnokd/rxjava3-extensions) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava) -RxJava 2.x implementation of extra sources, operators and components and ports of many 1.x companion libraries. +RxJava 3.x implementation of extra sources, operators and components and ports of many 1.x companion libraries. # Releases @@ -13,7 +13,7 @@ RxJava 2.x implementation of extra sources, operators and components and ports o ``` dependencies { -    compile "com.github.akarnokd:rxjava2-extensions:0.20.10" + compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC0" } ``` @@ -80,7 +80,7 @@ Maven search: Support the join-patterns and async-util with functional interfaces of consumers with 3-9 type arguments and have functional interfaces of functions without the `throws Exception`. - - `Supplier` - `Callable` without `throws Exception` + - `SimpleCallable` - `Callable` without `throws Exception` - `Consumer3` - 3 argument `Consumer` - `Consumer4` - 4 argument `Consumer` - `Consumer5` - 5 argument `Consumer` @@ -201,7 +201,7 @@ func.apply(1) ``` ### startFuture -Run a Callable that returns a Future to call blocking get() on to get the solo value or exception. +Run a Supplier that returns a Future to call blocking get() on to get the solo value or exception. ```java ExecutorService exec = Executors.newSingleThreadedScheduler(); @@ -216,7 +216,7 @@ exec.shutdown(); ### deferFuture -Run a Callable that returns a Future to call blocking get() on to get a `Publisher` to stream back. +Run a Supplier that returns a Future to call blocking get() on to get a `Publisher` to stream back. ```java ExecutorService exec = Executors.newSingleThreadedScheduler(); @@ -404,8 +404,8 @@ In debug mode, you can walk through the reference graph of Disposables and Subsc ``` RxJavaAssemblyException: assembled at io.reactivex.Completable.error(Completable.java:280) -at hu.akarnokd.rxjava2.debug.RxJava2AssemblyTrackingTest.createCompletable(RxJava2AssemblyTrackingTest.java:78) -at hu.akarnokd.rxjava2.debug.RxJava2AssemblyTrackingTest.completable(RxJava2AssemblyTrackingTest.java:185) +at hu.akarnokd.rxjava3.debug.RxJava3AssemblyTrackingTest.createCompletable(RxJava3AssemblyTrackingTest.java:78) +at hu.akarnokd.rxjava3.debug.RxJava3AssemblyTrackingTest.completable(RxJava3AssemblyTrackingTest.java:185) ``` This is a filtered list of stacktrace elements (skipping threading, unit test and self-related entries). Most modern IDEs should allow you to navigate to the locations when printed on (or pasted into) its console. @@ -459,7 +459,7 @@ name (t1 .. t9) and the tag provided. Custom operators and sources sometimes contain bugs that manifest themselves in odd sequence behavior or crashes from within the standard operators. Since the revealing stacktraces is often missing or incomplete, diagnosing -such failures can be tiresome. Therefore, the `hu.akarnokd.rxjava2.debug.validator.RxJavaProtocolValidator` +such failures can be tiresome. Therefore, the `hu.akarnokd.rxjava3.debug.validator.RxJavaProtocolValidator` class offers assembly hooks for the standard reactive base types. The validation hooks can be enabled via `RxJavaProtocolValidator.enable()` and disabled via `RxJavaProtocolValidator.disable()`. @@ -506,7 +506,7 @@ The standard `RxJavaPlugins` allows only one hook to be associated with each mai If multiple hooks should be invoked, that option is not directly supported by `RxJavaPlugins` but can be built upon the single hook scheme. -The `hu.akarnokd.rxjava2.debug.multihook` package offers hook managers that can work with multiple hooks +The `hu.akarnokd.rxjava3.debug.multihook` package offers hook managers that can work with multiple hooks themselves. The various multi-hook managers are built upon the generic `MultiHandlerManager` class. The class offers the `register` @@ -721,7 +721,7 @@ public static void main(String[] args) { ## Custom operators and transformers -The custom transformers (to be applied with `Flowable.compose` for example), can be found in `hu.akarnokd.rxjava2.operators.FlowableTransformers` class. The custom source-like operators can be found in `hu.akarnokd.rxjava2.operators.Flowables` class. The operators and transformers for the other base +The custom transformers (to be applied with `Flowable.compose` for example), can be found in `hu.akarnokd.rxjava3.operators.FlowableTransformers` class. The custom source-like operators can be found in `hu.akarnokd.rxjava3.operators.Flowables` class. The operators and transformers for the other base reactive classes (will) follow the usual naming scheme. ### FlowableTransformers.valve() @@ -876,12 +876,12 @@ Flowable.repeat("doesn't matter") .assertResult(true); ``` -### Flowables.repeatCallable() +### Flowables.repeatSupplier() -Repeatedly calls a callable, indefinitely (until the downstream actually cancels) or if the callable throws or returns null (when it signals `NullPointerException`), honoring backpressure and supporting synchronous fusion and/or conditional fusion. +Repeatedly calls a supplier, indefinitely (until the downstream actually cancels) or if the supplier throws or returns null (when it signals `NullPointerException`), honoring backpressure and supporting synchronous fusion and/or conditional fusion. ```java -Flowable.repeatCallable(() -> ThreadLocalRandom.current().nextDouble()) +Flowable.repeatSupplier(() -> ThreadLocalRandom.current().nextDouble()) .take(100) .all(v -> v < 1d) .test() @@ -1079,9 +1079,9 @@ Flowable.just(new File(".")) // ~/git/RxJavaExtensions/src/main/java // ~/git/RxJavaExtensions/src/main/java/hu // ~/git/RxJavaExtensions/src/main/java/hu/akarnokd -// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava2 -// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava2/operators -// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava2/operators/FlowableExpand.java +// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava3 +// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava3/operators +// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java // ... // ~/git/RxJavaExtensions/src/test // ~/git/RxJavaExtensions/src/test/java @@ -1116,14 +1116,14 @@ Flowable.just(new File(".")) // ~/git/RxJavaExtensions/src/main/java // ~/git/RxJavaExtensions/src/main/java/hu // ~/git/RxJavaExtensions/src/main/java/hu/akarnokd -// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava2 -// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava2/operators -// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava2/math -// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava2/async -// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava2/debug +// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava3 +// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava3/operators +// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava3/math +// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava3/async +// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava3/debug // ... -// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava2/operators/FlowableExpand.java -// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava2/operators/FlowableTransformers.java +// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java +// ~/git/RxJavaExtensions/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTransformers.java ``` ### FlowableTransformers.mapAsync() @@ -1651,24 +1651,24 @@ Availability: - `Single` - `SingleTransformers.flatMap` (use with `Single.compose()`) - - `Singles.flatMapCompletable` (use with `Single.as()`) - - `Singles.flatMapMaybe` (use with `Single.as()`) - - `Singles.flatMapObservable` (use with `Single.as()`) - - `Singles.flatMapFlowable` (use with `Single.as()`) + - `Singles.flatMapCompletable` (use with `Single.to()`) + - `Singles.flatMapMaybe` (use with `Single.to()`) + - `Singles.flatMapObservable` (use with `Single.to()`) + - `Singles.flatMapFlowable` (use with `Single.to()`) - `Maybe` - `MaybeTransformers.flatMap` (use with `Maybe.compose()`) - - `Maybes.flatMapCompletable` (use with `Maybe.as()`) - - `Maybes.flatMapSingle` (use with `Maybe.as()`) - - `Maybes.flatMapObservable` (use with `Maybe.as()`) - - `Maybes.flatMapFlowable` (use with `Maybe.as()`) + - `Maybes.flatMapCompletable` (use with `Maybe.to()`) + - `Maybes.flatMapSingle` (use with `Maybe.to()`) + - `Maybes.flatMapObservable` (use with `Maybe.to()`) + - `Maybes.flatMapFlowable` (use with `Maybe.to()`) - `Completable` - `CompletableTransformers.flatMap` (use with `Completable.compose()`) - - `Completables.flatMapSingle` (use with `Completable.as()`) - - `Completables.flatMapMaybe` (use with `Completable.as()`) - - `Completables.flatMapObservable` (use with `Completable.as()`) - - `Completables.flatMapFlowable` (use with `Completable.as()`) + - `Completables.flatMapSingle` (use with `Completable.to()`) + - `Completables.flatMapMaybe` (use with `Completable.to()`) + - `Completables.flatMapObservable` (use with `Completable.to()`) + - `Completables.flatMapFlowable` (use with `Completable.to()`) -Note: same-type transformations for [Flowable.flatMap](http://reactivex.io/RxJava/2.x/javadoc/io/reactivex/Flowable.html#flatMap-io.reactivex.functions.Function-io.reactivex.functions.Function-java.util.concurrent.Callable-), [Observable.flatMap](http://reactivex.io/RxJava/2.x/javadoc/io/reactivex/Observable.html#flatMap-io.reactivex.functions.Function-io.reactivex.functions.Function-java.util.concurrent.Callable-) already exist in RxJava. +Note: same-type transformations for [Flowable.flatMap](http://reactivex.io/RxJava/3.x/javadoc/io/reactivex/Flowable.html#flatMap-io.reactivex.functions.Function-io.reactivex.functions.Function-io.reactivex.functions.Supplier-), [Observable.flatMap](http://reactivex.io/RxJava/3.x/javadoc/io/reactivex/Observable.html#flatMap-io.reactivex.functions.Function-io.reactivex.functions.Function-io.reactivex.functions.Supplier-) already exist in RxJava. ## Custom parallel operators and transformers @@ -1846,7 +1846,7 @@ ts.assertResult(1); ## Custom consumers -The utility classes can be found in `hu.akarnokd.rxjava2.consumers` package. +The utility classes can be found in `hu.akarnokd.rxjava3.consumers` package. ### FlowableConsumers diff --git a/build.gradle b/build.gradle index 3af6f5d1..6fbf7595 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java16:1.1@signature' compile "org.reactivestreams:reactive-streams:1.0.2" - compile "io.reactivex.rxjava2:rxjava:2.2.10" + compile "io.reactivex.rxjava3:rxjava:3.0.0-RC0" testCompile group: 'junit', name: 'junit', version: '4.12' @@ -86,7 +86,7 @@ artifacts { jar { manifest { - name = 'rxjava2-extensions' + name = 'rxjava3-extensions' instruction 'Bundle-Vendor', 'akarnokd' instruction 'Bundle-DocURL', 'https://github.com/akarnokd/RxJavaExtensions' instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*' @@ -128,7 +128,7 @@ javadoc { options.links( "https://docs.oracle.com/javase/7/docs/api/", "http://www.reactive-streams.org/reactive-streams-1.0.2-javadoc/", - "http://reactivex.io/RxJava/2.x/javadoc/" + "http://reactivex.io/RxJava/3.x/javadoc/" ) } diff --git a/gradle.properties b/gradle.properties index 205b489f..ec4c4198 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=0.20.10 +version=3.0.0-RC0 diff --git a/settings.gradle b/settings.gradle index 19d10c69..3dae0406 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'rxjava-extensions' +rootProject.name = 'rxjava3-extensions' diff --git a/src/jmh/java/hu/akarnokd/rxjava2/ExamplePerf.java b/src/jmh/java/hu/akarnokd/rxjava3/ExamplePerf.java similarity index 97% rename from src/jmh/java/hu/akarnokd/rxjava2/ExamplePerf.java rename to src/jmh/java/hu/akarnokd/rxjava3/ExamplePerf.java index 7bca5dbf..e7e461fe 100644 --- a/src/jmh/java/hu/akarnokd/rxjava2/ExamplePerf.java +++ b/src/jmh/java/hu/akarnokd/rxjava3/ExamplePerf.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2; +package hu.akarnokd.rxjava3; import java.util.concurrent.TimeUnit; diff --git a/src/jmh/java/hu/akarnokd/rxjava2/FlatMapExPerf.java b/src/jmh/java/hu/akarnokd/rxjava3/FlatMapExPerf.java similarity index 98% rename from src/jmh/java/hu/akarnokd/rxjava2/FlatMapExPerf.java rename to src/jmh/java/hu/akarnokd/rxjava3/FlatMapExPerf.java index 119234cf..418f8f1e 100644 --- a/src/jmh/java/hu/akarnokd/rxjava2/FlatMapExPerf.java +++ b/src/jmh/java/hu/akarnokd/rxjava3/FlatMapExPerf.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2; +package hu.akarnokd.rxjava3; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -23,7 +23,7 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import hu.akarnokd.rxjava2.operators.FlowableTransformers; +import hu.akarnokd.rxjava3.operators.FlowableTransformers; import io.reactivex.Flowable; import io.reactivex.functions.Function; import io.reactivex.schedulers.Schedulers; diff --git a/src/jmh/java/hu/akarnokd/rxjava2/PerfAsyncConsumer.java b/src/jmh/java/hu/akarnokd/rxjava3/PerfAsyncConsumer.java similarity index 98% rename from src/jmh/java/hu/akarnokd/rxjava2/PerfAsyncConsumer.java rename to src/jmh/java/hu/akarnokd/rxjava3/PerfAsyncConsumer.java index 66641863..96a740dc 100644 --- a/src/jmh/java/hu/akarnokd/rxjava2/PerfAsyncConsumer.java +++ b/src/jmh/java/hu/akarnokd/rxjava3/PerfAsyncConsumer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2; +package hu.akarnokd.rxjava3; import java.util.concurrent.*; diff --git a/src/jmh/java/hu/akarnokd/rxjava2/PerfConsumer.java b/src/jmh/java/hu/akarnokd/rxjava3/PerfConsumer.java similarity index 98% rename from src/jmh/java/hu/akarnokd/rxjava2/PerfConsumer.java rename to src/jmh/java/hu/akarnokd/rxjava3/PerfConsumer.java index b5adf169..4a00ac77 100644 --- a/src/jmh/java/hu/akarnokd/rxjava2/PerfConsumer.java +++ b/src/jmh/java/hu/akarnokd/rxjava3/PerfConsumer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2; +package hu.akarnokd.rxjava3; import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/FlowableOnAssemblyConnectableResettable.java b/src/main/java/hu/akarnokd/rxjava2/debug/FlowableOnAssemblyConnectableResettable.java deleted file mode 100644 index 1a8e4d94..00000000 --- a/src/main/java/hu/akarnokd/rxjava2/debug/FlowableOnAssemblyConnectableResettable.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2016-2019 David Karnok - * - * 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. - */ - -package hu.akarnokd.rxjava2.debug; - -import org.reactivestreams.Subscriber; - -import hu.akarnokd.rxjava2.debug.FlowableOnAssembly.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.flowables.ConnectableFlowable; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.disposables.ResettableConnectable; -import io.reactivex.internal.fuseable.ConditionalSubscriber; - -/** - * Wraps a Publisher and inject the assembly info. - * - * @param the value type - */ -final class FlowableOnAssemblyConnectableResettable extends ConnectableFlowable -implements ResettableConnectable { - - final ConnectableFlowable source; - - final RxJavaAssemblyException assembled; - - FlowableOnAssemblyConnectableResettable(ConnectableFlowable source) { - this.source = source; - this.assembled = new RxJavaAssemblyException(); - } - - @Override - protected void subscribeActual(Subscriber s) { - if (s instanceof ConditionalSubscriber) { - source.subscribe(new OnAssemblyConditionalSubscriber((ConditionalSubscriber)s, assembled)); - } else { - source.subscribe(new OnAssemblySubscriber(s, assembled)); - } - } - - @Override - public void connect(Consumer connection) { - source.connect(connection); - } - - @Override - public void resetIf(Disposable connection) { - ((ResettableConnectable)source).resetIf(connection); - } -} diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/ObservableOnAssemblyConnectableResettable.java b/src/main/java/hu/akarnokd/rxjava2/debug/ObservableOnAssemblyConnectableResettable.java deleted file mode 100644 index 44f91bfb..00000000 --- a/src/main/java/hu/akarnokd/rxjava2/debug/ObservableOnAssemblyConnectableResettable.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2016-2019 David Karnok - * - * 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. - */ - -package hu.akarnokd.rxjava2.debug; - -import hu.akarnokd.rxjava2.debug.ObservableOnAssembly.OnAssemblyObserver; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.disposables.ResettableConnectable; -import io.reactivex.observables.ConnectableObservable; - -/** - * Wraps a ObservableSource and inject the assembly info. - * - * @param the value type - */ -final class ObservableOnAssemblyConnectableResettable extends ConnectableObservable -implements ResettableConnectable { - - final ConnectableObservable source; - - final RxJavaAssemblyException assembled; - - ObservableOnAssemblyConnectableResettable(ConnectableObservable source) { - this.source = source; - this.assembled = new RxJavaAssemblyException(); - } - - @Override - protected void subscribeActual(Observer observer) { - source.subscribe(new OnAssemblyObserver(observer, assembled)); - } - - @Override - public void connect(Consumer connection) { - source.connect(connection); - } - - @Override - public void resetIf(Disposable connection) { - ((ResettableConnectable)source).resetIf(connection); - } -} diff --git a/src/main/java/hu/akarnokd/rxjava2/async/AnyValue.java b/src/main/java/hu/akarnokd/rxjava3/async/AnyValue.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/async/AnyValue.java rename to src/main/java/hu/akarnokd/rxjava3/async/AnyValue.java index 762853ed..f7a3b91b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/async/AnyValue.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/AnyValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.async; +package hu.akarnokd.rxjava3.async; /** * Placeholder instance when one has to return something (and used to return {@code null} in 1.x). diff --git a/src/main/java/hu/akarnokd/rxjava2/async/AsyncFlowable.java b/src/main/java/hu/akarnokd/rxjava3/async/AsyncFlowable.java similarity index 91% rename from src/main/java/hu/akarnokd/rxjava2/async/AsyncFlowable.java rename to src/main/java/hu/akarnokd/rxjava3/async/AsyncFlowable.java index f9cd04b4..c8b83aec 100644 --- a/src/main/java/hu/akarnokd/rxjava2/async/AsyncFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/AsyncFlowable.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.async; +package hu.akarnokd.rxjava3.async; import java.util.concurrent.*; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.functions.*; +import hu.akarnokd.rxjava3.functions.*; import io.reactivex.*; import io.reactivex.disposables.Disposable; import io.reactivex.exceptions.*; @@ -63,7 +63,7 @@ private AsyncFlowable() { * @see RxJava Wiki: start() * @see MSDN: Observable.Start */ - public static Flowable start(Callable func) { + public static Flowable start(Supplier func) { return start(func, Schedulers.computation()); } @@ -89,8 +89,8 @@ public static Flowable start(Callable func) { * @see RxJava Wiki: start() * @see MSDN: Observable.Start */ - public static Flowable start(Callable func, Scheduler scheduler) { - return Flowable.fromCallable(func).subscribeOn(scheduler).subscribeWith(AsyncProcessor.create()); + public static Flowable start(Supplier func, Scheduler scheduler) { + return Flowable.fromSupplier(func).subscribeOn(scheduler).subscribeWith(AsyncProcessor.create()); } /** @@ -99,7 +99,7 @@ public static Flowable start(Callable func, Scheduler schedu * *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the SimpleCallable honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -108,7 +108,7 @@ public static Flowable start(Callable func, Scheduler schedu * @see RxJava Wiki: toAsync() * @see MSDN: Observable.ToAsync */ - public static Supplier> toAsync(Action action) { + public static SimpleCallable> toAsync(Action action) { return toAsync(action, Schedulers.computation()); } @@ -118,9 +118,9 @@ public static Supplier> toAsync(Action action) { * *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the SimpleCallable honors downstream backpressure.
*
Scheduler:
- *
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
+ *
{@code toAsyncCallable} by default operates on the {@code computation} {@link Scheduler}.
*
* * @param the result value type @@ -129,8 +129,29 @@ public static Supplier> toAsync(Action action) { * @see RxJava Wiki: toAsync() * @see MSDN: Observable.ToAsync */ - public static Supplier> toAsync(Callable func) { - return toAsync(func, Schedulers.computation()); + public static SimpleCallable> toAsyncCallable(Callable func) { + return toAsyncCallable(func, Schedulers.computation()); + } + + /** + * Convert a synchronous function call into an asynchronous function call through a Flowable. + *

+ * + *

+ *
Backpressure:
+ *
The Flowable returned by the SimpleCallable honors downstream backpressure.
+ *
Scheduler:
+ *
{@code toAsyncSupplier} by default operates on the {@code computation} {@link Scheduler}.
+ *
+ * + * @param the result value type + * @param func the function to convert + * @return a function that returns an Flowable that executes the {@code func} and emits its returned value + * @see RxJava Wiki: toAsync() + * @see MSDN: Observable.ToAsync + */ + public static SimpleCallable> toAsyncSupplier(Supplier func) { + return toAsyncSupplier(func, Schedulers.computation()); } /** @@ -139,7 +160,7 @@ public static Supplier> toAsync(Callable func) { * *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -160,7 +181,7 @@ public static PlainFunction> toAsync(Consumer *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -182,7 +203,7 @@ public static PlainFunction> toAsync(Function *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -204,7 +225,7 @@ public static PlainBiFunction> toAsync(BiConsu * *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -227,7 +248,7 @@ public static PlainBiFunction> toAsync(BiFunctio * *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -250,7 +271,7 @@ public static PlainFunction3> toAsync( * *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -274,7 +295,7 @@ public static PlainFunction3> toAsync(Fu * *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -298,7 +319,7 @@ public static PlainFunction4> * *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -323,7 +344,7 @@ public static PlainFunction4> to * *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -348,7 +369,7 @@ public static PlainFunction5 *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -374,7 +395,7 @@ public static PlainFunction5 *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -400,7 +421,7 @@ public static PlainFunction6 *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -427,7 +448,7 @@ public static PlainFunction6 *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -454,7 +475,7 @@ public static PlainFunction7 *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -482,7 +503,7 @@ public static PlainFunction7 *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -510,7 +531,7 @@ public static PlainFunction8 *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -539,7 +560,7 @@ public static PlainFunction8 *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -568,7 +589,7 @@ public static PlainFunction9 *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -598,7 +619,7 @@ public static PlainFunction9 *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsyncArray} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -617,7 +638,7 @@ public static PlainFunction> toAsyncArray(Consumer *
*
Backpressure:
- *
The Flowable returned by the Callable honors downstream backpressure.
+ *
The Flowable returned by the function honors downstream backpressure.
*
Scheduler:
*
{@code toAsyncArray} by default operates on the {@code computation} {@link Scheduler}.
*
@@ -637,7 +658,7 @@ public static PlainFunction> toAsyncArray(Function *
*
Backpressure:
- *
The Flowable returned by the Supplier honors downstream backpressure.
+ *
The Flowable returned by the SimpleCallable honors downstream backpressure.
*
Scheduler:
*
You specify the {@link Scheduler} {@code toAsync} works on.
*
@@ -647,13 +668,13 @@ public static PlainFunction> toAsyncArray(FunctionRxJava Wiki: toAsync() * @see MSDN: Observable.ToAsync */ - public static Supplier> toAsync(final Action action, final Scheduler scheduler) { - return new Supplier>() { + public static SimpleCallable> toAsync(final Action action, final Scheduler scheduler) { + return new SimpleCallable>() { @Override public Flowable call() { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.run(); return AnyValue.INSTANCE; } @@ -669,9 +690,9 @@ public Object call() throws Exception { * *
*
Backpressure:
- *
The Flowable returned by the Supplier honors downstream backpressure.
+ *
The Flowable returned by the SimpleCallable honors downstream backpressure.
*
Scheduler:
- *
You specify the {@link Scheduler} {@code toAsync} works on.
+ *
You specify the {@link Scheduler} {@code toAsyncCallable} works on.
*
* @param the result value type * @param func the function to convert @@ -680,8 +701,8 @@ public Object call() throws Exception { * @see RxJava Wiki: toAsync() * @see MSDN: Observable.ToAsync */ - public static Supplier> toAsync(final Callable func, final Scheduler scheduler) { - return new Supplier>() { + public static SimpleCallable> toAsyncCallable(final Callable func, final Scheduler scheduler) { + return new SimpleCallable>() { @Override public Flowable call() { return Flowable.fromCallable(func).subscribeOn(scheduler); @@ -689,6 +710,32 @@ public Flowable call() { }; } + /** + * Convert a synchronous function call into an asynchronous function call through a Flowable. + *

+ * + *

+ *
Backpressure:
+ *
The Flowable returned by the SimpleCallable honors downstream backpressure.
+ *
Scheduler:
+ *
You specify the {@link Scheduler} {@code toAsyncSupplier} works on.
+ *
+ * @param the result value type + * @param func the function to convert + * @param scheduler the Scheduler used to call the {@code func} + * @return a function that returns an Flowable that executes the {@code func} and emits its returned value + * @see RxJava Wiki: toAsync() + * @see MSDN: Observable.ToAsync + */ + public static SimpleCallable> toAsyncSupplier(final Supplier func, final Scheduler scheduler) { + return new SimpleCallable>() { + @Override + public Flowable call() { + return Flowable.fromSupplier(func).subscribeOn(scheduler); + } + }; + } + /** * Convert a synchronous action call into an asynchronous function call through a Flowable. *

@@ -711,9 +758,9 @@ public static PlainFunction> toAsync(final Consumer>() { @Override public Flowable apply(final T1 t1) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1); return AnyValue.INSTANCE; } @@ -746,9 +793,9 @@ public static PlainFunction> toAsync(final Function>() { @Override public Flowable apply(final T1 t1) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1); } }) @@ -780,9 +827,9 @@ public static PlainBiFunction> toAsync(final B return new PlainBiFunction>() { @Override public Flowable apply(final T1 t1, final T2 t2) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1, t2); return AnyValue.INSTANCE; } @@ -816,9 +863,9 @@ public static PlainBiFunction> toAsync(final BiF return new PlainBiFunction>() { @Override public Flowable apply(final T1 t1, final T2 t2) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1, t2); } }) @@ -851,9 +898,9 @@ public static PlainFunction3> toAsync( return new PlainFunction3>() { @Override public Flowable apply(final T1 t1, final T2 t2, final T3 t3) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1, t2, t3); return AnyValue.INSTANCE; } @@ -888,9 +935,9 @@ public static PlainFunction3> toAsync(fi return new PlainFunction3>() { @Override public Flowable apply(final T1 t1, final T2 t2, final T3 t3) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1, t2, t3); } }) @@ -924,9 +971,9 @@ public static PlainFunction4> return new PlainFunction4>() { @Override public Flowable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1, t2, t3, t4); return AnyValue.INSTANCE; } @@ -962,9 +1009,9 @@ public static PlainFunction4> to return new PlainFunction4>() { @Override public Flowable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1, t2, t3, t4); } }) @@ -999,9 +1046,9 @@ public static PlainFunction5>() { @Override public Flowable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1, t2, t3, t4, t5); return AnyValue.INSTANCE; } @@ -1038,9 +1085,9 @@ public static PlainFunction5>() { @Override public Flowable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1, t2, t3, t4, t5); } }) @@ -1076,9 +1123,9 @@ public static PlainFunction6>() { @Override public Flowable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1, t2, t3, t4, t5, t6); return AnyValue.INSTANCE; } @@ -1116,9 +1163,9 @@ public static PlainFunction6>() { @Override public Flowable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1, t2, t3, t4, t5, t6); } }) @@ -1156,9 +1203,9 @@ public static PlainFunction7>() { @Override public Flowable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1, t2, t3, t4, t5, t6, t7); return AnyValue.INSTANCE; } @@ -1198,9 +1245,9 @@ public static PlainFunction7>() { @Override public Flowable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1, t2, t3, t4, t5, t6, t7); } }) @@ -1239,9 +1286,9 @@ public static PlainFunction8>() { @Override public Flowable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7, final T8 t8) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1, t2, t3, t4, t5, t6, t7, t8); return AnyValue.INSTANCE; } @@ -1282,9 +1329,9 @@ public static PlainFunction8>() { @Override public Flowable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7, final T8 t8) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1, t2, t3, t4, t5, t6, t7, t8); } }) @@ -1324,9 +1371,9 @@ public static PlainFunction9>() { @Override public Flowable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7, final T8 t8, final T9 t9) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1, t2, t3, t4, t5, t6, t7, t8, t9); return AnyValue.INSTANCE; } @@ -1368,9 +1415,9 @@ public static PlainFunction9>() { @Override public Flowable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7, final T8 t8, final T9 t9) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1, t2, t3, t4, t5, t6, t7, t8, t9); } }) @@ -1399,9 +1446,9 @@ public static PlainFunction> toAsyncArray(final Consu return new PlainFunction>() { @Override public Flowable apply(final Object[] t) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t); return AnyValue.INSTANCE; } @@ -1432,9 +1479,9 @@ public static PlainFunction> toAsyncArray(final Functi return new PlainFunction>() { @Override public Flowable apply(final Object[] t) { - return Flowable.fromCallable(new Callable() { + return Flowable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t); } }) @@ -1459,14 +1506,14 @@ public R call() throws Exception { * @param the result type * @param functionAsync the asynchronous function to run * @return an Observable that surfaces the result of the future - * @see #startFuture(Callable, Scheduler) + * @see #startFuture(Supplier, Scheduler) * @see RxJava Wiki: startFuture() */ - public static Flowable startFuture(final Callable> functionAsync) { - return RxJavaPlugins.onAssembly(new FlowableFromCallableNull(new Callable() { + public static Flowable startFuture(final Supplier> functionAsync) { + return RxJavaPlugins.onAssembly(new FlowableFromSupplierNull(new Supplier() { @Override - public T call() throws Exception { - return functionAsync.call().get(); + public T get() throws Throwable { + return functionAsync.get().get(); } })); } @@ -1489,7 +1536,7 @@ public T call() throws Exception { * @return an Observable that surfaces the result of the future * @see RxJava Wiki: startFuture() */ - public static Flowable startFuture(Callable> functionAsync, + public static Flowable startFuture(Supplier> functionAsync, Scheduler scheduler) { return startFuture(functionAsync).subscribeOn(scheduler); } @@ -1511,10 +1558,10 @@ public static Flowable startFuture(Callable * @param the result type * @param publisherFactoryAsync the asynchronous function to start for each observer * @return the Observable emitting items produced by the asynchronous observer produced by the factory - * @see #deferFuture(Callable, Scheduler) + * @see #deferFuture(Supplier, Scheduler) * @see RxJava Wiki: deferFuture() */ - public static Flowable deferFuture(Callable>> publisherFactoryAsync) { + public static Flowable deferFuture(Supplier>> publisherFactoryAsync) { return deferFuture(publisherFactoryAsync, Schedulers.computation()); } @@ -1537,12 +1584,12 @@ public static Flowable deferFuture(CallableRxJava Wiki: deferFuture() */ public static Flowable deferFuture( - final Callable>> publisherFactoryAsync, + final Supplier>> publisherFactoryAsync, Scheduler scheduler) { - return Flowable.defer(new Callable>() { + return Flowable.defer(new Supplier>() { @Override - public Publisher call() throws Exception { - return publisherFactoryAsync.call().get(); + public Publisher get() throws Throwable { + return publisherFactoryAsync.get().get(); } }).subscribeOn(scheduler); } diff --git a/src/main/java/hu/akarnokd/rxjava2/async/AsyncObservable.java b/src/main/java/hu/akarnokd/rxjava3/async/AsyncObservable.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/async/AsyncObservable.java rename to src/main/java/hu/akarnokd/rxjava3/async/AsyncObservable.java index 9f2be727..1b0eb338 100644 --- a/src/main/java/hu/akarnokd/rxjava2/async/AsyncObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/AsyncObservable.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.async; +package hu.akarnokd.rxjava3.async; import java.util.concurrent.*; -import hu.akarnokd.rxjava2.functions.*; +import hu.akarnokd.rxjava3.functions.*; import io.reactivex.*; import io.reactivex.disposables.Disposable; import io.reactivex.exceptions.*; @@ -59,7 +59,7 @@ private AsyncObservable() { * @see RxJava Wiki: start() * @see MSDN: Observable.Start */ - public static Observable start(Callable func) { + public static Observable start(Supplier func) { return start(func, Schedulers.computation()); } @@ -83,8 +83,8 @@ public static Observable start(Callable func) { * @see RxJava Wiki: start() * @see MSDN: Observable.Start */ - public static Observable start(Callable func, Scheduler scheduler) { - return Observable.fromCallable(func).subscribeOn(scheduler).subscribeWith(AsyncSubject.create()); + public static Observable start(Supplier func, Scheduler scheduler) { + return Observable.fromSupplier(func).subscribeOn(scheduler).subscribeWith(AsyncSubject.create()); } /** @@ -100,7 +100,7 @@ public static Observable start(Callable func, Scheduler sche * @see RxJava Wiki: toAsync() * @see MSDN: Observable.ToAsync */ - public static Supplier> toAsync(Action action) { + public static SimpleCallable> toAsync(Action action) { return toAsync(action, Schedulers.computation()); } @@ -110,7 +110,7 @@ public static Supplier> toAsync(Action action) { * *
*
Scheduler:
- *
{@code toAsync} by default operates on the {@code computation} {@link Scheduler}.
+ *
{@code toAsyncCallable} by default operates on the {@code computation} {@link Scheduler}.
*
* * @param the result value type @@ -119,8 +119,27 @@ public static Supplier> toAsync(Action action) { * @see RxJava Wiki: toAsync() * @see MSDN: Observable.ToAsync */ - public static Supplier> toAsync(Callable func) { - return toAsync(func, Schedulers.computation()); + public static SimpleCallable> toAsyncCallable(Callable func) { + return toAsyncCallable(func, Schedulers.computation()); + } + + /** + * Convert a synchronous function call into an asynchronous function call through a Observable. + *

+ * + *

+ *
Scheduler:
+ *
{@code toAsyncSupplier} by default operates on the {@code computation} {@link Scheduler}.
+ *
+ * + * @param the result value type + * @param func the function to convert + * @return a function that returns an Observable that executes the {@code func} and emits its returned value + * @see RxJava Wiki: toAsync() + * @see MSDN: Observable.ToAsync + */ + public static SimpleCallable> toAsyncSupplier(Supplier func) { + return toAsyncSupplier(func, Schedulers.computation()); } /** @@ -595,13 +614,13 @@ public static PlainFunction> toAsyncArray(FunctionRxJava Wiki: toAsync() * @see MSDN: Observable.ToAsync */ - public static Supplier> toAsync(final Action action, final Scheduler scheduler) { - return new Supplier>() { + public static SimpleCallable> toAsync(final Action action, final Scheduler scheduler) { + return new SimpleCallable>() { @Override public Observable call() { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.run(); return AnyValue.INSTANCE; } @@ -617,7 +636,7 @@ public Object call() throws Exception { * *
*
Scheduler:
- *
You specify the {@link Scheduler} {@code toAsync} works on.
+ *
You specify the {@link Scheduler} {@code toAsyncCallable} works on.
*
* @param the result value type * @param func the function to convert @@ -626,8 +645,8 @@ public Object call() throws Exception { * @see RxJava Wiki: toAsync() * @see MSDN: Observable.ToAsync */ - public static Supplier> toAsync(final Callable func, final Scheduler scheduler) { - return new Supplier>() { + public static SimpleCallable> toAsyncCallable(final Callable func, final Scheduler scheduler) { + return new SimpleCallable>() { @Override public Observable call() { return Observable.fromCallable(func).subscribeOn(scheduler); @@ -635,6 +654,30 @@ public Observable call() { }; } + /** + * Convert a synchronous function call into an asynchronous function call through a Observable. + *

+ * + *

+ *
Scheduler:
+ *
You specify the {@link Scheduler} {@code toAsyncSupplier} works on.
+ *
+ * @param the result value type + * @param func the function to convert + * @param scheduler the Scheduler used to call the {@code func} + * @return a function that returns an Observable that executes the {@code func} and emits its returned value + * @see RxJava Wiki: toAsync() + * @see MSDN: Observable.ToAsync + */ + public static SimpleCallable> toAsyncSupplier(final Supplier func, final Scheduler scheduler) { + return new SimpleCallable>() { + @Override + public Observable call() { + return Observable.fromSupplier(func).subscribeOn(scheduler); + } + }; + } + /** * Convert a synchronous action call into an asynchronous function call through a Observable. *

@@ -655,9 +698,9 @@ public static PlainFunction> toAsync(final Consumer< return new PlainFunction>() { @Override public Observable apply(final T1 t1) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1); return AnyValue.INSTANCE; } @@ -688,9 +731,9 @@ public static PlainFunction> toAsync(final Function>() { @Override public Observable apply(final T1 t1) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1); } }) @@ -720,9 +763,9 @@ public static PlainBiFunction> toAsync(final return new PlainBiFunction>() { @Override public Observable apply(final T1 t1, final T2 t2) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1, t2); return AnyValue.INSTANCE; } @@ -754,9 +797,9 @@ public static PlainBiFunction> toAsync(final B return new PlainBiFunction>() { @Override public Observable apply(final T1 t1, final T2 t2) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1, t2); } }) @@ -787,9 +830,9 @@ public static PlainFunction3> toAsyn return new PlainFunction3>() { @Override public Observable apply(final T1 t1, final T2 t2, final T3 t3) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1, t2, t3); return AnyValue.INSTANCE; } @@ -822,9 +865,9 @@ public static PlainFunction3> toAsync( return new PlainFunction3>() { @Override public Observable apply(final T1 t1, final T2 t2, final T3 t3) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1, t2, t3); } }) @@ -856,9 +899,9 @@ public static PlainFunction4 return new PlainFunction4>() { @Override public Observable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1, t2, t3, t4); return AnyValue.INSTANCE; } @@ -892,9 +935,9 @@ public static PlainFunction4> return new PlainFunction4>() { @Override public Observable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1, t2, t3, t4); } }) @@ -927,9 +970,9 @@ public static PlainFunction5>() { @Override public Observable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1, t2, t3, t4, t5); return AnyValue.INSTANCE; } @@ -964,9 +1007,9 @@ public static PlainFunction5>() { @Override public Observable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1, t2, t3, t4, t5); } }) @@ -1000,9 +1043,9 @@ public static PlainFunction6>() { @Override public Observable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1, t2, t3, t4, t5, t6); return AnyValue.INSTANCE; } @@ -1038,9 +1081,9 @@ public static PlainFunction6>() { @Override public Observable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1, t2, t3, t4, t5, t6); } }) @@ -1076,9 +1119,9 @@ public static PlainFunction7>() { @Override public Observable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1, t2, t3, t4, t5, t6, t7); return AnyValue.INSTANCE; } @@ -1116,9 +1159,9 @@ public static PlainFunction7>() { @Override public Observable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1, t2, t3, t4, t5, t6, t7); } }) @@ -1155,9 +1198,9 @@ public static PlainFunction8>() { @Override public Observable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7, final T8 t8) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1, t2, t3, t4, t5, t6, t7, t8); return AnyValue.INSTANCE; } @@ -1196,9 +1239,9 @@ public static PlainFunction8>() { @Override public Observable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7, final T8 t8) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1, t2, t3, t4, t5, t6, t7, t8); } }) @@ -1236,9 +1279,9 @@ public static PlainFunction9>() { @Override public Observable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7, final T8 t8, final T9 t9) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t1, t2, t3, t4, t5, t6, t7, t8, t9); return AnyValue.INSTANCE; } @@ -1278,9 +1321,9 @@ public static PlainFunction9>() { @Override public Observable apply(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7, final T8 t8, final T9 t9) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t1, t2, t3, t4, t5, t6, t7, t8, t9); } }) @@ -1307,9 +1350,9 @@ public static PlainFunction> toAsyncArray(final Con return new PlainFunction>() { @Override public Observable apply(final Object[] t) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Throwable { action.accept(t); return AnyValue.INSTANCE; } @@ -1338,9 +1381,9 @@ public static PlainFunction> toAsyncArray(final Func return new PlainFunction>() { @Override public Observable apply(final Object[] t) { - return Observable.fromCallable(new Callable() { + return Observable.fromSupplier(new Supplier() { @Override - public R call() throws Exception { + public R get() throws Throwable { return func.apply(t); } }) @@ -1363,14 +1406,14 @@ public R call() throws Exception { * @param the result type * @param functionAsync the asynchronous function to run * @return an Observable that surfaces the result of the future - * @see #startFuture(Callable, Scheduler) + * @see #startFuture(Supplier, Scheduler) * @see RxJava Wiki: startFuture() */ - public static Observable startFuture(final Callable> functionAsync) { - return RxJavaPlugins.onAssembly(new ObservableFromCallableNull(new Callable() { + public static Observable startFuture(final Supplier> functionAsync) { + return RxJavaPlugins.onAssembly(new ObservableFromSupplierNull(new Supplier() { @Override - public T call() throws Exception { - return functionAsync.call().get(); + public T get() throws Throwable { + return functionAsync.get().get(); } })); } @@ -1391,7 +1434,7 @@ public T call() throws Exception { * @return an Observable that surfaces the result of the future * @see RxJava Wiki: startFuture() */ - public static Observable startFuture(Callable> functionAsync, + public static Observable startFuture(Supplier> functionAsync, Scheduler scheduler) { return startFuture(functionAsync).subscribeOn(scheduler); } @@ -1411,10 +1454,10 @@ public static Observable startFuture(Callable the result type * @param publisherFactoryAsync the asynchronous function to start for each observer * @return the Observable emitting items produced by the asynchronous observer produced by the factory - * @see #deferFuture(Callable, Scheduler) + * @see #deferFuture(Supplier, Scheduler) * @see RxJava Wiki: deferFuture() */ - public static Observable deferFuture(Callable>> publisherFactoryAsync) { + public static Observable deferFuture(Supplier>> publisherFactoryAsync) { return deferFuture(publisherFactoryAsync, Schedulers.computation()); } @@ -1435,12 +1478,12 @@ public static Observable deferFuture(CallableRxJava Wiki: deferFuture() */ public static Observable deferFuture( - final Callable>> publisherFactoryAsync, + final Supplier>> publisherFactoryAsync, Scheduler scheduler) { - return Observable.defer(new Callable>() { + return Observable.defer(new Supplier>() { @Override - public ObservableSource call() throws Exception { - return publisherFactoryAsync.call().get(); + public ObservableSource get() throws Throwable { + return publisherFactoryAsync.get().get(); } }).subscribeOn(scheduler); } diff --git a/src/main/java/hu/akarnokd/rxjava2/async/DisposableFlowable.java b/src/main/java/hu/akarnokd/rxjava3/async/DisposableFlowable.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/async/DisposableFlowable.java rename to src/main/java/hu/akarnokd/rxjava3/async/DisposableFlowable.java index 513c1332..8912f99b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/async/DisposableFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/DisposableFlowable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.async; +package hu.akarnokd.rxjava3.async; import io.reactivex.Flowable; import io.reactivex.disposables.Disposable; diff --git a/src/main/java/hu/akarnokd/rxjava2/async/DisposableObservable.java b/src/main/java/hu/akarnokd/rxjava3/async/DisposableObservable.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/async/DisposableObservable.java rename to src/main/java/hu/akarnokd/rxjava3/async/DisposableObservable.java index 54dabd6b..3e8bedfa 100644 --- a/src/main/java/hu/akarnokd/rxjava2/async/DisposableObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/DisposableObservable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.async; +package hu.akarnokd.rxjava3.async; import io.reactivex.*; import io.reactivex.disposables.Disposable; diff --git a/src/main/java/hu/akarnokd/rxjava2/async/FlowableFromCallableNull.java b/src/main/java/hu/akarnokd/rxjava3/async/FlowableFromCallableNull.java similarity index 80% rename from src/main/java/hu/akarnokd/rxjava2/async/FlowableFromCallableNull.java rename to src/main/java/hu/akarnokd/rxjava3/async/FlowableFromCallableNull.java index 67d04912..0980e87b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/async/FlowableFromCallableNull.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/FlowableFromCallableNull.java @@ -14,27 +14,26 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.async; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.async; import org.reactivestreams.Subscriber; import io.reactivex.Flowable; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; import io.reactivex.internal.subscriptions.DeferredScalarSubscription; /** - * Runs a callable and treats a null result as completion. + * Runs a Supplier and treats a null result as completion. * * @param the value type */ -final class FlowableFromCallableNull extends Flowable implements Callable { +final class FlowableFromSupplierNull extends Flowable implements Supplier { - final Callable callable; + final Supplier supplier; - FlowableFromCallableNull(Callable callable) { - this.callable = callable; + FlowableFromSupplierNull(Supplier supplier) { + this.supplier = supplier; } @Override @@ -47,7 +46,7 @@ protected void subscribeActual(Subscriber s) { T v; try { - v = callable.call(); + v = supplier.get(); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); if (!deferred.isCancelled()) { @@ -67,8 +66,8 @@ protected void subscribeActual(Subscriber s) { } @Override - public T call() throws Exception { - return callable.call(); + public T get() throws Throwable { + return supplier.get(); } static final class CallableNullSubscription extends DeferredScalarSubscription { diff --git a/src/main/java/hu/akarnokd/rxjava2/async/FutureCompletable.java b/src/main/java/hu/akarnokd/rxjava3/async/FutureCompletable.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/async/FutureCompletable.java rename to src/main/java/hu/akarnokd/rxjava3/async/FutureCompletable.java index 5755bf19..4caf1623 100644 --- a/src/main/java/hu/akarnokd/rxjava2/async/FutureCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/FutureCompletable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.async; +package hu.akarnokd.rxjava3.async; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/hu/akarnokd/rxjava2/async/ObservableFromCallableNull.java b/src/main/java/hu/akarnokd/rxjava3/async/ObservableFromSupplierNull.java similarity index 71% rename from src/main/java/hu/akarnokd/rxjava2/async/ObservableFromCallableNull.java rename to src/main/java/hu/akarnokd/rxjava3/async/ObservableFromSupplierNull.java index 70df501c..b46b4245 100644 --- a/src/main/java/hu/akarnokd/rxjava2/async/ObservableFromCallableNull.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/ObservableFromSupplierNull.java @@ -14,30 +14,29 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.async; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.async; import io.reactivex.*; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; import io.reactivex.internal.observers.DeferredScalarDisposable; /** - * Runs a callable and treats a null result as completion. + * Runs a supplier and treats a null result as completion. * * @param the value type */ -final class ObservableFromCallableNull extends Observable implements Callable { +final class ObservableFromSupplierNull extends Observable implements Supplier { - final Callable callable; + final Supplier supplier; - ObservableFromCallableNull(Callable callable) { - this.callable = callable; + ObservableFromSupplierNull(Supplier supplier) { + this.supplier = supplier; } @Override protected void subscribeActual(Observer observer) { - CallableNullDisposable deferred = new CallableNullDisposable(observer); + SupplierNullDisposable deferred = new SupplierNullDisposable(observer); observer.onSubscribe(deferred); if (!deferred.isDisposed()) { @@ -45,7 +44,7 @@ protected void subscribeActual(Observer observer) { T v; try { - v = callable.call(); + v = supplier.get(); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); if (!deferred.isDisposed()) { @@ -65,15 +64,15 @@ protected void subscribeActual(Observer observer) { } @Override - public T call() throws Exception { - return callable.call(); + public T get() throws Throwable { + return supplier.get(); } - static final class CallableNullDisposable extends DeferredScalarDisposable { + static final class SupplierNullDisposable extends DeferredScalarDisposable { private static final long serialVersionUID = -7088349936918117528L; - CallableNullDisposable(Observer downstream) { + SupplierNullDisposable(Observer downstream) { super(downstream); } diff --git a/src/main/java/hu/akarnokd/rxjava2/async/package-info.java b/src/main/java/hu/akarnokd/rxjava3/async/package-info.java similarity index 82% rename from src/main/java/hu/akarnokd/rxjava2/async/package-info.java rename to src/main/java/hu/akarnokd/rxjava3/async/package-info.java index 7fb7a2a5..f3e5a91e 100644 --- a/src/main/java/hu/akarnokd/rxjava2/async/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/package-info.java @@ -16,8 +16,8 @@ /** * Utility methods to jumpstart a reactive sequence via - * {@link hu.akarnokd.rxjava2.async.AsyncFlowable AsyncFlowable} - * and {@link hu.akarnokd.rxjava2.async.AsyncObservable AsyncObservable}; + * {@link hu.akarnokd.rxjava3.async.AsyncFlowable AsyncFlowable} + * and {@link hu.akarnokd.rxjava3.async.AsyncObservable AsyncObservable}; * port of the RxJavaAsyncUtil library. */ -package hu.akarnokd.rxjava2.async; \ No newline at end of file +package hu.akarnokd.rxjava3.async; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/BasicEmptyQueueSubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicEmptyQueueSubscription.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/BasicEmptyQueueSubscription.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/BasicEmptyQueueSubscription.java index 2f560c05..69ada78a 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/BasicEmptyQueueSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicEmptyQueueSubscription.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import io.reactivex.internal.fuseable.QueueSubscription; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/BasicNonoIntQueueSubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoIntQueueSubscription.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/BasicNonoIntQueueSubscription.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoIntQueueSubscription.java index a20d8897..e8b1d963 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/BasicNonoIntQueueSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoIntQueueSubscription.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/BasicNonoSubscriber.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoSubscriber.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/BasicNonoSubscriber.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoSubscriber.java index 6633042d..e0e1c6ce 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/BasicNonoSubscriber.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoSubscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/BasicRefNonoSubscriber.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefNonoSubscriber.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/BasicRefNonoSubscriber.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefNonoSubscriber.java index 8f96ed67..d1889eac 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/BasicRefNonoSubscriber.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefNonoSubscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/BasicRefQueueSubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefQueueSubscription.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/BasicRefQueueSubscription.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefQueueSubscription.java index ccd18ef8..a9398d4f 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/BasicRefQueueSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefQueueSubscription.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/BasicSoloQueueSubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicSoloQueueSubscription.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/BasicSoloQueueSubscription.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/BasicSoloQueueSubscription.java index 1b073744..9976f026 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/BasicSoloQueueSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicSoloQueueSubscription.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import io.reactivex.internal.fuseable.QueueSubscription; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/BlockingGetSubscriber.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BlockingGetSubscriber.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/BlockingGetSubscriber.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/BlockingGetSubscriber.java index b9920786..1f4c06dd 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/BlockingGetSubscriber.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BlockingGetSubscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/FuturePerhapsSubscriber.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/FuturePerhapsSubscriber.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/FuturePerhapsSubscriber.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/FuturePerhapsSubscriber.java index 7e4e0dff..c4b13efe 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/FuturePerhapsSubscriber.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/FuturePerhapsSubscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/Nono.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/Nono.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/Nono.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/Nono.java index 2d947fdb..bf609cf7 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/Nono.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/Nono.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.*; @@ -138,11 +138,11 @@ public static Nono error(Throwable ex) { /** * Returns a Nono that signals a Throwable generated by the - * callable for each individual subscriber. + * supplier for each individual subscriber. * @param errorSupplier the Throwable error supplier, not null * @return the new Nono instance */ - public static Nono error(Callable errorSupplier) { + public static Nono error(Supplier errorSupplier) { ObjectHelper.requireNonNull(errorSupplier, "errorSupplier is null"); return onAssembly(new NonoErrorSupplier(errorSupplier)); } @@ -154,7 +154,7 @@ public static Nono error(Callable errorSupplier) { * subscriber. * @return the new Nono instance */ - public static Nono defer(Callable supplier) { + public static Nono defer(Supplier supplier) { ObjectHelper.requireNonNull(supplier, "supplier is null"); return onAssembly(new NonoDefer(supplier)); } @@ -478,7 +478,7 @@ public static Nono timer(long delay, TimeUnit unit, Scheduler scheduler) { * downstream cancels * @return the new Nono instance */ - public static Nono using(Callable resourceSupplier, Function sourceSupplier, + public static Nono using(Supplier resourceSupplier, Function sourceSupplier, Consumer disposer) { return using(resourceSupplier, sourceSupplier, disposer, true); } @@ -496,7 +496,7 @@ public static Nono using(Callable resourceSupplier, Function Nono using(Callable resourceSupplier, Function sourceSupplier, + public static Nono using(Supplier resourceSupplier, Function sourceSupplier, Consumer disposer, boolean eager) { ObjectHelper.requireNonNull(resourceSupplier, "resourceSupplier is null"); ObjectHelper.requireNonNull(sourceSupplier, "sourceSupplier is null"); @@ -761,12 +761,12 @@ public final Nono mapError(Function mapp * @param the value type * @param onErrorMapper the function that receives the upstream error and * returns a Publisher to emit events of - * @param onCompleteMapper the callable that returns a Publisher to emit + * @param onCompleteMapper the supplier that returns a Publisher to emit * events of * @return the new Flowable instance */ public final Flowable flatMap(Function> onErrorMapper, - Callable> onCompleteMapper) { + Supplier> onCompleteMapper) { ObjectHelper.requireNonNull(onErrorMapper, "onErrorMapper is null"); ObjectHelper.requireNonNull(onCompleteMapper, "onCompleteMapper is null"); return RxJavaPlugins.onAssembly(new NonoFlatMapSignal(this, onErrorMapper, onCompleteMapper)); @@ -1193,9 +1193,9 @@ public final TestSubscriber test(boolean cancelled) { */ @SchedulerSupport(SchedulerSupport.NONE) public final Throwable blockingAwait() { - if (this instanceof Callable) { + if (this instanceof Supplier) { try { - ((Callable)this).call(); + ((Supplier)this).get(); return null; } catch (Throwable ex) { Exceptions.throwIfFatal(ex); @@ -1217,9 +1217,9 @@ public final Throwable blockingAwait() { */ @SchedulerSupport(SchedulerSupport.NONE) public final Throwable blockingAwait(long timeout, TimeUnit unit) { - if (this instanceof Callable) { + if (this instanceof Supplier) { try { - ((Callable)this).call(); + ((Supplier)this).get(); return null; } catch (Throwable ex) { Exceptions.throwIfFatal(ex); diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoAmbArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAmbArray.java similarity index 93% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoAmbArray.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAmbArray.java index 4ee95172..9bec3c08 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoAmbArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAmbArray.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.NonoAmbIterable.AmbSubscriber; +import hu.akarnokd.rxjava3.basetypes.NonoAmbIterable.AmbSubscriber; import io.reactivex.exceptions.Exceptions; /** diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoAmbIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAmbIterable.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoAmbIterable.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAmbIterable.java index 7559ff87..e8aad12c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoAmbIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAmbIterable.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.util.CompositeSubscription; +import hu.akarnokd.rxjava3.util.CompositeSubscription; import io.reactivex.exceptions.Exceptions; import io.reactivex.internal.subscriptions.BasicIntQueueSubscription; import io.reactivex.plugins.RxJavaPlugins; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoAndThen.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAndThen.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoAndThen.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAndThen.java index 95bc0fb3..c2b919dc 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoAndThen.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAndThen.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoAndThenPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAndThenPublisher.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoAndThenPublisher.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAndThenPublisher.java index 48c44cf9..19093c80 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoAndThenPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAndThenPublisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoBlockingAwaitSubscriber.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoBlockingAwaitSubscriber.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoBlockingAwaitSubscriber.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoBlockingAwaitSubscriber.java index 421821f9..002c13a3 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoBlockingAwaitSubscriber.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoBlockingAwaitSubscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoCache.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoCache.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoCache.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoCache.java index 6fb69b10..b429b920 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoCache.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoCache.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoComplete.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoComplete.java similarity index 84% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoComplete.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoComplete.java index 9d487ad4..29c55456 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoComplete.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoComplete.java @@ -14,18 +14,17 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; +import io.reactivex.functions.Supplier; import io.reactivex.internal.subscriptions.EmptySubscription; /** * Completes the subscriber immediately. */ -final class NonoComplete extends Nono implements Callable { +final class NonoComplete extends Nono implements Supplier { static final NonoComplete INSTANCE = new NonoComplete(); @@ -35,7 +34,7 @@ protected void subscribeActual(Subscriber s) { } @Override - public Void call() throws Exception { + public Void get() throws Exception { return null; } } diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoConcat.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoConcat.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java index 6520131d..05180710 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoConcat.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoConcatArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatArray.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoConcatArray.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatArray.java index b85552fe..0a7616c6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoConcatArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatArray.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoConcatIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatIterable.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoConcatIterable.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatIterable.java index 311af0cc..5cd69651 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoConcatIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatIterable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.Iterator; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoCreate.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoCreate.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoCreate.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoCreate.java index 8f94d06e..27fa713e 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoCreate.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoCreate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoDefer.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDefer.java similarity index 81% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoDefer.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDefer.java index cab1f4f8..501246c6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoDefer.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDefer.java @@ -14,21 +14,20 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.internal.subscriptions.EmptySubscription; final class NonoDefer extends Nono { - final Callable supplier; + final Supplier supplier; - NonoDefer(Callable supplier) { + NonoDefer(Supplier supplier) { this.supplier = supplier; } @@ -37,7 +36,7 @@ protected void subscribeActual(Subscriber s) { Nono np; try { - np = ObjectHelper.requireNonNull(supplier.call(), "The supplier returned a null Nono"); + np = ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null Nono"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoDelay.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDelay.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoDelay.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDelay.java index 44118133..77ec01d0 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoDelay.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDelay.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoDelaySubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDelaySubscription.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoDelaySubscription.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDelaySubscription.java index e8f69509..577145c7 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoDelaySubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDelaySubscription.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoDoFinally.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDoFinally.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoDoFinally.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDoFinally.java index b2a51dd3..14f488ff 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoDoFinally.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDoFinally.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoDoOnLifecycle.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDoOnLifecycle.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoDoOnLifecycle.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDoOnLifecycle.java index 226b6c3a..9774b824 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoDoOnLifecycle.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDoOnLifecycle.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoError.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoError.java similarity index 77% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoError.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoError.java index a6a8c69e..83cc2788 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoError.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoError.java @@ -14,19 +14,17 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.util.SneakyThrows; +import io.reactivex.functions.Supplier; import io.reactivex.internal.subscriptions.EmptySubscription; /** * Signals a constant Throwable to the subscriber. */ -final class NonoError extends Nono implements Callable { +final class NonoError extends Nono implements Supplier { final Throwable error; @@ -40,7 +38,7 @@ protected void subscribeActual(Subscriber s) { } @Override - public Void call() throws Exception { - throw SneakyThrows.justThrow(error); + public Void get() throws Throwable { + throw error; } } diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoErrorSupplier.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoErrorSupplier.java similarity index 68% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoErrorSupplier.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoErrorSupplier.java index 84cd1196..a65159fa 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoErrorSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoErrorSupplier.java @@ -14,25 +14,23 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.util.SneakyThrows; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.internal.subscriptions.EmptySubscription; /** * Signals a constant Throwable to the subscriber. */ -final class NonoErrorSupplier extends Nono implements Callable { +final class NonoErrorSupplier extends Nono implements Supplier { - final Callable errorSupplier; + final Supplier errorSupplier; - NonoErrorSupplier(Callable errorSupplier) { + NonoErrorSupplier(Supplier errorSupplier) { this.errorSupplier = errorSupplier; } @@ -40,7 +38,7 @@ final class NonoErrorSupplier extends Nono implements Callable { protected void subscribeActual(Subscriber s) { Throwable ex; try { - ex = ObjectHelper.requireNonNull(errorSupplier.call(), "The errorSupplier returned a null Throwable"); + ex = ObjectHelper.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); } catch (Throwable e) { Exceptions.throwIfFatal(e); ex = e; @@ -50,14 +48,14 @@ protected void subscribeActual(Subscriber s) { } @Override - public Void call() throws Exception { + public Void get() throws Throwable { Throwable ex; try { - ex = ObjectHelper.requireNonNull(errorSupplier.call(), "The errorSupplier returned a null Throwable"); + ex = ObjectHelper.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); } catch (Throwable e) { Exceptions.throwIfFatal(e); ex = e; } - throw SneakyThrows.justThrow(ex); + throw ex; } } diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFlatMapSignal.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFlatMapSignal.java similarity index 91% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFlatMapSignal.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFlatMapSignal.java index 71ed665a..fb359915 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFlatMapSignal.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFlatMapSignal.java @@ -14,16 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; -import java.util.concurrent.Callable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; import io.reactivex.Flowable; import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.internal.subscriptions.SubscriptionHelper; @@ -38,10 +37,10 @@ final class NonoFlatMapSignal extends Flowable { final Function> onErrorMapper; - final Callable> onCompleteMapper; + final Supplier> onCompleteMapper; NonoFlatMapSignal(Nono source, Function> onErrorMapper, - Callable> onCompleteMapper) { + Supplier> onCompleteMapper) { this.source = source; this.onErrorMapper = onErrorMapper; this.onCompleteMapper = onCompleteMapper; @@ -61,7 +60,7 @@ static final class FlatMapSignalSubscriber extends AtomicReference> onErrorMapper; - final Callable> onCompleteMapper; + final Supplier> onCompleteMapper; final AtomicLong requested; @@ -69,7 +68,7 @@ static final class FlatMapSignalSubscriber extends AtomicReference downstream, Function> onErrorMapper, - Callable> onCompleteMapper) { + Supplier> onCompleteMapper) { this.downstream = downstream; this.onErrorMapper = onErrorMapper; this.onCompleteMapper = onCompleteMapper; @@ -119,7 +118,7 @@ public void onError(Throwable t) { public void onComplete() { Publisher p; try { - p = ObjectHelper.requireNonNull(onCompleteMapper.call(), "The onCompleteMapper returned a null Nono"); + p = ObjectHelper.requireNonNull(onCompleteMapper.get(), "The onCompleteMapper returned a null Nono"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromAction.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromAction.java similarity index 85% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromAction.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromAction.java index a7cd665c..d066bb88 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromAction.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromAction.java @@ -14,20 +14,18 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Action; +import io.reactivex.functions.*; import io.reactivex.internal.subscriptions.EmptySubscription; /** * Execute an action and complete the sequence or relay it error. */ -final class NonoFromAction extends Nono implements Callable { +final class NonoFromAction extends Nono implements Supplier { final Action action; @@ -49,7 +47,7 @@ protected void subscribeActual(Subscriber s) { } @Override - public Void call() throws Exception { + public Void get() throws Throwable { action.run(); return null; } diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromCompletable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromCompletable.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromCompletable.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromCompletable.java index 7dd41ff5..232e6cc3 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromCompletable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromFuture.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromFuture.java similarity index 90% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromFuture.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromFuture.java index 10923acf..4d4e269c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromFuture.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromFuture.java @@ -14,19 +14,20 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.*; import org.reactivestreams.Subscriber; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; import io.reactivex.internal.subscriptions.EmptySubscription; /** * Block until the Future completes or times out. */ -final class NonoFromFuture extends Nono implements Callable { +final class NonoFromFuture extends Nono implements Supplier { final Future future; @@ -62,7 +63,7 @@ protected void subscribeActual(Subscriber s) { } @Override - public Void call() throws Exception { + public Void get() throws Throwable { if (timeout > 0L) { future.get(timeout, unit); } else { diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromMaybe.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromMaybe.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromMaybe.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromMaybe.java index 0f1a26ae..824556b5 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromMaybe.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromObservable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromObservable.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromObservable.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromObservable.java index a196f4be..c1a75cbe 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromObservable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromPublisher.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromPublisher.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromPublisher.java index 48594746..305870c0 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromPublisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromSingle.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromSingle.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromSingle.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromSingle.java index 7efed3ae..5c067726 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoFromSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromSingle.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoHide.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoHide.java similarity index 90% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoHide.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoHide.java index cc5d54c4..29d2ab82 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoHide.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoHide.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.SoloHide.HideSubscriber; +import hu.akarnokd.rxjava3.basetypes.SoloHide.HideSubscriber; /** * Hides the identity of the upstream and downstream including diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoLambdaSubscriber.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLambdaSubscriber.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoLambdaSubscriber.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLambdaSubscriber.java index 04208fa4..ecf2c7ff 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoLambdaSubscriber.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLambdaSubscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoLift.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLift.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoLift.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLift.java index f7aaec70..f8cf9a79 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoLift.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLift.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoMapError.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMapError.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoMapError.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMapError.java index 7e958bd5..3252697a 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoMapError.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMapError.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoMerge.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMerge.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoMerge.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMerge.java index e452d7a7..7f9164d0 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoMerge.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMerge.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoMergeArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeArray.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoMergeArray.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeArray.java index 33730ab7..3f8d21fc 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoMergeArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeArray.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.util.CompositeSubscription; +import hu.akarnokd.rxjava3.util.CompositeSubscription; import io.reactivex.internal.subscriptions.*; import io.reactivex.internal.util.*; import io.reactivex.plugins.RxJavaPlugins; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoMergeIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeIterable.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoMergeIterable.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeIterable.java index 5a752ea0..1afc1816 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoMergeIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeIterable.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.Iterator; import java.util.concurrent.atomic.AtomicInteger; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.NonoMergeArray.*; -import hu.akarnokd.rxjava2.util.CompositeSubscription; +import hu.akarnokd.rxjava3.basetypes.NonoMergeArray.*; +import hu.akarnokd.rxjava3.util.CompositeSubscription; import io.reactivex.exceptions.Exceptions; import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.internal.subscriptions.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoNever.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoNever.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoNever.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoNever.java index 23146e48..6c0cdd94 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoNever.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoNever.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoObserveOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoObserveOn.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoObserveOn.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoObserveOn.java index d3f242c1..fa41f1c7 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoObserveOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoObserveOn.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoOnErrorComplete.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoOnErrorComplete.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoOnErrorComplete.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoOnErrorComplete.java index 6a01279e..1e4a8c42 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoOnErrorComplete.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoOnErrorComplete.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoOnErrorResume.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoOnErrorResume.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoOnErrorResume.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoOnErrorResume.java index a78cb551..99a809dd 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoOnErrorResume.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoOnErrorResume.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoProcessor.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoProcessor.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoProcessor.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoProcessor.java index a60eb946..98f19726 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoProcessor.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRepeat.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeat.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRepeat.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeat.java index ae37c6ad..52f4eb81 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRepeat.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRepeatUntil.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatUntil.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRepeatUntil.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatUntil.java index 339a404b..c84e2527 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRepeatUntil.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatUntil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRepeatWhen.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatWhen.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRepeatWhen.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatWhen.java index ced3fb5a..e6b78ec0 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRepeatWhen.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatWhen.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRetry.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetry.java similarity index 93% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRetry.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetry.java index da781af7..4bfc50c3 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRetry.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetry.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.NonoRepeat.RedoSubscriber; +import hu.akarnokd.rxjava3.basetypes.NonoRepeat.RedoSubscriber; /** * Repeatedly re-subscribe to the source Nono if it fails. diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRetryWhen.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhen.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRetryWhen.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhen.java index b203dd1f..ba21392d 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRetryWhen.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhen.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.basetypes.NonoRepeatWhen.*; +import hu.akarnokd.rxjava3.basetypes.NonoRepeatWhen.*; import io.reactivex.Flowable; import io.reactivex.exceptions.Exceptions; import io.reactivex.functions.Function; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRetryWhile.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhile.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRetryWhile.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhile.java index e2c13169..583b662e 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoRetryWhile.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoSubscribeOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoSubscribeOn.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoSubscribeOn.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoSubscribeOn.java index 19aee90c..43f479c6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoSubscribeOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoSubscribeOn.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoTakeUntil.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTakeUntil.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoTakeUntil.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTakeUntil.java index 8928a67a..ed1ca717 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoTakeUntil.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTakeUntil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoTimeout.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTimeout.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoTimeout.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTimeout.java index 61124133..661059bd 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoTimeout.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTimeout.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoTimer.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTimer.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoTimer.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTimer.java index 8b89016a..da76dffb 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoTimer.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTimer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoToMaybe.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoToMaybe.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoToMaybe.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoToMaybe.java index a9edba5d..3d943f36 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoToMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoToMaybe.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoToPerhaps.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoToPerhaps.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoToPerhaps.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoToPerhaps.java index 88d9fcea..05c3b3b6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoToPerhaps.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoToPerhaps.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoUnsubscribeOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUnsubscribeOn.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoUnsubscribeOn.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUnsubscribeOn.java index d57243b0..c7c0571a 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoUnsubscribeOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUnsubscribeOn.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoUsing.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUsing.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/NonoUsing.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUsing.java index 18f42e1e..009c0570 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/NonoUsing.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUsing.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; @@ -32,7 +30,7 @@ */ final class NonoUsing extends Nono { - final Callable resourceSupplier; + final Supplier resourceSupplier; final Function sourceSupplier; @@ -40,7 +38,7 @@ final class NonoUsing extends Nono { final boolean eager; - NonoUsing(Callable resourceSupplier, + NonoUsing(Supplier resourceSupplier, Function sourceSupplier, Consumer disposer, boolean eager) { this.resourceSupplier = resourceSupplier; @@ -54,7 +52,7 @@ protected void subscribeActual(Subscriber s) { R resource; try { - resource = resourceSupplier.call(); + resource = resourceSupplier.get(); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/Perhaps.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/Perhaps.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/Perhaps.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/Perhaps.java index 92673eba..412db8c0 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/Perhaps.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/Perhaps.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.*; @@ -137,7 +137,7 @@ public static Perhaps error(Throwable error) { * return a Throwable to be signalled * @return the new Perhaps instance */ - public static Perhaps error(Callable errorSupplier) { + public static Perhaps error(Supplier errorSupplier) { ObjectHelper.requireNonNull(errorSupplier, "errorSupplier is null"); return onAssembly(new PerhapsErrorSupplier(errorSupplier)); } @@ -252,13 +252,13 @@ public static Perhaps fromCompletable(CompletableSource source) { /** * Defers the creation of the actual Perhaps instance until * subscription time and for each downstream Subscriber the given - * callable is called. + * Supplier is called. * @param the value type - * @param supplier the Callable called for each individual Subscriber + * @param supplier the Supplier called for each individual Subscriber * to return a Perhaps to be subscribe to. * @return the new Perhaps instance */ - public static Perhaps defer(Callable> supplier) { + public static Perhaps defer(Supplier> supplier) { ObjectHelper.requireNonNull(supplier, "supplier is null"); return onAssembly(new PerhapsDefer(supplier)); } @@ -554,7 +554,7 @@ public static Perhaps timer(long delay, TimeUnit unit, Scheduler scheduler * downstream cancels * @return the new Perhaps instance */ - public static Perhaps using(Callable resourceSupplier, + public static Perhaps using(Supplier resourceSupplier, Function> sourceSupplier, Consumer disposer) { return using(resourceSupplier, sourceSupplier, disposer, true); @@ -574,7 +574,7 @@ public static Perhaps using(Callable resourceSupplier, * if false, the resource is disposed after the terminal event has been emitted * @return the new Perhaps instance */ - public static Perhaps using(Callable resourceSupplier, + public static Perhaps using(Supplier resourceSupplier, Function> sourceSupplier, Consumer disposer, boolean eager) { ObjectHelper.requireNonNull(resourceSupplier, "resourceSupplier is null"); @@ -772,7 +772,7 @@ public final Perhaps flatMap(Function Perhaps flatMap(Function> onSuccessMapper, Function> onErrorMapper, - Callable> onCompleteMapper) { + Supplier> onCompleteMapper) { ObjectHelper.requireNonNull(onSuccessMapper, "onSuccessMapper is null"); ObjectHelper.requireNonNull(onErrorMapper, "onErrorMapper is null"); ObjectHelper.requireNonNull(onCompleteMapper, "onCompleteMapper is null"); diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsAmbArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbArray.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsAmbArray.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbArray.java index d55aa677..6ab6478e 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsAmbArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbArray.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicBoolean; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.util.CompositeSubscription; +import hu.akarnokd.rxjava3.util.CompositeSubscription; import io.reactivex.internal.subscriptions.DeferredScalarSubscription; import io.reactivex.plugins.RxJavaPlugins; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsAmbIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbIterable.java similarity index 93% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsAmbIterable.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbIterable.java index a05e8574..5fdd6030 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsAmbIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbIterable.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.SoloAmbArray.AmbSubscriber; +import hu.akarnokd.rxjava3.basetypes.SoloAmbArray.AmbSubscriber; import io.reactivex.exceptions.Exceptions; import io.reactivex.internal.functions.ObjectHelper; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsAndThenNono.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAndThenNono.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsAndThenNono.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAndThenNono.java index 6720a764..5808a9f1 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsAndThenNono.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAndThenNono.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsCache.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCache.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsCache.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCache.java index 09786ac9..bceaeeae 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsCache.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCache.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsCreate.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCreate.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsCreate.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCreate.java index 8a43e0d4..8dbe4d0b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsCreate.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCreate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDefaultIfEmpty.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefaultIfEmpty.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDefaultIfEmpty.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefaultIfEmpty.java index 78e75f82..5f041b17 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDefaultIfEmpty.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefaultIfEmpty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDefer.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefer.java similarity index 81% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDefer.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefer.java index 5bc4da1e..924abeed 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDefer.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefer.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.internal.subscriptions.EmptySubscription; @@ -31,9 +30,9 @@ */ final class PerhapsDefer extends Perhaps { - final Callable> supplier; + final Supplier> supplier; - PerhapsDefer(Callable> supplier) { + PerhapsDefer(Supplier> supplier) { this.supplier = supplier; } @@ -42,7 +41,7 @@ protected void subscribeActual(Subscriber s) { Perhaps sp; try { - sp = ObjectHelper.requireNonNull(supplier.call(), "The supplier returned a null Solo"); + sp = ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null Solo"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDelay.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelay.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDelay.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelay.java index 823b6789..1af415d2 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDelay.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelay.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDelayPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelayPublisher.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDelayPublisher.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelayPublisher.java index 65818513..0afee3f6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDelayPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelayPublisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDelaySubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelaySubscription.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDelaySubscription.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelaySubscription.java index 02e5be84..3c2ac2dd 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDelaySubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelaySubscription.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDoFinally.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoFinally.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDoFinally.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoFinally.java index 32dcea5a..324045dd 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDoFinally.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoFinally.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.SoloDoFinally.DoFinallySubscriber; +import hu.akarnokd.rxjava3.basetypes.SoloDoFinally.DoFinallySubscriber; import io.reactivex.functions.Action; /** diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDoOnLifecycle.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoOnLifecycle.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDoOnLifecycle.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoOnLifecycle.java index a1c913a5..b71052e6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsDoOnLifecycle.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoOnLifecycle.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; @@ -227,7 +227,7 @@ public int requestFusion(int mode) { } @Override - public T poll() throws Exception { + public T poll() throws Throwable { T v = queue.poll(); if (v != null) { diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsEmpty.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsEmpty.java similarity index 84% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsEmpty.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsEmpty.java index bb79e08e..7d51ebbf 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsEmpty.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsEmpty.java @@ -14,18 +14,17 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; +import io.reactivex.functions.Supplier; import io.reactivex.internal.subscriptions.EmptySubscription; /** * Completes the subscriber immediately. */ -final class PerhapsEmpty extends Perhaps implements Callable { +final class PerhapsEmpty extends Perhaps implements Supplier { static final PerhapsEmpty INSTANCE = new PerhapsEmpty(); @@ -40,7 +39,7 @@ protected void subscribeActual(Subscriber s) { } @Override - public Object call() throws Exception { + public Object get() throws Exception { return null; } } diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsError.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsError.java similarity index 77% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsError.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsError.java index 32160aae..28984177 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsError.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsError.java @@ -14,13 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.util.SneakyThrows; +import io.reactivex.functions.Supplier; import io.reactivex.internal.subscriptions.EmptySubscription; /** @@ -28,7 +26,7 @@ * * @param the value type */ -final class PerhapsError extends Perhaps implements Callable { +final class PerhapsError extends Perhaps implements Supplier { final Throwable error; @@ -42,7 +40,7 @@ protected void subscribeActual(Subscriber s) { } @Override - public T call() throws Exception { - throw SneakyThrows.justThrow(error); + public T get() throws Throwable { + throw error; } } diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsErrorSupplier.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsErrorSupplier.java similarity index 67% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsErrorSupplier.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsErrorSupplier.java index 45cf5179..7881b746 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsErrorSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsErrorSupplier.java @@ -14,27 +14,25 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.util.SneakyThrows; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.internal.subscriptions.EmptySubscription; /** - * Signals a Throwable returned by a callable. + * Signals a Throwable returned by a Supplier. * * @param the value type */ -final class PerhapsErrorSupplier extends Perhaps implements Callable { +final class PerhapsErrorSupplier extends Perhaps implements Supplier { - final Callable errorSupplier; + final Supplier errorSupplier; - PerhapsErrorSupplier(Callable errorSupplier) { + PerhapsErrorSupplier(Supplier errorSupplier) { this.errorSupplier = errorSupplier; } @@ -43,7 +41,7 @@ protected void subscribeActual(Subscriber s) { Throwable ex; try { - ex = ObjectHelper.requireNonNull(errorSupplier.call(), "The errorSupplier returned a null Throwable"); + ex = ObjectHelper.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); } catch (Throwable exc) { Exceptions.throwIfFatal(exc); ex = exc; @@ -53,7 +51,7 @@ protected void subscribeActual(Subscriber s) { } @Override - public T call() throws Exception { - throw SneakyThrows.justThrow(ObjectHelper.requireNonNull(errorSupplier.call(), "The errorSupplier returned a null Throwable")); + public T get() throws Throwable { + throw ObjectHelper.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); } } diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFilter.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFilter.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFilter.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFilter.java index 14869584..90671839 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFilter.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; @@ -74,7 +74,7 @@ public int requestFusion(int mode) { } @Override - public T poll() throws Exception { + public T poll() throws Throwable { T v = qs.poll(); return v == null || predicate.test(v) ? v : null; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFlatMap.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMap.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFlatMap.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMap.java index 8029dcc8..f2b2f62b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFlatMap.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFlatMapPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapPublisher.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFlatMapPublisher.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapPublisher.java index b44a6759..f9dd21b1 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFlatMapPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapPublisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFlatMapSignal.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapSignal.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFlatMapSignal.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapSignal.java index 8cdca2d3..3a12b37b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFlatMapSignal.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapSignal.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; -import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.internal.subscriptions.*; @@ -41,12 +40,12 @@ final class PerhapsFlatMapSignal extends Perhaps { final Function> onErrorMapper; - final Callable> onCompleteMapper; + final Supplier> onCompleteMapper; PerhapsFlatMapSignal(Perhaps source, Function> onSuccessMapper, Function> onErrorMapper, - Callable> onCompleteMapper + Supplier> onCompleteMapper ) { this.source = source; this.onSuccessMapper = onSuccessMapper; @@ -68,7 +67,7 @@ static final class FlatMapSubscriber extends DeferredScalarSubscription final Function> onErrorMapper; - final Callable> onCompleteMapper; + final Supplier> onCompleteMapper; final InnerSubscriber inner; @@ -79,7 +78,7 @@ static final class FlatMapSubscriber extends DeferredScalarSubscription FlatMapSubscriber(Subscriber downstream, Function> onSuccessMapper, Function> onErrorMapper, - Callable> onCompleteMapper) { + Supplier> onCompleteMapper) { super(downstream); this.onSuccessMapper = onSuccessMapper; this.onErrorMapper = onErrorMapper; @@ -132,7 +131,7 @@ public void onComplete() { if (!hasValue) { Perhaps ph; try { - ph = ObjectHelper.requireNonNull(onCompleteMapper.call(), "The onCompleteMapper returned a null Perhaps"); + ph = ObjectHelper.requireNonNull(onCompleteMapper.get(), "The onCompleteMapper returned a null Perhaps"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromAction.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromAction.java similarity index 83% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromAction.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromAction.java index 314822f6..cd58a7f8 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromAction.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromAction.java @@ -14,14 +14,12 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Action; +import io.reactivex.functions.*; import io.reactivex.internal.subscriptions.EmptySubscription; /** @@ -29,7 +27,7 @@ * * @param the value type */ -final class PerhapsFromAction extends Perhaps implements Callable { +final class PerhapsFromAction extends Perhaps implements Supplier { final Action action; @@ -42,7 +40,7 @@ protected void subscribeActual(Subscriber s) { s.onSubscribe(EmptySubscription.INSTANCE); try { - call(); + get(); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); s.onError(ex); @@ -53,7 +51,7 @@ protected void subscribeActual(Subscriber s) { } @Override - public T call() throws Exception { + public T get() throws Throwable { action.run(); return null; } diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromCallable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCallable.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromCallable.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCallable.java index 02d7748e..cfc1756f 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromCallable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCallable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.Callable; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromCompletable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCompletable.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromCompletable.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCompletable.java index 54727f66..3647e3d5 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCompletable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromFuture.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromFuture.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromFuture.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromFuture.java index 878369bd..e37770b5 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromFuture.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromFuture.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromMaybe.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromMaybe.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromMaybe.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromMaybe.java index 77d96e9f..7ca0f42d 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromMaybe.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromPublisher.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromPublisher.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromPublisher.java index c4f47f9f..5c152e95 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromPublisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromSingle.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromSingle.java similarity index 91% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromSingle.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromSingle.java index dfaf58da..f6946cf7 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsFromSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromSingle.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.SoloFromSingle.FromSingleObserver; +import hu.akarnokd.rxjava3.basetypes.SoloFromSingle.FromSingleObserver; import io.reactivex.SingleSource; /** diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsHide.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsHide.java similarity index 91% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsHide.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsHide.java index 07ca987f..b4ba816d 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsHide.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsHide.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.SoloHide.HideSubscriber; +import hu.akarnokd.rxjava3.basetypes.SoloHide.HideSubscriber; /** * Hides the identity of the upstream Solo and its Subscription. diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsJust.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsJust.java similarity index 84% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsJust.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsJust.java index f18f3fe7..6005ac2b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsJust.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsJust.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import io.reactivex.internal.fuseable.ScalarCallable; +import io.reactivex.internal.fuseable.ScalarSupplier; import io.reactivex.internal.subscriptions.ScalarSubscription; /** @@ -26,7 +26,7 @@ * * @param the value type */ -final class PerhapsJust extends Perhaps implements ScalarCallable { +final class PerhapsJust extends Perhaps implements ScalarSupplier { final T value; @@ -40,7 +40,7 @@ protected void subscribeActual(Subscriber s) { } @Override - public T call() { + public T get() { return value; } } diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsLift.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsLift.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsLift.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsLift.java index ca541dbc..950047fb 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsLift.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsLift.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsMap.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsMap.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsMap.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsMap.java index 2626a1f9..7bef5a51 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsMap.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsMap.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.SoloMap.MapSubscriber; +import hu.akarnokd.rxjava3.basetypes.SoloMap.MapSubscriber; import io.reactivex.functions.Function; /** diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsMapError.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsMapError.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsMapError.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsMapError.java index a240b3fd..74806af2 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsMapError.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsMapError.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.SoloMapError.MapErrorSubscriber; +import hu.akarnokd.rxjava3.basetypes.SoloMapError.MapErrorSubscriber; import io.reactivex.functions.Function; /** diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsNever.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsNever.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsNever.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsNever.java index e1cda184..8d385945 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsNever.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsNever.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsObserveOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsObserveOn.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsObserveOn.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsObserveOn.java index b122db27..41739b76 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsObserveOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsObserveOn.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.SoloObserveOn.ObserveOnSubscriber; +import hu.akarnokd.rxjava3.basetypes.SoloObserveOn.ObserveOnSubscriber; import io.reactivex.Scheduler; /** diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsOnErrorResumeNext.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeNext.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsOnErrorResumeNext.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeNext.java index 981c37ff..20f1622e 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsOnErrorResumeNext.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeNext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsOnErrorResumeWith.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeWith.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsOnErrorResumeWith.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeWith.java index fa373638..74903d11 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsOnErrorResumeWith.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeWith.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsOnErrorReturnItem.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorReturnItem.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsOnErrorReturnItem.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorReturnItem.java index 7d0897a9..1ff347f9 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsOnErrorReturnItem.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorReturnItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsProcessor.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsProcessor.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsProcessor.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsProcessor.java index 7542df9a..c2d2f681 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsProcessor.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsRetry.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetry.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsRetry.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetry.java index efcf3efc..c47f3643 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsRetry.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetry.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsRetryWhen.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhen.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsRetryWhen.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhen.java index 22408462..416bb04d 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsRetryWhen.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhen.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.NoSuchElementException; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsRetryWhile.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhile.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsRetryWhile.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhile.java index 14421972..4f86cd4b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsRetryWhile.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsSubscribeOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSubscribeOn.java similarity index 93% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsSubscribeOn.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSubscribeOn.java index 53d4f23c..f205939b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsSubscribeOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSubscribeOn.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.SoloSubscribeOn.SubscribeOnSubscriber; +import hu.akarnokd.rxjava3.basetypes.SoloSubscribeOn.SubscribeOnSubscriber; import io.reactivex.Scheduler; import io.reactivex.Scheduler.Worker; import io.reactivex.internal.disposables.DisposableHelper; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsSwitchIfEmpty.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSwitchIfEmpty.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsSwitchIfEmpty.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSwitchIfEmpty.java index 05feb894..8fc4306a 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsSwitchIfEmpty.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSwitchIfEmpty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsTakeUntil.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTakeUntil.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsTakeUntil.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTakeUntil.java index f57bb87b..a5ac4312 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsTakeUntil.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTakeUntil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsTimeout.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimeout.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsTimeout.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimeout.java index fdcea667..a9c65569 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsTimeout.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimeout.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsTimer.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimer.java similarity index 93% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsTimer.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimer.java index 4377eb93..0522693d 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsTimer.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimer.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.TimeUnit; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.SoloTimer.TimerSubscriber; +import hu.akarnokd.rxjava3.basetypes.SoloTimer.TimerSubscriber; import io.reactivex.Scheduler; import io.reactivex.disposables.Disposable; import io.reactivex.internal.disposables.DisposableHelper; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsToFlowable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToFlowable.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsToFlowable.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToFlowable.java index bce170f5..3f88d3d9 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsToFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToFlowable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsToMaybe.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToMaybe.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsToMaybe.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToMaybe.java index 5d99c72c..85cc641b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsToMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToMaybe.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsToObservable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToObservable.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsToObservable.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToObservable.java index 69928507..7b3b812c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsToObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToObservable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsUnsubscribeOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUnsubscribeOn.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsUnsubscribeOn.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUnsubscribeOn.java index d97016a4..d4d9ca68 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsUnsubscribeOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUnsubscribeOn.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.SoloUnsubscribeOn.UnsubscribeOnSubscriber; +import hu.akarnokd.rxjava3.basetypes.SoloUnsubscribeOn.UnsubscribeOnSubscriber; import io.reactivex.Scheduler; /** diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsUsing.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUsing.java similarity index 90% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsUsing.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUsing.java index b5e55ec8..25efc315 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsUsing.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUsing.java @@ -14,13 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.SoloUsing.UsingSubscriber; +import hu.akarnokd.rxjava3.basetypes.SoloUsing.UsingSubscriber; import io.reactivex.exceptions.*; import io.reactivex.functions.*; import io.reactivex.internal.functions.ObjectHelper; @@ -34,7 +32,7 @@ */ final class PerhapsUsing extends Perhaps { - final Callable resourceSupplier; + final Supplier resourceSupplier; final Function> sourceSupplier; @@ -42,7 +40,7 @@ final class PerhapsUsing extends Perhaps { final boolean eager; - PerhapsUsing(Callable resourceSupplier, + PerhapsUsing(Supplier resourceSupplier, Function> sourceSupplier, Consumer disposer, boolean eager) { this.resourceSupplier = resourceSupplier; @@ -56,7 +54,7 @@ protected void subscribeActual(Subscriber s) { R resource; try { - resource = resourceSupplier.call(); + resource = resourceSupplier.get(); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsZipArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipArray.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsZipArray.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipArray.java index 7b4fc73d..d8a855b5 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsZipArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipArray.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.Arrays; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsZipIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipIterable.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsZipIterable.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipIterable.java index edb0bd15..830bf67c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/PerhapsZipIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipIterable.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.Arrays; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.PerhapsZipArray.ZipCoordinator; +import hu.akarnokd.rxjava3.basetypes.PerhapsZipArray.ZipCoordinator; import io.reactivex.exceptions.Exceptions; import io.reactivex.functions.Function; import io.reactivex.internal.subscriptions.EmptySubscription; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/Solo.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/Solo.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/Solo.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/Solo.java index af638355..80af67bb 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/Solo.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/Solo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.*; @@ -128,7 +128,7 @@ public static Solo error(Throwable error) { * return a Throwable to be signalled * @return the new Solo instance */ - public static Solo error(Callable errorSupplier) { + public static Solo error(Supplier errorSupplier) { ObjectHelper.requireNonNull(errorSupplier, "errorSupplier is null"); return onAssembly(new SoloErrorSupplier(errorSupplier)); } @@ -160,7 +160,7 @@ public static Solo never() { * @param supplier the supplier of the actual Solo * @return the new Solo instance */ - public static Solo defer(Callable> supplier) { + public static Solo defer(Supplier> supplier) { ObjectHelper.requireNonNull(supplier, "supplier is null"); return onAssembly(new SoloDefer(supplier)); } @@ -518,7 +518,7 @@ public static Solo timer(long delay, TimeUnit unit, Scheduler scheduler) { * @return the new Solo instance */ public static Solo using( - Callable resourceSupplier, + Supplier resourceSupplier, Function> sourceSupplier, Consumer disposer ) { @@ -540,7 +540,7 @@ public static Solo using( * @return the new Solo instance */ public static Solo using( - Callable resourceSupplier, + Supplier resourceSupplier, Function> sourceSupplier, Consumer disposer, boolean eager diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloAmbArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbArray.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloAmbArray.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbArray.java index 96d187ce..1ad274bf 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloAmbArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbArray.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicBoolean; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.util.CompositeSubscription; +import hu.akarnokd.rxjava3.util.CompositeSubscription; import io.reactivex.internal.subscriptions.DeferredScalarSubscription; import io.reactivex.plugins.RxJavaPlugins; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloAmbIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbIterable.java similarity index 93% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloAmbIterable.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbIterable.java index f9511c50..f820ef43 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloAmbIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbIterable.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.SoloAmbArray.AmbSubscriber; +import hu.akarnokd.rxjava3.basetypes.SoloAmbArray.AmbSubscriber; import io.reactivex.exceptions.Exceptions; import io.reactivex.internal.functions.ObjectHelper; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloAndThen.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAndThen.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloAndThen.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAndThen.java index e694e42c..525dafae 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloAndThen.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAndThen.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloCache.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCache.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloCache.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCache.java index ffd2f770..70939513 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloCache.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCache.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloCreate.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCreate.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloCreate.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCreate.java index 6e389776..3d60a4c1 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloCreate.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCreate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDefer.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDefer.java similarity index 82% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDefer.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDefer.java index 33487292..8fa3666c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDefer.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDefer.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.internal.subscriptions.EmptySubscription; @@ -31,9 +30,9 @@ */ final class SoloDefer extends Solo { - final Callable> supplier; + final Supplier> supplier; - SoloDefer(Callable> supplier) { + SoloDefer(Supplier> supplier) { this.supplier = supplier; } @@ -42,7 +41,7 @@ protected void subscribeActual(Subscriber s) { Solo sp; try { - sp = ObjectHelper.requireNonNull(supplier.call(), "The supplier returned a null Solo"); + sp = ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null Solo"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDelay.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelay.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDelay.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelay.java index d8495f4a..93a2e118 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDelay.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelay.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDelayPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelayPublisher.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDelayPublisher.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelayPublisher.java index c4d0e7a5..4e0d8509 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDelayPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelayPublisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDelaySubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelaySubscription.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDelaySubscription.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelaySubscription.java index f8ef8864..bb2a2f2c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDelaySubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelaySubscription.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDoFinally.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoFinally.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDoFinally.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoFinally.java index 6bcaac97..07e7ace4 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDoFinally.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoFinally.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; @@ -125,7 +125,7 @@ public int requestFusion(int mode) { } @Override - public T poll() throws Exception { + public T poll() throws Throwable { T v = queue.poll(); if (sourceMode == SYNC && v == null) { runFinally(); diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDoOnLifecycle.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoOnLifecycle.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDoOnLifecycle.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoOnLifecycle.java index f9e43456..921d1c7e 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloDoOnLifecycle.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoOnLifecycle.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; @@ -227,7 +227,7 @@ public int requestFusion(int mode) { } @Override - public T poll() throws Exception { + public T poll() throws Throwable { T v = queue.poll(); if (v != null) { diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloError.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloError.java similarity index 77% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloError.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloError.java index 1491e91c..d26ad00e 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloError.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloError.java @@ -14,13 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.util.SneakyThrows; +import io.reactivex.functions.Supplier; import io.reactivex.internal.subscriptions.EmptySubscription; /** @@ -28,7 +26,7 @@ * * @param the value type */ -final class SoloError extends Solo implements Callable { +final class SoloError extends Solo implements Supplier { final Throwable error; @@ -42,7 +40,7 @@ protected void subscribeActual(Subscriber s) { } @Override - public T call() throws Exception { - throw SneakyThrows.justThrow(error); + public T get() throws Throwable { + throw error; } } diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloErrorSupplier.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloErrorSupplier.java similarity index 63% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloErrorSupplier.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloErrorSupplier.java index 4c48500e..0dcce14b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloErrorSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloErrorSupplier.java @@ -14,27 +14,25 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.util.SneakyThrows; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.internal.subscriptions.EmptySubscription; /** - * Signals a Throwable returned by a callable. + * Signals a Throwable returned by a supplier. * * @param the value type */ -final class SoloErrorSupplier extends Solo implements Callable { +final class SoloErrorSupplier extends Solo implements Supplier { - final Callable errorSupplier; + final Supplier errorSupplier; - SoloErrorSupplier(Callable errorSupplier) { + SoloErrorSupplier(Supplier errorSupplier) { this.errorSupplier = errorSupplier; } @@ -43,7 +41,7 @@ protected void subscribeActual(Subscriber s) { Throwable ex; try { - ex = ObjectHelper.requireNonNull(errorSupplier.call(), "The errorSupplier returned a null Throwable"); + ex = ObjectHelper.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); } catch (Throwable exc) { Exceptions.throwIfFatal(exc); ex = exc; @@ -53,7 +51,7 @@ protected void subscribeActual(Subscriber s) { } @Override - public T call() throws Exception { - throw SneakyThrows.justThrow(ObjectHelper.requireNonNull(errorSupplier.call(), "The errorSupplier returned a null Throwable")); + public T get() throws Throwable { + throw ObjectHelper.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); } } diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFilter.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFilter.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFilter.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFilter.java index b3bbeb16..7ea8f0fb 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFilter.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; @@ -77,7 +77,7 @@ public int requestFusion(int mode) { } @Override - public T poll() throws Exception { + public T poll() throws Throwable { T v = qs.poll(); if (v != null) { if (predicate.test(v)) { diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFlatMap.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMap.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFlatMap.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMap.java index 42211706..328ee662 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFlatMap.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFlatMapPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapPublisher.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFlatMapPublisher.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapPublisher.java index ef710699..5cafc13d 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFlatMapPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapPublisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFlatMapSignal.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapSignal.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFlatMapSignal.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapSignal.java index 9e8f1548..92cca2e2 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFlatMapSignal.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapSignal.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFromCallable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromCallable.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFromCallable.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromCallable.java index 7fe63d1c..34f81168 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFromCallable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromCallable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.NoSuchElementException; import java.util.concurrent.Callable; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFromFuture.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromFuture.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFromFuture.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromFuture.java index 65182ad7..83400600 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFromFuture.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromFuture.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.NoSuchElementException; import java.util.concurrent.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFromPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromPublisher.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFromPublisher.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromPublisher.java index f7fd26bb..7f2e21a2 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFromPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromPublisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.NoSuchElementException; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFromSingle.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromSingle.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFromSingle.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromSingle.java index b12a8254..6d39ec1c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloFromSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromSingle.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloHide.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloHide.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloHide.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloHide.java index 65096265..5ab97e00 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloHide.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloHide.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloJust.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloJust.java similarity index 84% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloJust.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloJust.java index 483f042f..1e174726 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloJust.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloJust.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; -import io.reactivex.internal.fuseable.ScalarCallable; +import io.reactivex.internal.fuseable.ScalarSupplier; import io.reactivex.internal.subscriptions.ScalarSubscription; /** @@ -26,7 +26,7 @@ * * @param the value type */ -final class SoloJust extends Solo implements ScalarCallable { +final class SoloJust extends Solo implements ScalarSupplier { final T value; @@ -40,7 +40,7 @@ protected void subscribeActual(Subscriber s) { } @Override - public T call() { + public T get() { return value; } } diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloLift.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloLift.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloLift.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloLift.java index 7b8f8678..9ef5b2e4 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloLift.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloLift.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloMap.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMap.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloMap.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMap.java index 17bb792f..c68dc0a4 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloMap.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; @@ -79,7 +79,7 @@ public int requestFusion(int mode) { } @Override - public R poll() throws Exception { + public R poll() throws Throwable { T v = qs.poll(); if (v != null) { return ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null value"); diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloMapError.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMapError.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloMapError.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMapError.java index c42d90a1..766a62a1 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloMapError.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMapError.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; @@ -81,7 +81,7 @@ public int requestFusion(int mode) { } @Override - public T poll() throws Exception { + public T poll() throws Throwable { return qs.poll(); } } diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloNever.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloNever.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloNever.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloNever.java index 57b677c3..2a83ebb0 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloNever.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloNever.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloObserveOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloObserveOn.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloObserveOn.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloObserveOn.java index f6a2c566..b07d3aa6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloObserveOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloObserveOn.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.util.SpscOneQueue; +import hu.akarnokd.rxjava3.util.SpscOneQueue; import io.reactivex.Scheduler; import io.reactivex.Scheduler.Worker; import io.reactivex.exceptions.Exceptions; @@ -146,7 +146,7 @@ public void clear() { } @Override - public T poll() throws Exception { + public T poll() throws Throwable { return queue.poll(); } diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloOnErrorResumeNext.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeNext.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloOnErrorResumeNext.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeNext.java index 933984bd..58dcdefd 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloOnErrorResumeNext.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeNext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloOnErrorResumeWith.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeWith.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloOnErrorResumeWith.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeWith.java index 69d688bf..fd74cc0a 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloOnErrorResumeWith.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeWith.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloOnErrorReturnItem.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorReturnItem.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloOnErrorReturnItem.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorReturnItem.java index 519a1249..4c2cf41c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloOnErrorReturnItem.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorReturnItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloProcessor.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloProcessor.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloProcessor.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloProcessor.java index 51b602d7..a49979c1 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloProcessor.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.NoSuchElementException; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloRetry.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetry.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloRetry.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetry.java index 0b246661..ec85386b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloRetry.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetry.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloRetryWhen.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhen.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloRetryWhen.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhen.java index 66ad8dd5..094133c5 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloRetryWhen.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhen.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.NoSuchElementException; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloRetryWhile.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhile.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloRetryWhile.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhile.java index b13e8ced..834669cd 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloRetryWhile.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloSubscribeOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloSubscribeOn.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloSubscribeOn.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloSubscribeOn.java index d1a44fc2..adcd26ea 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloSubscribeOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloSubscribeOn.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloTakeUntil.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTakeUntil.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloTakeUntil.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTakeUntil.java index a5d0fc97..22fcb7a7 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloTakeUntil.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTakeUntil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.NoSuchElementException; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloTimeout.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimeout.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloTimeout.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimeout.java index 57465324..c73291e1 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloTimeout.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimeout.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloTimer.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimer.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloTimer.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimer.java index 03f67745..8e51eab8 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloTimer.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloToFlowable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToFlowable.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloToFlowable.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToFlowable.java index 800a9eaa..b07ac4fa 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloToFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToFlowable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloToObservable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToObservable.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloToObservable.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToObservable.java index cbf02bba..c74c4731 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloToObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToObservable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloToSingle.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToSingle.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloToSingle.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToSingle.java index 5ec4b803..1a97c5a0 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloToSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToSingle.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloUnsubscribeOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUnsubscribeOn.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloUnsubscribeOn.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUnsubscribeOn.java index dbf99550..9abda4d0 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloUnsubscribeOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUnsubscribeOn.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import org.reactivestreams.Subscriber; @@ -70,7 +70,7 @@ public int requestFusion(int mode) { } @Override - public T poll() throws Exception { + public T poll() throws Throwable { return qs.poll(); } diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloUsing.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUsing.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloUsing.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUsing.java index ca8acd5e..6b04f041 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloUsing.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUsing.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; -import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; import org.reactivestreams.*; @@ -34,7 +33,7 @@ */ final class SoloUsing extends Solo { - final Callable resourceSupplier; + final Supplier resourceSupplier; final Function> sourceSupplier; @@ -42,7 +41,7 @@ final class SoloUsing extends Solo { final boolean eager; - SoloUsing(Callable resourceSupplier, Function> sourceSupplier, + SoloUsing(Supplier resourceSupplier, Function> sourceSupplier, Consumer disposer, boolean eager) { this.resourceSupplier = resourceSupplier; this.sourceSupplier = sourceSupplier; @@ -55,7 +54,7 @@ protected void subscribeActual(Subscriber s) { R resource; try { - resource = resourceSupplier.call(); + resource = resourceSupplier.get(); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloZipArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipArray.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloZipArray.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipArray.java index 620e7fc9..eb093ddf 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloZipArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipArray.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.Arrays; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloZipIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipIterable.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/SoloZipIterable.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipIterable.java index 6a9c8b67..322c903f 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/SoloZipIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipIterable.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import java.util.Arrays; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.basetypes.SoloMap.MapSubscriber; -import hu.akarnokd.rxjava2.basetypes.SoloZipArray.ZipCoordinator; +import hu.akarnokd.rxjava3.basetypes.SoloMap.MapSubscriber; +import hu.akarnokd.rxjava3.basetypes.SoloZipArray.ZipCoordinator; import io.reactivex.exceptions.Exceptions; import io.reactivex.functions.Function; import io.reactivex.internal.functions.ObjectHelper; @@ -45,7 +45,7 @@ final class SoloZipIterable extends Solo implements Function { } @Override - public R apply(T t) throws Exception { + public R apply(T t) throws Throwable { return zipper.apply(new Object[] { t }); } diff --git a/src/main/java/hu/akarnokd/rxjava2/basetypes/package-info.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/package-info.java similarity index 77% rename from src/main/java/hu/akarnokd/rxjava2/basetypes/package-info.java rename to src/main/java/hu/akarnokd/rxjava3/basetypes/package-info.java index 68e150b3..cb8f7589 100644 --- a/src/main/java/hu/akarnokd/rxjava2/basetypes/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/package-info.java @@ -16,7 +16,7 @@ /** * Proof-of-concept backpressure enabled 0..1 element reactive types: - * {@link hu.akarnokd.rxjava2.basetypes.Solo Solo}, {@link hu.akarnokd.rxjava2.basetypes.Perhaps Perhaps} - * and {@link hu.akarnokd.rxjava2.basetypes.Nono Nono}. + * {@link hu.akarnokd.rxjava3.basetypes.Solo Solo}, {@link hu.akarnokd.rxjava3.basetypes.Perhaps Perhaps} + * and {@link hu.akarnokd.rxjava3.basetypes.Nono Nono}. */ -package hu.akarnokd.rxjava2.basetypes; \ No newline at end of file +package hu.akarnokd.rxjava3.basetypes; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava2/consumers/AbstractDisposableAutoRelease.java b/src/main/java/hu/akarnokd/rxjava3/consumers/AbstractDisposableAutoRelease.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/consumers/AbstractDisposableAutoRelease.java rename to src/main/java/hu/akarnokd/rxjava3/consumers/AbstractDisposableAutoRelease.java index 81c12aff..9f544012 100644 --- a/src/main/java/hu/akarnokd/rxjava2/consumers/AbstractDisposableAutoRelease.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/AbstractDisposableAutoRelease.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.consumers; +package hu.akarnokd.rxjava3.consumers; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/consumers/CompletableConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/CompletableConsumers.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/consumers/CompletableConsumers.java rename to src/main/java/hu/akarnokd/rxjava3/consumers/CompletableConsumers.java index 2c0d3159..aad5d05f 100644 --- a/src/main/java/hu/akarnokd/rxjava2/consumers/CompletableConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/CompletableConsumers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.consumers; +package hu.akarnokd.rxjava3.consumers; import io.reactivex.Completable; import io.reactivex.disposables.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/consumers/DisposableAutoReleaseMultiObserver.java b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseMultiObserver.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/consumers/DisposableAutoReleaseMultiObserver.java rename to src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseMultiObserver.java index 5afa3b06..28ce8aa6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/consumers/DisposableAutoReleaseMultiObserver.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseMultiObserver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.consumers; +package hu.akarnokd.rxjava3.consumers; import io.reactivex.*; import io.reactivex.disposables.CompositeDisposable; diff --git a/src/main/java/hu/akarnokd/rxjava2/consumers/DisposableAutoReleaseObserver.java b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseObserver.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/consumers/DisposableAutoReleaseObserver.java rename to src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseObserver.java index ce47480b..d01ae462 100644 --- a/src/main/java/hu/akarnokd/rxjava2/consumers/DisposableAutoReleaseObserver.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseObserver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.consumers; +package hu.akarnokd.rxjava3.consumers; import io.reactivex.Observer; import io.reactivex.disposables.CompositeDisposable; diff --git a/src/main/java/hu/akarnokd/rxjava2/consumers/DisposableAutoReleaseSubscriber.java b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseSubscriber.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/consumers/DisposableAutoReleaseSubscriber.java rename to src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseSubscriber.java index b6af0c53..f4bf47d9 100644 --- a/src/main/java/hu/akarnokd/rxjava2/consumers/DisposableAutoReleaseSubscriber.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseSubscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.consumers; +package hu.akarnokd.rxjava3.consumers; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/consumers/FlowableConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/FlowableConsumers.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/consumers/FlowableConsumers.java rename to src/main/java/hu/akarnokd/rxjava3/consumers/FlowableConsumers.java index 26e6cd21..15a12be7 100644 --- a/src/main/java/hu/akarnokd/rxjava2/consumers/FlowableConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/FlowableConsumers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.consumers; +package hu.akarnokd.rxjava3.consumers; import io.reactivex.Flowable; import io.reactivex.disposables.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/consumers/MaybeConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/MaybeConsumers.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/consumers/MaybeConsumers.java rename to src/main/java/hu/akarnokd/rxjava3/consumers/MaybeConsumers.java index 7bb295f6..75cbe29f 100644 --- a/src/main/java/hu/akarnokd/rxjava2/consumers/MaybeConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/MaybeConsumers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.consumers; +package hu.akarnokd.rxjava3.consumers; import io.reactivex.Maybe; import io.reactivex.disposables.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/consumers/ObservableConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/ObservableConsumers.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/consumers/ObservableConsumers.java rename to src/main/java/hu/akarnokd/rxjava3/consumers/ObservableConsumers.java index fb7a4bcc..46ee2a9c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/consumers/ObservableConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/ObservableConsumers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.consumers; +package hu.akarnokd.rxjava3.consumers; import io.reactivex.Observable; import io.reactivex.disposables.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/consumers/SingleConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/SingleConsumers.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/consumers/SingleConsumers.java rename to src/main/java/hu/akarnokd/rxjava3/consumers/SingleConsumers.java index 1ed48d88..1826a6d0 100644 --- a/src/main/java/hu/akarnokd/rxjava2/consumers/SingleConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/SingleConsumers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.consumers; +package hu.akarnokd.rxjava3.consumers; import io.reactivex.Single; import io.reactivex.disposables.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/consumers/package-info.java b/src/main/java/hu/akarnokd/rxjava3/consumers/package-info.java similarity index 68% rename from src/main/java/hu/akarnokd/rxjava2/consumers/package-info.java rename to src/main/java/hu/akarnokd/rxjava3/consumers/package-info.java index 8a9f4e1e..0db39940 100644 --- a/src/main/java/hu/akarnokd/rxjava2/consumers/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/package-info.java @@ -16,10 +16,10 @@ /** * Utility methods to create special consumer types, such as auto-release consumers via - * {@link hu.akarnokd.rxjava2.consumers.FlowableConsumers FlowableConsumers}, - * {@link hu.akarnokd.rxjava2.consumers.ObservableConsumers ObservableConsumers}, - * {@link hu.akarnokd.rxjava2.consumers.MaybeConsumers MaybeConsumers}, - * {@link hu.akarnokd.rxjava2.consumers.SingleConsumers SingleConsumers} and - * {@link hu.akarnokd.rxjava2.consumers.CompletableConsumers CompletableConsumers}. + * {@link hu.akarnokd.rxjava3.consumers.FlowableConsumers FlowableConsumers}, + * {@link hu.akarnokd.rxjava3.consumers.ObservableConsumers ObservableConsumers}, + * {@link hu.akarnokd.rxjava3.consumers.MaybeConsumers MaybeConsumers}, + * {@link hu.akarnokd.rxjava3.consumers.SingleConsumers SingleConsumers} and + * {@link hu.akarnokd.rxjava3.consumers.CompletableConsumers CompletableConsumers}. */ -package hu.akarnokd.rxjava2.consumers; \ No newline at end of file +package hu.akarnokd.rxjava3.consumers; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/CompletableOnAssembly.java b/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssembly.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/debug/CompletableOnAssembly.java rename to src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssembly.java index 1e1863e0..2d9411b0 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/CompletableOnAssembly.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssembly.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; import io.reactivex.*; import io.reactivex.disposables.Disposable; diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/CompletableOnAssemblyScalarCallable.java b/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblyScalarSupplier.java similarity index 73% rename from src/main/java/hu/akarnokd/rxjava2/debug/CompletableOnAssemblyScalarCallable.java rename to src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblyScalarSupplier.java index 625ccc3b..55dacefe 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/CompletableOnAssemblyScalarCallable.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblyScalarSupplier.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; -import hu.akarnokd.rxjava2.debug.CompletableOnAssembly.OnAssemblyCompletableObserver; +import hu.akarnokd.rxjava3.debug.CompletableOnAssembly.OnAssemblyCompletableObserver; import io.reactivex.*; -import io.reactivex.internal.fuseable.ScalarCallable; +import io.reactivex.internal.fuseable.ScalarSupplier; /** * Wraps a CompletableSource and inject the assembly info. */ -final class CompletableOnAssemblyScalarCallable extends Completable implements ScalarCallable { +final class CompletableOnAssemblyScalarSupplier extends Completable implements ScalarSupplier { final CompletableSource source; final RxJavaAssemblyException assembled; - CompletableOnAssemblyScalarCallable(CompletableSource source) { + CompletableOnAssemblyScalarSupplier(CompletableSource source) { this.source = source; this.assembled = new RxJavaAssemblyException(); } @@ -41,7 +41,7 @@ protected void subscribeActual(CompletableObserver observer) { @SuppressWarnings("unchecked") @Override - public Object call() { - return ((ScalarCallable)source).call(); + public Object get() { + return ((ScalarSupplier)source).get(); } } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/CompletableOnAssemblyCallable.java b/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblySupplier.java similarity index 71% rename from src/main/java/hu/akarnokd/rxjava2/debug/CompletableOnAssemblyCallable.java rename to src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblySupplier.java index 6de9a2a6..780194e2 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/CompletableOnAssemblyCallable.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblySupplier.java @@ -14,24 +14,23 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; -import java.util.concurrent.Callable; - -import hu.akarnokd.rxjava2.debug.CompletableOnAssembly.OnAssemblyCompletableObserver; +import hu.akarnokd.rxjava3.debug.CompletableOnAssembly.OnAssemblyCompletableObserver; import io.reactivex.*; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; /** * Wraps a CompletableSource and inject the assembly info. */ -final class CompletableOnAssemblyCallable extends Completable implements Callable { +final class CompletableOnAssemblySupplier extends Completable implements Supplier { final CompletableSource source; final RxJavaAssemblyException assembled; - CompletableOnAssemblyCallable(CompletableSource source) { + CompletableOnAssemblySupplier(CompletableSource source) { this.source = source; this.assembled = new RxJavaAssemblyException(); } @@ -43,12 +42,12 @@ protected void subscribeActual(CompletableObserver observer) { @SuppressWarnings("unchecked") @Override - public Object call() throws Exception { + public Object get() throws Throwable { try { - return ((Callable)source).call(); - } catch (Exception ex) { + return ((Supplier)source).get(); + } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - throw (Exception)assembled.appendLast(ex); + throw assembled.appendLast(ex); } } } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/FlowableOnAssembly.java b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssembly.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/debug/FlowableOnAssembly.java rename to src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssembly.java index 3b8137f8..ac99baaa 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/FlowableOnAssembly.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssembly.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; import org.reactivestreams.*; @@ -78,7 +78,7 @@ public int requestFusion(int mode) { } @Override - public T poll() throws Exception { + public T poll() throws Throwable { return qs.poll(); } } @@ -119,7 +119,7 @@ public int requestFusion(int mode) { } @Override - public T poll() throws Exception { + public T poll() throws Throwable { return qs.poll(); } } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/FlowableOnAssemblyConnectable.java b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyConnectable.java similarity index 91% rename from src/main/java/hu/akarnokd/rxjava2/debug/FlowableOnAssemblyConnectable.java rename to src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyConnectable.java index f9e87bde..715e5614 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/FlowableOnAssemblyConnectable.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyConnectable.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.debug.FlowableOnAssembly.*; +import hu.akarnokd.rxjava3.debug.FlowableOnAssembly.*; import io.reactivex.disposables.Disposable; import io.reactivex.flowables.ConnectableFlowable; import io.reactivex.functions.Consumer; @@ -53,4 +53,9 @@ protected void subscribeActual(Subscriber s) { public void connect(Consumer connection) { source.connect(connection); } + + @Override + public void reset() { + source.reset(); + } } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/FlowableOnAssemblyScalarCallable.java b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyScalarSupplier.java similarity index 81% rename from src/main/java/hu/akarnokd/rxjava2/debug/FlowableOnAssemblyScalarCallable.java rename to src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyScalarSupplier.java index 9cde2875..3bf0e96a 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/FlowableOnAssemblyScalarCallable.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyScalarSupplier.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.debug.FlowableOnAssembly.*; +import hu.akarnokd.rxjava3.debug.FlowableOnAssembly.*; import io.reactivex.Flowable; import io.reactivex.internal.fuseable.*; @@ -27,13 +27,13 @@ * * @param the value type */ -final class FlowableOnAssemblyScalarCallable extends Flowable implements ScalarCallable { +final class FlowableOnAssemblyScalarSupplier extends Flowable implements ScalarSupplier { final Publisher source; final RxJavaAssemblyException assembled; - FlowableOnAssemblyScalarCallable(Publisher source) { + FlowableOnAssemblyScalarSupplier(Publisher source) { this.source = source; this.assembled = new RxJavaAssemblyException(); } @@ -49,7 +49,7 @@ protected void subscribeActual(Subscriber s) { @SuppressWarnings("unchecked") @Override - public T call() { - return ((ScalarCallable)source).call(); + public T get() { + return ((ScalarSupplier)source).get(); } } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/FlowableOnAssemblyCallable.java b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblySupplier.java similarity index 77% rename from src/main/java/hu/akarnokd/rxjava2/debug/FlowableOnAssemblyCallable.java rename to src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblySupplier.java index a62e1b98..0d44fa55 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/FlowableOnAssemblyCallable.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblySupplier.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.debug; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.debug.FlowableOnAssembly.*; +import hu.akarnokd.rxjava3.debug.FlowableOnAssembly.*; import io.reactivex.Flowable; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; import io.reactivex.internal.fuseable.ConditionalSubscriber; /** @@ -30,13 +29,13 @@ * * @param the value type */ -final class FlowableOnAssemblyCallable extends Flowable implements Callable { +final class FlowableOnAssemblySupplier extends Flowable implements Supplier { final Publisher source; final RxJavaAssemblyException assembled; - FlowableOnAssemblyCallable(Publisher source) { + FlowableOnAssemblySupplier(Publisher source) { this.source = source; this.assembled = new RxJavaAssemblyException(); } @@ -52,12 +51,12 @@ protected void subscribeActual(Subscriber s) { @SuppressWarnings("unchecked") @Override - public T call() throws Exception { + public T get() throws Throwable { try { - return ((Callable)source).call(); - } catch (Exception ex) { + return ((Supplier)source).get(); + } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - throw (Exception)assembled.appendLast(ex); + throw assembled.appendLast(ex); } } } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/MaybeOnAssembly.java b/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssembly.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/debug/MaybeOnAssembly.java rename to src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssembly.java index 24a144e1..e77a2fe7 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/MaybeOnAssembly.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssembly.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; import io.reactivex.*; import io.reactivex.disposables.Disposable; diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/MaybeOnAssemblyScalarCallable.java b/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblyScalarSupplier.java similarity index 74% rename from src/main/java/hu/akarnokd/rxjava2/debug/MaybeOnAssemblyScalarCallable.java rename to src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblyScalarSupplier.java index be2b57aa..bb425500 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/MaybeOnAssemblyScalarCallable.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblyScalarSupplier.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; -import hu.akarnokd.rxjava2.debug.MaybeOnAssembly.OnAssemblyMaybeObserver; +import hu.akarnokd.rxjava3.debug.MaybeOnAssembly.OnAssemblyMaybeObserver; import io.reactivex.*; -import io.reactivex.internal.fuseable.ScalarCallable; +import io.reactivex.internal.fuseable.ScalarSupplier; /** * Wraps a MaybeSource and inject the assembly info. * * @param the value type */ -final class MaybeOnAssemblyScalarCallable extends Maybe implements ScalarCallable { +final class MaybeOnAssemblyScalarSupplier extends Maybe implements ScalarSupplier { final MaybeSource source; final RxJavaAssemblyException assembled; - MaybeOnAssemblyScalarCallable(MaybeSource source) { + MaybeOnAssemblyScalarSupplier(MaybeSource source) { this.source = source; this.assembled = new RxJavaAssemblyException(); } @@ -43,7 +43,7 @@ protected void subscribeActual(MaybeObserver observer) { @SuppressWarnings("unchecked") @Override - public T call() { - return ((ScalarCallable)source).call(); + public T get() { + return ((ScalarSupplier)source).get(); } } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/MaybeOnAssemblyCallable.java b/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblySupplier.java similarity index 76% rename from src/main/java/hu/akarnokd/rxjava2/debug/MaybeOnAssemblyCallable.java rename to src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblySupplier.java index ddcfe706..1de415a1 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/MaybeOnAssemblyCallable.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblySupplier.java @@ -14,26 +14,25 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; -import java.util.concurrent.Callable; - -import hu.akarnokd.rxjava2.debug.MaybeOnAssembly.OnAssemblyMaybeObserver; +import hu.akarnokd.rxjava3.debug.MaybeOnAssembly.OnAssemblyMaybeObserver; import io.reactivex.*; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; /** * Wraps a MaybeSource and inject the assembly info. * * @param the value type */ -final class MaybeOnAssemblyCallable extends Maybe implements Callable { +final class MaybeOnAssemblySupplier extends Maybe implements Supplier { final MaybeSource source; final RxJavaAssemblyException assembled; - MaybeOnAssemblyCallable(MaybeSource source) { + MaybeOnAssemblySupplier(MaybeSource source) { this.source = source; this.assembled = new RxJavaAssemblyException(); } @@ -45,10 +44,10 @@ protected void subscribeActual(MaybeObserver observer) { @SuppressWarnings("unchecked") @Override - public T call() throws Exception { + public T get() throws Throwable { try { - return ((Callable)source).call(); - } catch (Exception ex) { + return ((Supplier)source).get(); + } catch (Throwable ex) { Exceptions.throwIfFatal(ex); throw (Exception)assembled.appendLast(ex); } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/ObservableOnAssembly.java b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssembly.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/debug/ObservableOnAssembly.java rename to src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssembly.java index c2e82007..c72748a5 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/ObservableOnAssembly.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssembly.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; import io.reactivex.*; import io.reactivex.internal.fuseable.QueueDisposable; @@ -72,7 +72,7 @@ public int requestFusion(int mode) { } @Override - public T poll() throws Exception { + public T poll() throws Throwable { return qd.poll(); } } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/ObservableOnAssemblyConnectable.java b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyConnectable.java similarity index 89% rename from src/main/java/hu/akarnokd/rxjava2/debug/ObservableOnAssemblyConnectable.java rename to src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyConnectable.java index 7ba37e6c..b65dbf03 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/ObservableOnAssemblyConnectable.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyConnectable.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; -import hu.akarnokd.rxjava2.debug.ObservableOnAssembly.OnAssemblyObserver; +import hu.akarnokd.rxjava3.debug.ObservableOnAssembly.OnAssemblyObserver; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; import io.reactivex.functions.Consumer; @@ -47,4 +47,9 @@ protected void subscribeActual(Observer observer) { public void connect(Consumer connection) { source.connect(connection); } + + @Override + public void reset() { + source.reset(); + } } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/ObservableOnAssemblyScalarCallable.java b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyScalarSupplier.java similarity index 74% rename from src/main/java/hu/akarnokd/rxjava2/debug/ObservableOnAssemblyScalarCallable.java rename to src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyScalarSupplier.java index cbdbedeb..5f0c93d3 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/ObservableOnAssemblyScalarCallable.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyScalarSupplier.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; -import hu.akarnokd.rxjava2.debug.ObservableOnAssembly.OnAssemblyObserver; +import hu.akarnokd.rxjava3.debug.ObservableOnAssembly.OnAssemblyObserver; import io.reactivex.*; -import io.reactivex.internal.fuseable.ScalarCallable; +import io.reactivex.internal.fuseable.ScalarSupplier; /** * Wraps a ObservableSource and inject the assembly info. * * @param the value type */ -final class ObservableOnAssemblyScalarCallable extends Observable implements ScalarCallable { +final class ObservableOnAssemblyScalarSupplier extends Observable implements ScalarSupplier { final ObservableSource source; final RxJavaAssemblyException assembled; - ObservableOnAssemblyScalarCallable(ObservableSource source) { + ObservableOnAssemblyScalarSupplier(ObservableSource source) { this.source = source; this.assembled = new RxJavaAssemblyException(); } @@ -43,7 +43,7 @@ protected void subscribeActual(Observer observer) { @SuppressWarnings("unchecked") @Override - public T call() { - return ((ScalarCallable)source).call(); + public T get() { + return ((ScalarSupplier)source).get(); } } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/ObservableOnAssemblyCallable.java b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblySupplier.java similarity index 72% rename from src/main/java/hu/akarnokd/rxjava2/debug/ObservableOnAssemblyCallable.java rename to src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblySupplier.java index 6a362e6a..589e5b53 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/ObservableOnAssemblyCallable.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblySupplier.java @@ -14,26 +14,25 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; -import java.util.concurrent.Callable; - -import hu.akarnokd.rxjava2.debug.ObservableOnAssembly.OnAssemblyObserver; +import hu.akarnokd.rxjava3.debug.ObservableOnAssembly.OnAssemblyObserver; import io.reactivex.*; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; /** * Wraps a ObservableSource and inject the assembly info. * * @param the value type */ -final class ObservableOnAssemblyCallable extends Observable implements Callable { +final class ObservableOnAssemblySupplier extends Observable implements Supplier { final ObservableSource source; final RxJavaAssemblyException assembled; - ObservableOnAssemblyCallable(ObservableSource source) { + ObservableOnAssemblySupplier(ObservableSource source) { this.source = source; this.assembled = new RxJavaAssemblyException(); } @@ -45,12 +44,12 @@ protected void subscribeActual(Observer observer) { @SuppressWarnings("unchecked") @Override - public T call() throws Exception { + public T get() throws Throwable { try { - return ((Callable)source).call(); - } catch (Exception ex) { + return ((Supplier)source).get(); + } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - throw (Exception)assembled.appendLast(ex); + throw assembled.appendLast(ex); } } } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/ParallelFlowableOnAssembly.java b/src/main/java/hu/akarnokd/rxjava3/debug/ParallelFlowableOnAssembly.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/debug/ParallelFlowableOnAssembly.java rename to src/main/java/hu/akarnokd/rxjava3/debug/ParallelFlowableOnAssembly.java index 1d5f9d93..813c9067 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/ParallelFlowableOnAssembly.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/ParallelFlowableOnAssembly.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.debug.FlowableOnAssembly.*; +import hu.akarnokd.rxjava3.debug.FlowableOnAssembly.*; import io.reactivex.internal.fuseable.ConditionalSubscriber; import io.reactivex.parallel.ParallelFlowable; diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/RxJavaAssemblyException.java b/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyException.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/debug/RxJavaAssemblyException.java rename to src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyException.java index 48063333..9ecabe0a 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/RxJavaAssemblyException.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; import java.util.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/RxJavaAssemblyTracking.java b/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyTracking.java similarity index 75% rename from src/main/java/hu/akarnokd/rxjava2/debug/RxJavaAssemblyTracking.java rename to src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyTracking.java index 66c5b075..8a44e567 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/RxJavaAssemblyTracking.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyTracking.java @@ -14,16 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; -import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; import io.reactivex.*; import io.reactivex.flowables.ConnectableFlowable; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.ResettableConnectable; -import io.reactivex.internal.fuseable.ScalarCallable; +import io.reactivex.functions.*; +import io.reactivex.internal.fuseable.ScalarSupplier; import io.reactivex.observables.ConnectableObservable; import io.reactivex.parallel.ParallelFlowable; import io.reactivex.plugins.RxJavaPlugins; @@ -54,11 +52,11 @@ public static void enable() { RxJavaPlugins.setOnFlowableAssembly(new Function() { @Override public Flowable apply(Flowable f) throws Exception { - if (f instanceof Callable) { - if (f instanceof ScalarCallable) { - return new FlowableOnAssemblyScalarCallable(f); + if (f instanceof Supplier) { + if (f instanceof ScalarSupplier) { + return new FlowableOnAssemblyScalarSupplier(f); } - return new FlowableOnAssemblyCallable(f); + return new FlowableOnAssemblySupplier(f); } return new FlowableOnAssembly(f); } @@ -67,9 +65,6 @@ public Flowable apply(Flowable f) throws Exception { RxJavaPlugins.setOnConnectableFlowableAssembly(new Function() { @Override public ConnectableFlowable apply(ConnectableFlowable f) throws Exception { - if (f instanceof ResettableConnectable) { - return new FlowableOnAssemblyConnectableResettable(f); - } return new FlowableOnAssemblyConnectable(f); } }); @@ -77,11 +72,11 @@ public ConnectableFlowable apply(ConnectableFlowable f) throws Exception { RxJavaPlugins.setOnObservableAssembly(new Function() { @Override public Observable apply(Observable f) throws Exception { - if (f instanceof Callable) { - if (f instanceof ScalarCallable) { - return new ObservableOnAssemblyScalarCallable(f); + if (f instanceof Supplier) { + if (f instanceof ScalarSupplier) { + return new ObservableOnAssemblyScalarSupplier(f); } - return new ObservableOnAssemblyCallable(f); + return new ObservableOnAssemblySupplier(f); } return new ObservableOnAssembly(f); } @@ -90,9 +85,6 @@ public Observable apply(Observable f) throws Exception { RxJavaPlugins.setOnConnectableObservableAssembly(new Function() { @Override public ConnectableObservable apply(ConnectableObservable f) throws Exception { - if (f instanceof ResettableConnectable) { - return new ObservableOnAssemblyConnectableResettable(f); - } return new ObservableOnAssemblyConnectable(f); } }); @@ -100,11 +92,11 @@ public ConnectableObservable apply(ConnectableObservable f) throws Exception { RxJavaPlugins.setOnSingleAssembly(new Function() { @Override public Single apply(Single f) throws Exception { - if (f instanceof Callable) { - if (f instanceof ScalarCallable) { - return new SingleOnAssemblyScalarCallable(f); + if (f instanceof Supplier) { + if (f instanceof ScalarSupplier) { + return new SingleOnAssemblyScalarSupplier(f); } - return new SingleOnAssemblyCallable(f); + return new SingleOnAssemblySupplier(f); } return new SingleOnAssembly(f); } @@ -113,11 +105,11 @@ public Single apply(Single f) throws Exception { RxJavaPlugins.setOnCompletableAssembly(new Function() { @Override public Completable apply(Completable f) throws Exception { - if (f instanceof Callable) { - if (f instanceof ScalarCallable) { - return new CompletableOnAssemblyScalarCallable(f); + if (f instanceof Supplier) { + if (f instanceof ScalarSupplier) { + return new CompletableOnAssemblyScalarSupplier(f); } - return new CompletableOnAssemblyCallable(f); + return new CompletableOnAssemblySupplier(f); } return new CompletableOnAssembly(f); } @@ -126,11 +118,11 @@ public Completable apply(Completable f) throws Exception { RxJavaPlugins.setOnMaybeAssembly(new Function() { @Override public Maybe apply(Maybe f) throws Exception { - if (f instanceof Callable) { - if (f instanceof ScalarCallable) { - return new MaybeOnAssemblyScalarCallable(f); + if (f instanceof Supplier) { + if (f instanceof ScalarSupplier) { + return new MaybeOnAssemblyScalarSupplier(f); } - return new MaybeOnAssemblyCallable(f); + return new MaybeOnAssemblySupplier(f); } return new MaybeOnAssembly(f); } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/SavedHooks.java b/src/main/java/hu/akarnokd/rxjava3/debug/SavedHooks.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/debug/SavedHooks.java rename to src/main/java/hu/akarnokd/rxjava3/debug/SavedHooks.java index 8ca34645..5c4a1a53 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/SavedHooks.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/SavedHooks.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; /** * Remembers the previous hooks overridden by the debug diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/SingleOnAssembly.java b/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssembly.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/debug/SingleOnAssembly.java rename to src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssembly.java index 19262f4e..3ac5c7bd 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/SingleOnAssembly.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssembly.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; import io.reactivex.*; import io.reactivex.disposables.Disposable; diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/SingleOnAssemblyScalarCallable.java b/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblyScalarSupplier.java similarity index 74% rename from src/main/java/hu/akarnokd/rxjava2/debug/SingleOnAssemblyScalarCallable.java rename to src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblyScalarSupplier.java index 5c14e5d2..ae85b852 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/SingleOnAssemblyScalarCallable.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblyScalarSupplier.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; -import hu.akarnokd.rxjava2.debug.SingleOnAssembly.OnAssemblySingleObserver; +import hu.akarnokd.rxjava3.debug.SingleOnAssembly.OnAssemblySingleObserver; import io.reactivex.*; -import io.reactivex.internal.fuseable.ScalarCallable; +import io.reactivex.internal.fuseable.ScalarSupplier; /** * Wraps a Publisher and inject the assembly info. * * @param the value type */ -final class SingleOnAssemblyScalarCallable extends Single implements ScalarCallable { +final class SingleOnAssemblyScalarSupplier extends Single implements ScalarSupplier { final SingleSource source; final RxJavaAssemblyException assembled; - SingleOnAssemblyScalarCallable(SingleSource source) { + SingleOnAssemblyScalarSupplier(SingleSource source) { this.source = source; this.assembled = new RxJavaAssemblyException(); } @@ -43,7 +43,7 @@ protected void subscribeActual(SingleObserver observer) { @SuppressWarnings("unchecked") @Override - public T call() { - return ((ScalarCallable)source).call(); + public T get() { + return ((ScalarSupplier)source).get(); } } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/SingleOnAssemblyCallable.java b/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblySupplier.java similarity index 73% rename from src/main/java/hu/akarnokd/rxjava2/debug/SingleOnAssemblyCallable.java rename to src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblySupplier.java index e1d2dd75..2de80886 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/SingleOnAssemblyCallable.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblySupplier.java @@ -14,26 +14,25 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; -import java.util.concurrent.Callable; - -import hu.akarnokd.rxjava2.debug.SingleOnAssembly.OnAssemblySingleObserver; +import hu.akarnokd.rxjava3.debug.SingleOnAssembly.OnAssemblySingleObserver; import io.reactivex.*; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; /** * Wraps a Publisher and inject the assembly info. * * @param the value type */ -final class SingleOnAssemblyCallable extends Single implements Callable { +final class SingleOnAssemblySupplier extends Single implements Supplier { final SingleSource source; final RxJavaAssemblyException assembled; - SingleOnAssemblyCallable(SingleSource source) { + SingleOnAssemblySupplier(SingleSource source) { this.source = source; this.assembled = new RxJavaAssemblyException(); } @@ -45,12 +44,12 @@ protected void subscribeActual(SingleObserver observer) { @SuppressWarnings("unchecked") @Override - public T call() throws Exception { + public T get() throws Throwable { try { - return ((Callable)source).call(); - } catch (Exception ex) { + return ((Supplier)source).get(); + } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - throw (Exception)assembled.appendLast(ex); + throw assembled.appendLast(ex); } } } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/multihook/MultiHandlerManager.java b/src/main/java/hu/akarnokd/rxjava3/debug/multihook/MultiHandlerManager.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/debug/multihook/MultiHandlerManager.java rename to src/main/java/hu/akarnokd/rxjava3/debug/multihook/MultiHandlerManager.java index f3346502..4766fc86 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/multihook/MultiHandlerManager.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/multihook/MultiHandlerManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.multihook; +package hu.akarnokd.rxjava3.debug.multihook; import java.util.Iterator; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/multihook/OnScheduleMultiHandlerManager.java b/src/main/java/hu/akarnokd/rxjava3/debug/multihook/OnScheduleMultiHandlerManager.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/debug/multihook/OnScheduleMultiHandlerManager.java rename to src/main/java/hu/akarnokd/rxjava3/debug/multihook/OnScheduleMultiHandlerManager.java index 040da0c3..5f87b97d 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/multihook/OnScheduleMultiHandlerManager.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/multihook/OnScheduleMultiHandlerManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.multihook; +package hu.akarnokd.rxjava3.debug.multihook; import io.reactivex.functions.*; import io.reactivex.plugins.RxJavaPlugins; @@ -67,7 +67,7 @@ public Runnable apply(Runnable t) throws Exception { @Override public void accept(Runnable[] t1, - Function t2) throws Exception { + Function t2) throws Throwable { t1[0] = t2.apply(t1[0]); } } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/multihook/package-info.java b/src/main/java/hu/akarnokd/rxjava3/debug/multihook/package-info.java similarity index 88% rename from src/main/java/hu/akarnokd/rxjava2/debug/multihook/package-info.java rename to src/main/java/hu/akarnokd/rxjava3/debug/multihook/package-info.java index 8f0562b4..8f91e187 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/multihook/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/multihook/package-info.java @@ -18,6 +18,6 @@ * Proof of concept {@link io.reactivex.plugins.RxJavaPlugins RxJavaPlugins} * hook implementation for handling multiple hooks to * the {@code onSchedule} callback via - * {@link hu.akarnokd.rxjava2.debug.multihook.OnScheduleMultiHandlerManager OnScheduleMultiHandlerManager}. + * {@link hu.akarnokd.rxjava3.debug.multihook.OnScheduleMultiHandlerManager OnScheduleMultiHandlerManager}. */ -package hu.akarnokd.rxjava2.debug.multihook; \ No newline at end of file +package hu.akarnokd.rxjava3.debug.multihook; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/package-info.java b/src/main/java/hu/akarnokd/rxjava3/debug/package-info.java similarity index 89% rename from src/main/java/hu/akarnokd/rxjava2/debug/package-info.java rename to src/main/java/hu/akarnokd/rxjava3/debug/package-info.java index 7d4f2d59..910e768c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/package-info.java @@ -17,6 +17,6 @@ /** * Debugging support to remember where operators have been created in the * code via {@link io.reactivex.plugins.RxJavaPlugins RxJavaPlugins}' assembly hooks, enabled via - * {@link hu.akarnokd.rxjava2.debug.RxJavaAssemblyTracking RxJavaAssemblyTracking}. + * {@link hu.akarnokd.rxjava3.debug.RxJavaAssemblyTracking RxJavaAssemblyTracking}. */ -package hu.akarnokd.rxjava2.debug; \ No newline at end of file +package hu.akarnokd.rxjava3.debug; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/CompletableValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/CompletableValidator.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/CompletableValidator.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/CompletableValidator.java index 08ef3696..f1e07cf7 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/CompletableValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/CompletableValidator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; -import hu.akarnokd.rxjava2.functions.PlainConsumer; +import hu.akarnokd.rxjava3.functions.PlainConsumer; import io.reactivex.*; import io.reactivex.disposables.Disposable; diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/ConnectableFlowableValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ConnectableFlowableValidator.java similarity index 90% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/ConnectableFlowableValidator.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/ConnectableFlowableValidator.java index 831a30ca..07b80266 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/ConnectableFlowableValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ConnectableFlowableValidator.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.functions.PlainConsumer; +import hu.akarnokd.rxjava3.functions.PlainConsumer; import io.reactivex.disposables.Disposable; import io.reactivex.flowables.ConnectableFlowable; import io.reactivex.functions.Consumer; @@ -48,4 +48,9 @@ protected void subscribeActual(Subscriber s) { public void connect(Consumer connection) { source.connect(connection); } + + @Override + public void reset() { + source.reset(); + } } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/ConnectableObservableValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ConnectableObservableValidator.java similarity index 90% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/ConnectableObservableValidator.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/ConnectableObservableValidator.java index 1c608b0c..a20283e3 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/ConnectableObservableValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ConnectableObservableValidator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; -import hu.akarnokd.rxjava2.functions.PlainConsumer; +import hu.akarnokd.rxjava3.functions.PlainConsumer; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; import io.reactivex.functions.Consumer; @@ -47,4 +47,9 @@ protected void subscribeActual(Observer observer) { public void connect(Consumer connection) { source.connect(connection); } + + @Override + public void reset() { + source.reset(); + } } diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/FlowableValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/FlowableValidator.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/FlowableValidator.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/FlowableValidator.java index 9456b423..2c743b87 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/FlowableValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/FlowableValidator.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.functions.PlainConsumer; +import hu.akarnokd.rxjava3.functions.PlainConsumer; import io.reactivex.*; /** diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/MaybeValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/MaybeValidator.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/MaybeValidator.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/MaybeValidator.java index 43ac43ed..e6b4589a 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/MaybeValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/MaybeValidator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; -import hu.akarnokd.rxjava2.functions.PlainConsumer; +import hu.akarnokd.rxjava3.functions.PlainConsumer; import io.reactivex.*; import io.reactivex.disposables.Disposable; diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/MultipleOnSubscribeCallsException.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/MultipleOnSubscribeCallsException.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/MultipleOnSubscribeCallsException.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/MultipleOnSubscribeCallsException.java index c63e52fc..7de9e873 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/MultipleOnSubscribeCallsException.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/MultipleOnSubscribeCallsException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; /** * Indicates there were multiple {@code onSubscribe} calls. diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/MultipleTerminationsException.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/MultipleTerminationsException.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/MultipleTerminationsException.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/MultipleTerminationsException.java index 102c8ace..8756c621 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/MultipleTerminationsException.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/MultipleTerminationsException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; /** * Indicates there were multiple {@code onError} or {@code onComplete} calls. diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/NullOnErrorParameterException.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/NullOnErrorParameterException.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/NullOnErrorParameterException.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/NullOnErrorParameterException.java index 45bab575..ebccd996 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/NullOnErrorParameterException.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/NullOnErrorParameterException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; /** * Indicates the {@code onError} was called with a {@code null} {@code Throwable}. diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/NullOnNextParameterException.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/NullOnNextParameterException.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/NullOnNextParameterException.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/NullOnNextParameterException.java index f852b750..d904334c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/NullOnNextParameterException.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/NullOnNextParameterException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; /** * Indicates the {@code onNext} was called with a {@code null} value. diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/NullOnSubscribeParameterException.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/NullOnSubscribeParameterException.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/NullOnSubscribeParameterException.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/NullOnSubscribeParameterException.java index 973f7c4e..891b71f3 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/NullOnSubscribeParameterException.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/NullOnSubscribeParameterException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; /** * Indicates the {@code onSubscribe} was called with a {@code null} {@code Disposable} or {@code Subscription}. diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/NullOnSuccessParameterException.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/NullOnSuccessParameterException.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/NullOnSuccessParameterException.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/NullOnSuccessParameterException.java index 21ffbbf1..dd3482d7 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/NullOnSuccessParameterException.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/NullOnSuccessParameterException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; /** * Indicates the {@code onSuccess} was called with a {@code null} value. diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/ObservableValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ObservableValidator.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/ObservableValidator.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/ObservableValidator.java index b8c4e1c5..db578fa4 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/ObservableValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ObservableValidator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; -import hu.akarnokd.rxjava2.functions.PlainConsumer; +import hu.akarnokd.rxjava3.functions.PlainConsumer; import io.reactivex.*; import io.reactivex.disposables.Disposable; diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/OnNextAfterTerminationException.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/OnNextAfterTerminationException.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/OnNextAfterTerminationException.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/OnNextAfterTerminationException.java index b4744f44..e37ec6b4 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/OnNextAfterTerminationException.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/OnNextAfterTerminationException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; /** * The {@code onNext} was invoked after an {@code onError} or {@code onComplete} call. diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/OnSubscribeNotCalledException.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/OnSubscribeNotCalledException.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/OnSubscribeNotCalledException.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/OnSubscribeNotCalledException.java index 514ef404..7e9ae1e6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/OnSubscribeNotCalledException.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/OnSubscribeNotCalledException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; /** * The {@code onSubscribe} was not called before calling {@code onNext}, diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/OnSuccessAfterTerminationException.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/OnSuccessAfterTerminationException.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/OnSuccessAfterTerminationException.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/OnSuccessAfterTerminationException.java index c86f346c..45165b32 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/OnSuccessAfterTerminationException.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/OnSuccessAfterTerminationException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; /** * The {@code onSuccess} was invoked after an {@code onError} or {@code onComplete} call. diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/ParallelFlowableValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ParallelFlowableValidator.java similarity index 94% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/ParallelFlowableValidator.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/ParallelFlowableValidator.java index cc85d256..d472f3f6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/ParallelFlowableValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ParallelFlowableValidator.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.functions.PlainConsumer; +import hu.akarnokd.rxjava3.functions.PlainConsumer; import io.reactivex.parallel.ParallelFlowable; /** diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/ProtocolNonConformanceException.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ProtocolNonConformanceException.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/ProtocolNonConformanceException.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/ProtocolNonConformanceException.java index dca9ecf6..68a87110 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/ProtocolNonConformanceException.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ProtocolNonConformanceException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; /** * Base exception type indicating a failure in conforming the Reactive-Streams diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/RxJavaProtocolValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidator.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/RxJavaProtocolValidator.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidator.java index d07bd290..10c23f62 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/RxJavaProtocolValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; -import hu.akarnokd.rxjava2.debug.SavedHooks; -import hu.akarnokd.rxjava2.functions.PlainConsumer; +import hu.akarnokd.rxjava3.debug.SavedHooks; +import hu.akarnokd.rxjava3.functions.PlainConsumer; import io.reactivex.*; import io.reactivex.annotations.Nullable; import io.reactivex.flowables.ConnectableFlowable; @@ -92,7 +92,7 @@ static SavedHooks enable(boolean chain) { RxJavaPlugins.setOnCompletableAssembly(new Function() { @Override - public Completable apply(Completable c) throws Exception { + public Completable apply(Completable c) throws Throwable { return oldC.apply(new CompletableValidator(c, handler)); } }); @@ -109,7 +109,7 @@ public Completable apply(Completable c) throws Exception { RxJavaPlugins.setOnMaybeAssembly(new Function() { @SuppressWarnings("unchecked") @Override - public Maybe apply(Maybe c) throws Exception { + public Maybe apply(Maybe c) throws Throwable { return oldM.apply(new MaybeValidator(c, handler)); } }); @@ -126,7 +126,7 @@ public Maybe apply(Maybe c) throws Exception { RxJavaPlugins.setOnSingleAssembly(new Function() { @SuppressWarnings("unchecked") @Override - public Single apply(Single c) throws Exception { + public Single apply(Single c) throws Throwable { return oldS.apply(new SingleValidator(c, handler)); } }); @@ -143,7 +143,7 @@ public Single apply(Single c) throws Exception { RxJavaPlugins.setOnObservableAssembly(new Function() { @SuppressWarnings("unchecked") @Override - public Observable apply(Observable c) throws Exception { + public Observable apply(Observable c) throws Throwable { return oldO.apply(new ObservableValidator(c, handler)); } }); @@ -160,7 +160,7 @@ public Observable apply(Observable c) throws Exception { RxJavaPlugins.setOnFlowableAssembly(new Function() { @SuppressWarnings("unchecked") @Override - public Flowable apply(Flowable c) throws Exception { + public Flowable apply(Flowable c) throws Throwable { return oldF.apply(new FlowableValidator(c, handler)); } }); @@ -177,7 +177,7 @@ public Flowable apply(Flowable c) throws Exception { RxJavaPlugins.setOnConnectableFlowableAssembly(new Function() { @SuppressWarnings("unchecked") @Override - public ConnectableFlowable apply(ConnectableFlowable c) throws Exception { + public ConnectableFlowable apply(ConnectableFlowable c) throws Throwable { return oldCF.apply(new ConnectableFlowableValidator(c, handler)); } }); @@ -194,7 +194,7 @@ public ConnectableFlowable apply(ConnectableFlowable c) throws Exception { RxJavaPlugins.setOnConnectableObservableAssembly(new Function() { @SuppressWarnings("unchecked") @Override - public ConnectableObservable apply(ConnectableObservable c) throws Exception { + public ConnectableObservable apply(ConnectableObservable c) throws Throwable { return oldCO.apply(new ConnectableObservableValidator(c, handler)); } }); @@ -211,7 +211,7 @@ public ConnectableObservable apply(ConnectableObservable c) throws Exception { RxJavaPlugins.setOnParallelAssembly(new Function() { @SuppressWarnings("unchecked") @Override - public ParallelFlowable apply(ParallelFlowable c) throws Exception { + public ParallelFlowable apply(ParallelFlowable c) throws Throwable { return oldPF.apply(new ParallelFlowableValidator(c, handler)); } }); diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/SingleValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/SingleValidator.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/SingleValidator.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/SingleValidator.java index f206145c..be4f565c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/SingleValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/SingleValidator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; -import hu.akarnokd.rxjava2.functions.PlainConsumer; +import hu.akarnokd.rxjava3.functions.PlainConsumer; import io.reactivex.*; import io.reactivex.disposables.Disposable; diff --git a/src/main/java/hu/akarnokd/rxjava2/debug/validator/package-info.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/package-info.java similarity index 87% rename from src/main/java/hu/akarnokd/rxjava2/debug/validator/package-info.java rename to src/main/java/hu/akarnokd/rxjava3/debug/validator/package-info.java index 6721432e..45e779cb 100644 --- a/src/main/java/hu/akarnokd/rxjava2/debug/validator/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/package-info.java @@ -17,6 +17,6 @@ /** * Protocol validation support via {@link io.reactivex.plugins.RxJavaPlugins RxJavaPlugins} * hook implementations enalbed via - * {@link hu.akarnokd.rxjava2.debug.validator.RxJavaProtocolValidator RxJavaProtocolValidator}. + * {@link hu.akarnokd.rxjava3.debug.validator.RxJavaProtocolValidator RxJavaProtocolValidator}. */ -package hu.akarnokd.rxjava2.debug.validator; \ No newline at end of file +package hu.akarnokd.rxjava3.debug.validator; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/CompletableIfThen.java b/src/main/java/hu/akarnokd/rxjava3/expr/CompletableIfThen.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/expr/CompletableIfThen.java rename to src/main/java/hu/akarnokd/rxjava3/expr/CompletableIfThen.java index f4d20233..0aeacb32 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/CompletableIfThen.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/CompletableIfThen.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; import io.reactivex.Completable; import io.reactivex.CompletableObserver; diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/CompletableSwitchCase.java b/src/main/java/hu/akarnokd/rxjava3/expr/CompletableSwitchCase.java similarity index 84% rename from src/main/java/hu/akarnokd/rxjava2/expr/CompletableSwitchCase.java rename to src/main/java/hu/akarnokd/rxjava3/expr/CompletableSwitchCase.java index c479c92d..fc328667 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/CompletableSwitchCase.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/CompletableSwitchCase.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; -import io.reactivex.Completable; -import io.reactivex.CompletableObserver; -import io.reactivex.CompletableSource; +import java.util.Map; + +import io.reactivex.*; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; import io.reactivex.internal.disposables.EmptyDisposable; -import java.util.Map; -import java.util.concurrent.Callable; - /** * For each Observer, it calls a keySelector for a key to lookup in the given Map for a CompletableSource * to subscribe to; otherwise subscribe the Observer to the default CompletableSource. @@ -33,13 +31,13 @@ */ final class CompletableSwitchCase extends Completable { - final Callable caseSelector; + final Supplier caseSelector; final Map mapOfCases; final CompletableSource defaultCase; - CompletableSwitchCase(Callable caseSelector, + CompletableSwitchCase(Supplier caseSelector, Map mapOfCases, CompletableSource defaultCase) { this.caseSelector = caseSelector; @@ -53,7 +51,7 @@ protected void subscribeActual(CompletableObserver observer) { CompletableSource source; try { - key = caseSelector.call(); + key = caseSelector.get(); source = mapOfCases.get(key); } catch (Throwable ex) { diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/FlowableIfThen.java b/src/main/java/hu/akarnokd/rxjava3/expr/FlowableIfThen.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/expr/FlowableIfThen.java rename to src/main/java/hu/akarnokd/rxjava3/expr/FlowableIfThen.java index 99c6a87d..388f1c45 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/FlowableIfThen.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/FlowableIfThen.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/FlowableSwitchCase.java b/src/main/java/hu/akarnokd/rxjava3/expr/FlowableSwitchCase.java similarity index 89% rename from src/main/java/hu/akarnokd/rxjava2/expr/FlowableSwitchCase.java rename to src/main/java/hu/akarnokd/rxjava3/expr/FlowableSwitchCase.java index e76e5a76..27194b12 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/FlowableSwitchCase.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/FlowableSwitchCase.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; import java.util.Map; -import java.util.concurrent.Callable; import org.reactivestreams.*; import io.reactivex.Flowable; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; import io.reactivex.internal.subscriptions.EmptySubscription; /** @@ -34,13 +34,13 @@ */ final class FlowableSwitchCase extends Flowable { - final Callable caseSelector; + final Supplier caseSelector; final Map> mapOfCases; final Publisher defaultCase; - FlowableSwitchCase(Callable caseSelector, + FlowableSwitchCase(Supplier caseSelector, Map> mapOfCases, Publisher defaultCase) { this.caseSelector = caseSelector; @@ -54,7 +54,7 @@ protected void subscribeActual(Subscriber s) { Publisher source; try { - key = caseSelector.call(); + key = caseSelector.get(); source = mapOfCases.get(key); } catch (Throwable ex) { diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/FlowableWhileDoWhile.java b/src/main/java/hu/akarnokd/rxjava3/expr/FlowableWhileDoWhile.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/expr/FlowableWhileDoWhile.java rename to src/main/java/hu/akarnokd/rxjava3/expr/FlowableWhileDoWhile.java index e1e573b3..6206dc2c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/FlowableWhileDoWhile.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/FlowableWhileDoWhile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/MaybeIfThen.java b/src/main/java/hu/akarnokd/rxjava3/expr/MaybeIfThen.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/expr/MaybeIfThen.java rename to src/main/java/hu/akarnokd/rxjava3/expr/MaybeIfThen.java index 8ff9f596..75cf22c0 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/MaybeIfThen.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/MaybeIfThen.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; import io.reactivex.Maybe; import io.reactivex.MaybeObserver; diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/MaybeSwitchCase.java b/src/main/java/hu/akarnokd/rxjava3/expr/MaybeSwitchCase.java similarity index 86% rename from src/main/java/hu/akarnokd/rxjava2/expr/MaybeSwitchCase.java rename to src/main/java/hu/akarnokd/rxjava3/expr/MaybeSwitchCase.java index 3d8fa903..c0b9626d 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/MaybeSwitchCase.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/MaybeSwitchCase.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; -import io.reactivex.Maybe; -import io.reactivex.MaybeObserver; -import io.reactivex.MaybeSource; +import java.util.Map; + +import io.reactivex.*; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; import io.reactivex.internal.disposables.EmptyDisposable; -import java.util.Map; -import java.util.concurrent.Callable; - /** * For each Observer, it calls a keySelector for a key to lookup in the given Map for a MaybeSource * to subscribe to; otherwise subscribe the Observer to the default MaybeSource. @@ -34,13 +32,13 @@ */ final class MaybeSwitchCase extends Maybe { - final Callable caseSelector; + final Supplier caseSelector; final Map> mapOfCases; final MaybeSource defaultCase; - MaybeSwitchCase(Callable caseSelector, + MaybeSwitchCase(Supplier caseSelector, Map> mapOfCases, MaybeSource defaultCase) { this.caseSelector = caseSelector; @@ -54,7 +52,7 @@ protected void subscribeActual(MaybeObserver observer) { MaybeSource source; try { - key = caseSelector.call(); + key = caseSelector.get(); source = mapOfCases.get(key); } catch (Throwable ex) { diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/ObservableIfThen.java b/src/main/java/hu/akarnokd/rxjava3/expr/ObservableIfThen.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/expr/ObservableIfThen.java rename to src/main/java/hu/akarnokd/rxjava3/expr/ObservableIfThen.java index 969c0645..6c19a4e8 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/ObservableIfThen.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/ObservableIfThen.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; import io.reactivex.*; import io.reactivex.exceptions.Exceptions; diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/ObservableSwitchCase.java b/src/main/java/hu/akarnokd/rxjava3/expr/ObservableSwitchCase.java similarity index 89% rename from src/main/java/hu/akarnokd/rxjava2/expr/ObservableSwitchCase.java rename to src/main/java/hu/akarnokd/rxjava3/expr/ObservableSwitchCase.java index cbccc5d6..4683d82c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/ObservableSwitchCase.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/ObservableSwitchCase.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; import java.util.Map; -import java.util.concurrent.Callable; import io.reactivex.*; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; import io.reactivex.internal.disposables.EmptyDisposable; /** @@ -32,13 +32,13 @@ */ final class ObservableSwitchCase extends Observable { - final Callable caseSelector; + final Supplier caseSelector; final Map> mapOfCases; final ObservableSource defaultCase; - ObservableSwitchCase(Callable caseSelector, + ObservableSwitchCase(Supplier caseSelector, Map> mapOfCases, ObservableSource defaultCase) { this.caseSelector = caseSelector; @@ -52,7 +52,7 @@ protected void subscribeActual(Observer observer) { ObservableSource source; try { - key = caseSelector.call(); + key = caseSelector.get(); source = mapOfCases.get(key); } catch (Throwable ex) { diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/ObservableWhileDoWhile.java b/src/main/java/hu/akarnokd/rxjava3/expr/ObservableWhileDoWhile.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/expr/ObservableWhileDoWhile.java rename to src/main/java/hu/akarnokd/rxjava3/expr/ObservableWhileDoWhile.java index eeeafe75..b3d0d312 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/ObservableWhileDoWhile.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/ObservableWhileDoWhile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/SingleIfThen.java b/src/main/java/hu/akarnokd/rxjava3/expr/SingleIfThen.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/expr/SingleIfThen.java rename to src/main/java/hu/akarnokd/rxjava3/expr/SingleIfThen.java index 6053521c..88cd94f2 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/SingleIfThen.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/SingleIfThen.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; import io.reactivex.Single; import io.reactivex.SingleObserver; diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/SingleSwitchCase.java b/src/main/java/hu/akarnokd/rxjava3/expr/SingleSwitchCase.java similarity index 85% rename from src/main/java/hu/akarnokd/rxjava2/expr/SingleSwitchCase.java rename to src/main/java/hu/akarnokd/rxjava3/expr/SingleSwitchCase.java index c2d4e693..4e73b581 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/SingleSwitchCase.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/SingleSwitchCase.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; -import io.reactivex.Single; -import io.reactivex.SingleObserver; -import io.reactivex.SingleSource; +import java.util.Map; + +import io.reactivex.*; import io.reactivex.exceptions.Exceptions; +import io.reactivex.functions.Supplier; import io.reactivex.internal.disposables.EmptyDisposable; -import java.util.Map; -import java.util.concurrent.Callable; - /** * For each Observer, it calls a keySelector for a key to lookup in the given Map for a SingleSource * to subscribe to; otherwise subscribe the Observer to the default SingleSource. @@ -34,13 +32,13 @@ */ final class SingleSwitchCase extends Single { - final Callable caseSelector; + final Supplier caseSelector; final Map> mapOfCases; final SingleSource defaultCase; - SingleSwitchCase(Callable caseSelector, + SingleSwitchCase(Supplier caseSelector, Map> mapOfCases, SingleSource defaultCase) { this.caseSelector = caseSelector; @@ -54,7 +52,7 @@ protected void subscribeActual(SingleObserver observer) { SingleSource source; try { - key = caseSelector.call(); + key = caseSelector.get(); source = mapOfCases.get(key); } catch (Throwable ex) { diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/StatementCompletable.java b/src/main/java/hu/akarnokd/rxjava3/expr/StatementCompletable.java similarity index 90% rename from src/main/java/hu/akarnokd/rxjava2/expr/StatementCompletable.java rename to src/main/java/hu/akarnokd/rxjava3/expr/StatementCompletable.java index 2b6873a7..7b734594 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/StatementCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/StatementCompletable.java @@ -14,22 +14,23 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; -import io.reactivex.Completable; -import io.reactivex.CompletableSource; -import io.reactivex.functions.BooleanSupplier; +import java.util.Map; + +import io.reactivex.*; +import io.reactivex.functions.*; import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.plugins.RxJavaPlugins; -import java.util.Map; -import java.util.concurrent.Callable; - /** * Imperative statements expressed as Completable operators. */ public final class StatementCompletable { + /** Factory class. */ + private StatementCompletable() { throw new IllegalStateException("No instances!"); } + /** * Return a particular one of several possible Completables based on a case * selector, or a default Completable if the case selector does not map to @@ -39,8 +40,6 @@ public final class StatementCompletable { * * @param * the case key type - * @param - * the result value type * @param caseSelector * the function that produces a case key when an * CompletableObserver subscribes @@ -51,7 +50,7 @@ public final class StatementCompletable { * @return a particular Completable chosen by key from the map of * Completables, or the default case if no Completable matches the key */ - public static Completable switchCase(Callable caseSelector, + public static Completable switchCase(Supplier caseSelector, Map mapOfCases, CompletableSource defaultCase) { ObjectHelper.requireNonNull(caseSelector, "caseSelector is null"); @@ -67,8 +66,6 @@ public static Completable switchCase(Callable caseSelector, *

* * - * @param - * the result value type * @param condition * the condition that decides which Completable to emit the * emissions from diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/StatementFlowable.java b/src/main/java/hu/akarnokd/rxjava3/expr/StatementFlowable.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/expr/StatementFlowable.java rename to src/main/java/hu/akarnokd/rxjava3/expr/StatementFlowable.java index 9927a185..ce919836 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/StatementFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/StatementFlowable.java @@ -14,16 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; import java.util.Map; -import java.util.concurrent.Callable; import org.reactivestreams.Publisher; -import hu.akarnokd.rxjava2.util.AlwaysTrueBooleanSupplier; +import hu.akarnokd.rxjava3.util.AlwaysTrueBooleanSupplier; import io.reactivex.*; -import io.reactivex.functions.BooleanSupplier; +import io.reactivex.functions.*; import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.plugins.RxJavaPlugins; @@ -53,7 +52,7 @@ public final class StatementFlowable { * Observables, or an empty Flowable if no Flowable matches the * key */ - public static Flowable switchCase(Callable caseSelector, + public static Flowable switchCase(Supplier caseSelector, Map> mapOfCases) { return switchCase(caseSelector, mapOfCases, Flowable. empty()); } @@ -79,7 +78,7 @@ public static Flowable switchCase(Callable caseSelector, * Observables, or an empty Flowable if no Flowable matches the * key, but one that runs on the designated scheduler in either case */ - public static Flowable switchCase(Callable caseSelector, + public static Flowable switchCase(Supplier caseSelector, Map> mapOfCases, Scheduler scheduler) { return switchCase(caseSelector, mapOfCases, Flowable. empty().subscribeOn(scheduler)); } @@ -105,7 +104,7 @@ public static Flowable switchCase(Callable caseSelector, * @return a particular Flowable chosen by key from the map of * Observables, or the default case if no Flowable matches the key */ - public static Flowable switchCase(Callable caseSelector, + public static Flowable switchCase(Supplier caseSelector, Map> mapOfCases, Publisher defaultCase) { ObjectHelper.requireNonNull(caseSelector, "caseSelector is null"); diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/StatementMaybe.java b/src/main/java/hu/akarnokd/rxjava3/expr/StatementMaybe.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/expr/StatementMaybe.java rename to src/main/java/hu/akarnokd/rxjava3/expr/StatementMaybe.java index c7f9c733..3251eeec 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/StatementMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/StatementMaybe.java @@ -14,18 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; -import io.reactivex.Maybe; -import io.reactivex.MaybeSource; -import io.reactivex.Scheduler; -import io.reactivex.functions.BooleanSupplier; +import java.util.Map; + +import io.reactivex.*; +import io.reactivex.functions.*; import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.plugins.RxJavaPlugins; -import java.util.Map; -import java.util.concurrent.Callable; - /** * Imperative statements expressed as Maybe operators. */ @@ -52,7 +49,7 @@ public final class StatementMaybe { * Maybes, or an empty Maybe if no Maybe matches the * key */ - public static Maybe switchCase(Callable caseSelector, + public static Maybe switchCase(Supplier caseSelector, Map> mapOfCases) { return switchCase(caseSelector, mapOfCases, Maybe. empty()); } @@ -78,7 +75,7 @@ public static Maybe switchCase(Callable caseSelector, * Maybes, or an empty Maybe if no Maybe matches the * key, but one that runs on the designated scheduler in either case */ - public static Maybe switchCase(Callable caseSelector, + public static Maybe switchCase(Supplier caseSelector, Map> mapOfCases, Scheduler scheduler) { return switchCase(caseSelector, mapOfCases, Maybe. empty().subscribeOn(scheduler)); } @@ -104,7 +101,7 @@ public static Maybe switchCase(Callable caseSelector, * @return a particular Maybe chosen by key from the map of * Maybes, or the default case if no Maybe matches the key */ - public static Maybe switchCase(Callable caseSelector, + public static Maybe switchCase(Supplier caseSelector, Map> mapOfCases, MaybeSource defaultCase) { ObjectHelper.requireNonNull(caseSelector, "caseSelector is null"); diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/StatementObservable.java b/src/main/java/hu/akarnokd/rxjava3/expr/StatementObservable.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/expr/StatementObservable.java rename to src/main/java/hu/akarnokd/rxjava3/expr/StatementObservable.java index 6482a4fe..2cc1a687 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/StatementObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/StatementObservable.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; import java.util.Map; -import java.util.concurrent.Callable; -import hu.akarnokd.rxjava2.util.AlwaysTrueBooleanSupplier; +import hu.akarnokd.rxjava3.util.AlwaysTrueBooleanSupplier; import io.reactivex.*; -import io.reactivex.functions.BooleanSupplier; -import io.reactivex.internal.functions.*; +import io.reactivex.functions.*; +import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.plugins.RxJavaPlugins; /** @@ -51,7 +50,7 @@ public final class StatementObservable { * Observables, or an empty Observable if no Observable matches the * key */ - public static Observable switchCase(Callable caseSelector, + public static Observable switchCase(Supplier caseSelector, Map> mapOfCases) { return switchCase(caseSelector, mapOfCases, Observable. empty()); } @@ -77,7 +76,7 @@ public static Observable switchCase(Callable caseSelector * Observables, or an empty Observable if no Observable matches the * key, but one that runs on the designated scheduler in either case */ - public static Observable switchCase(Callable caseSelector, + public static Observable switchCase(Supplier caseSelector, Map> mapOfCases, Scheduler scheduler) { return switchCase(caseSelector, mapOfCases, Observable. empty().subscribeOn(scheduler)); } @@ -103,7 +102,7 @@ public static Observable switchCase(Callable caseSelector * @return a particular Observable chosen by key from the map of * Observables, or the default case if no Observable matches the key */ - public static Observable switchCase(Callable caseSelector, + public static Observable switchCase(Supplier caseSelector, Map> mapOfCases, ObservableSource defaultCase) { ObjectHelper.requireNonNull(caseSelector, "caseSelector is null"); diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/StatementSingle.java b/src/main/java/hu/akarnokd/rxjava3/expr/StatementSingle.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/expr/StatementSingle.java rename to src/main/java/hu/akarnokd/rxjava3/expr/StatementSingle.java index bfa45734..47d6d13f 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/StatementSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/StatementSingle.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; -import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.Scheduler; -import io.reactivex.functions.BooleanSupplier; +import java.util.Map; + +import io.reactivex.*; +import io.reactivex.functions.*; import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.plugins.RxJavaPlugins; -import java.util.Map; -import java.util.concurrent.Callable; - /** * Imperative statements expressed as Single operators. */ public final class StatementSingle { + /** Factory class. */ + private StatementSingle() { throw new IllegalStateException("No instances!"); } + /** * Return a particular one of several possible Singles based on a case * selector, or a default Single if the case selector does not map to @@ -52,7 +52,7 @@ public final class StatementSingle { * @return a particular Single chosen by key from the map of * Singles, or the default case if no Single matches the key */ - public static Single switchCase(Callable caseSelector, + public static Single switchCase(Supplier caseSelector, Map> mapOfCases, SingleSource defaultCase) { ObjectHelper.requireNonNull(caseSelector, "caseSelector is null"); diff --git a/src/main/java/hu/akarnokd/rxjava2/expr/package-info.java b/src/main/java/hu/akarnokd/rxjava3/expr/package-info.java similarity index 83% rename from src/main/java/hu/akarnokd/rxjava2/expr/package-info.java rename to src/main/java/hu/akarnokd/rxjava3/expr/package-info.java index 1eb34601..a55c6f5d 100644 --- a/src/main/java/hu/akarnokd/rxjava2/expr/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/package-info.java @@ -16,10 +16,10 @@ /** * Utility methods for computational expressions and statements via - * {@link hu.akarnokd.rxjava2.expr.StatementFlowable StatementFlowable} - * and {@link hu.akarnokd.rxjava2.expr.StatementObservable StatementObservable}; + * {@link hu.akarnokd.rxjava3.expr.StatementFlowable StatementFlowable} + * and {@link hu.akarnokd.rxjava3.expr.StatementObservable StatementObservable}; * a port of the * RxJavaComputationExpression * library. */ -package hu.akarnokd.rxjava2.expr; \ No newline at end of file +package hu.akarnokd.rxjava3.expr; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/Consumer3.java b/src/main/java/hu/akarnokd/rxjava3/functions/Consumer3.java similarity index 89% rename from src/main/java/hu/akarnokd/rxjava2/functions/Consumer3.java rename to src/main/java/hu/akarnokd/rxjava3/functions/Consumer3.java index 1dff87e9..987dfd62 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/Consumer3.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/Consumer3.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; /** * Functional interface for a callback that consumes multipe values at the same @@ -31,7 +31,7 @@ public interface Consumer3 { * @param t1 the first parameter * @param t2 the second parameter * @param t3 the third parameter - * @throws Exception on error + * @throws Throwable on error */ - void accept(T1 t1, T2 t2, T3 t3) throws Exception; + void accept(T1 t1, T2 t2, T3 t3) throws Throwable; } diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/Consumer4.java b/src/main/java/hu/akarnokd/rxjava3/functions/Consumer4.java similarity index 89% rename from src/main/java/hu/akarnokd/rxjava2/functions/Consumer4.java rename to src/main/java/hu/akarnokd/rxjava3/functions/Consumer4.java index a7e62886..9c2302b6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/Consumer4.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/Consumer4.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; /** * Functional interface for a callback that consumes multipe values at the same @@ -33,7 +33,7 @@ public interface Consumer4 { * @param t2 the second parameter * @param t3 the third parameter * @param t4 the fourth parameter - * @throws Exception on error + * @throws Throwable on error */ - void accept(T1 t1, T2 t2, T3 t3, T4 t4) throws Exception; + void accept(T1 t1, T2 t2, T3 t3, T4 t4) throws Throwable; } diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/Consumer5.java b/src/main/java/hu/akarnokd/rxjava3/functions/Consumer5.java similarity index 89% rename from src/main/java/hu/akarnokd/rxjava2/functions/Consumer5.java rename to src/main/java/hu/akarnokd/rxjava3/functions/Consumer5.java index 143fde6b..bbd92e55 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/Consumer5.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/Consumer5.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; /** * Functional interface for a callback that consumes multipe values at the same @@ -35,7 +35,7 @@ public interface Consumer5 { * @param t3 the third parameter * @param t4 the fourth parameter * @param t5 the fifth parameter - * @throws Exception on error + * @throws Throwable on error */ - void accept(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5) throws Exception; + void accept(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5) throws Throwable; } diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/Consumer6.java b/src/main/java/hu/akarnokd/rxjava3/functions/Consumer6.java similarity index 94% rename from src/main/java/hu/akarnokd/rxjava2/functions/Consumer6.java rename to src/main/java/hu/akarnokd/rxjava3/functions/Consumer6.java index 66989fd7..3f100de7 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/Consumer6.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/Consumer6.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; /** * Functional interface for a callback that consumes multipe values at the same @@ -37,7 +37,7 @@ public interface Consumer6 { * @param t4 the fourth parameter * @param t5 the fifth parameter * @param t6 the sixth parameter - * @throws Exception on error + * @throws Throwable on error */ - void accept(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) throws Exception; + void accept(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) throws Throwable; } diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/Consumer7.java b/src/main/java/hu/akarnokd/rxjava3/functions/Consumer7.java similarity index 93% rename from src/main/java/hu/akarnokd/rxjava2/functions/Consumer7.java rename to src/main/java/hu/akarnokd/rxjava3/functions/Consumer7.java index 86483191..c51f5571 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/Consumer7.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/Consumer7.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; /** * Functional interface for a callback that consumes multipe values at the same @@ -39,7 +39,7 @@ public interface Consumer7 { * @param t5 the fifth parameter * @param t6 the sixth parameter * @param t7 the seventh parameter - * @throws Exception on error + * @throws Throwable on error */ - void accept(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) throws Exception; + void accept(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) throws Throwable; } diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/Consumer8.java b/src/main/java/hu/akarnokd/rxjava3/functions/Consumer8.java similarity index 93% rename from src/main/java/hu/akarnokd/rxjava2/functions/Consumer8.java rename to src/main/java/hu/akarnokd/rxjava3/functions/Consumer8.java index 3d08bd6b..969387ee 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/Consumer8.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/Consumer8.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; /** * Functional interface for a callback that consumes multipe values at the same @@ -41,7 +41,7 @@ public interface Consumer8 { * @param t6 the sixth parameter * @param t7 the seventh parameter * @param t8 the eighth parameter - * @throws Exception on error + * @throws Throwable on error */ - void accept(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8) throws Exception; + void accept(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8) throws Throwable; } diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/Consumer9.java b/src/main/java/hu/akarnokd/rxjava3/functions/Consumer9.java similarity index 93% rename from src/main/java/hu/akarnokd/rxjava2/functions/Consumer9.java rename to src/main/java/hu/akarnokd/rxjava3/functions/Consumer9.java index e38023ad..99d552db 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/Consumer9.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/Consumer9.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; /** * Functional interface for a callback that consumes multipe values at the same @@ -43,7 +43,7 @@ public interface Consumer9 { * @param t7 the seventh parameter * @param t8 the eighth parameter * @param t9 the ninth parameter - * @throws Exception on error + * @throws Throwable on error */ - void accept(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9) throws Exception; + void accept(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9) throws Throwable; } diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/FunctionTagging.java b/src/main/java/hu/akarnokd/rxjava3/functions/FunctionTagging.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/functions/FunctionTagging.java rename to src/main/java/hu/akarnokd/rxjava3/functions/FunctionTagging.java index 29a21031..d8c59081 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/FunctionTagging.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/FunctionTagging.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; import java.util.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/FunctionsEx.java b/src/main/java/hu/akarnokd/rxjava3/functions/FunctionsEx.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/functions/FunctionsEx.java rename to src/main/java/hu/akarnokd/rxjava3/functions/FunctionsEx.java index 2f49029b..3849a5f5 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/FunctionsEx.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/FunctionsEx.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; import io.reactivex.functions.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/PlainBiConsumer.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainBiConsumer.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/functions/PlainBiConsumer.java rename to src/main/java/hu/akarnokd/rxjava3/functions/PlainBiConsumer.java index fd98596e..d977042c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/PlainBiConsumer.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainBiConsumer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; import io.reactivex.functions.BiConsumer; diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/PlainBiFunction.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainBiFunction.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/functions/PlainBiFunction.java rename to src/main/java/hu/akarnokd/rxjava3/functions/PlainBiFunction.java index 82f16668..30f6e919 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/PlainBiFunction.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainBiFunction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; import io.reactivex.functions.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/PlainConsumer.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainConsumer.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/functions/PlainConsumer.java rename to src/main/java/hu/akarnokd/rxjava3/functions/PlainConsumer.java index 985dc05e..fb7249f6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/PlainConsumer.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainConsumer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; import io.reactivex.functions.Consumer; diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction.java rename to src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction.java index c51888f2..4f3c912b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; import io.reactivex.functions.Function; diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction3.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction3.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction3.java rename to src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction3.java index fc4c57cd..37e2f368 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction3.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction3.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; import io.reactivex.functions.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction4.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction4.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction4.java rename to src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction4.java index 7dccd638..c99f1c5c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction4.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction4.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; import io.reactivex.functions.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction5.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction5.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction5.java rename to src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction5.java index 503c5871..48c9b4c5 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction5.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction5.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; import io.reactivex.functions.Function5; diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction6.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction6.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction6.java rename to src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction6.java index 55dadd17..d0de355e 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction6.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction6.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; import io.reactivex.functions.Function6; diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction7.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction7.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction7.java rename to src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction7.java index 552829f6..42314bc7 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction7.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction7.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; import io.reactivex.functions.Function7; diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction8.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction8.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction8.java rename to src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction8.java index 2cd12dc2..7b4da7b3 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction8.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction8.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; import io.reactivex.functions.Function8; diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction9.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction9.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction9.java rename to src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction9.java index 5e0aa707..4498ba8c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/PlainFunction9.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction9.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; import io.reactivex.functions.Function9; diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/Supplier.java b/src/main/java/hu/akarnokd/rxjava3/functions/SimpleCallable.java similarity index 89% rename from src/main/java/hu/akarnokd/rxjava2/functions/Supplier.java rename to src/main/java/hu/akarnokd/rxjava3/functions/SimpleCallable.java index b76a366d..399f591d 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/Supplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/SimpleCallable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; import java.util.concurrent.Callable; @@ -22,7 +22,7 @@ * A {@link Callable} with suppressed exception on its {@link #call()} method. * @param the value type */ -public interface Supplier extends Callable { +public interface SimpleCallable extends Callable { @Override T call(); diff --git a/src/main/java/hu/akarnokd/rxjava2/functions/package-info.java b/src/main/java/hu/akarnokd/rxjava3/functions/package-info.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/functions/package-info.java rename to src/main/java/hu/akarnokd/rxjava3/functions/package-info.java index 5cdfb4a0..959bce13 100644 --- a/src/main/java/hu/akarnokd/rxjava2/functions/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/package-info.java @@ -19,4 +19,4 @@ * 3..9 arguments and {@link io.reactivex.functions.Function Function}s without the * {@code throws Exception} clause in their definition. */ -package hu.akarnokd.rxjava2.functions; \ No newline at end of file +package hu.akarnokd.rxjava3.functions; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan0.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan0.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan0.java rename to src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan0.java index bfaba70d..1f4d0153 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan0.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan0.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import java.util.HashMap; import java.util.Map; @@ -25,7 +25,7 @@ abstract class ActivePlan0 { protected final Map joinObservers = new HashMap(); - protected abstract void match() throws Exception; + protected abstract void match() throws Throwable; protected void addJoinObserver(JoinObserver joinObserver) { joinObservers.put(joinObserver, joinObserver); diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan1.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan1.java similarity index 94% rename from src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan1.java rename to src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan1.java index 8f1c0db0..6de13bf6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan1.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan1.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import io.reactivex.Notification; import io.reactivex.functions.*; @@ -36,7 +36,7 @@ final class ActivePlan1 extends ActivePlan0 { } @Override - protected void match() throws Exception { + protected void match() throws Throwable { if (!jo1.queue().isEmpty()) { Notification n1 = jo1.queue().peek(); if (n1.isOnComplete()) { diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan2.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan2.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan2.java rename to src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan2.java index f137324d..a2137143 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan2.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import io.reactivex.Notification; import io.reactivex.functions.*; @@ -40,7 +40,7 @@ final class ActivePlan2 extends ActivePlan0 { } @Override - protected void match() throws Exception { + protected void match() throws Throwable { if (!jo1.queue().isEmpty() && !jo2.queue().isEmpty()) { Notification n1 = jo1.queue().peek(); Notification n2 = jo2.queue().peek(); diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan3.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan3.java similarity index 94% rename from src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan3.java rename to src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan3.java index 8930a168..d7e54d75 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan3.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan3.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; -import hu.akarnokd.rxjava2.functions.Consumer3; +import hu.akarnokd.rxjava3.functions.Consumer3; import io.reactivex.Notification; import io.reactivex.functions.Action; @@ -49,7 +49,7 @@ final class ActivePlan3 extends ActivePlan0 { } @Override - protected void match() throws Exception { + protected void match() throws Throwable { if (!first.queue().isEmpty() && !second.queue().isEmpty() && !third.queue().isEmpty()) { diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan4.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan4.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan4.java rename to src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan4.java index b0e2b3ab..f0334e9e 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan4.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan4.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; -import hu.akarnokd.rxjava2.functions.Consumer4; +import hu.akarnokd.rxjava3.functions.Consumer4; import io.reactivex.Notification; import io.reactivex.functions.Action; @@ -55,7 +55,7 @@ final class ActivePlan4 extends ActivePlan0 { } @Override - protected void match() throws Exception { + protected void match() throws Throwable { if (!jo1.queue().isEmpty() && !jo2.queue().isEmpty() && !jo3.queue().isEmpty() diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan5.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan5.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan5.java rename to src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan5.java index 3a657e45..9cce56a2 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan5.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan5.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; -import hu.akarnokd.rxjava2.functions.Consumer5; +import hu.akarnokd.rxjava3.functions.Consumer5; import io.reactivex.Notification; import io.reactivex.functions.Action; @@ -60,7 +60,7 @@ final class ActivePlan5 extends ActivePlan0 { } @Override - protected void match() throws Exception { + protected void match() throws Throwable { if (!jo1.queue().isEmpty() && !jo2.queue().isEmpty() && !jo3.queue().isEmpty() diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan6.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan6.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan6.java rename to src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan6.java index 319fb1e3..dcd36a8d 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan6.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan6.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; -import hu.akarnokd.rxjava2.functions.Consumer6; +import hu.akarnokd.rxjava3.functions.Consumer6; import io.reactivex.Notification; import io.reactivex.functions.Action; @@ -65,7 +65,7 @@ final class ActivePlan6 extends ActivePlan0 { } @Override - protected void match() throws Exception { + protected void match() throws Throwable { if (!jo1.queue().isEmpty() && !jo2.queue().isEmpty() && !jo3.queue().isEmpty() diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan7.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan7.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan7.java rename to src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan7.java index 2081aea7..8bfc0ccf 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan7.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan7.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; -import hu.akarnokd.rxjava2.functions.Consumer7; +import hu.akarnokd.rxjava3.functions.Consumer7; import io.reactivex.Notification; import io.reactivex.functions.Action; @@ -70,7 +70,7 @@ final class ActivePlan7 extends ActivePlan0 { } @Override - protected void match() throws Exception { + protected void match() throws Throwable { if (!jo1.queue().isEmpty() && !jo2.queue().isEmpty() && !jo3.queue().isEmpty() diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan8.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan8.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan8.java rename to src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan8.java index 4d574406..5dae4aaa 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan8.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan8.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; -import hu.akarnokd.rxjava2.functions.Consumer8; +import hu.akarnokd.rxjava3.functions.Consumer8; import io.reactivex.Notification; import io.reactivex.functions.Action; @@ -75,7 +75,7 @@ final class ActivePlan8 extends ActivePlan0 { } @Override - protected void match() throws Exception { + protected void match() throws Throwable { if (!jo1.queue().isEmpty() && !jo2.queue().isEmpty() && !jo3.queue().isEmpty() diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan9.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan9.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan9.java rename to src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan9.java index 75953106..5922c26f 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlan9.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan9.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; -import hu.akarnokd.rxjava2.functions.Consumer9; +import hu.akarnokd.rxjava3.functions.Consumer9; import io.reactivex.Notification; import io.reactivex.functions.Action; @@ -80,7 +80,7 @@ final class ActivePlan9 extends ActivePlan0 } @Override - protected void match() throws Exception { + protected void match() throws Throwable { if (!jo1.queue().isEmpty() && !jo2.queue().isEmpty() && !jo3.queue().isEmpty() diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlanN.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlanN.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/joins/ActivePlanN.java rename to src/main/java/hu/akarnokd/rxjava3/joins/ActivePlanN.java index 381ebb0c..aed8c9f9 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/ActivePlanN.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlanN.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import java.util.*; @@ -41,7 +41,7 @@ final class ActivePlanN extends ActivePlan0 { } @Override - protected void match() throws Exception { + protected void match() throws Throwable { Object[] notifications = new Object[this.observers.size()]; int j = 0; int completedCount = 0; diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/JoinObservable.java b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObservable.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/joins/JoinObservable.java rename to src/main/java/hu/akarnokd/rxjava3/joins/JoinObservable.java index b3928f0e..158909dd 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/JoinObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObservable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import io.reactivex.Observable; import io.reactivex.functions.Function; diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/JoinObserver.java b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/joins/JoinObserver.java rename to src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver.java index 42931760..069c6be6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/JoinObserver.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import io.reactivex.disposables.Disposable; diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/JoinObserver1.java b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver1.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/joins/JoinObserver1.java rename to src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver1.java index aa0d85fb..72f59056 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/JoinObserver1.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver1.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import java.util.*; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/JoinPatterns.java b/src/main/java/hu/akarnokd/rxjava3/joins/JoinPatterns.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/joins/JoinPatterns.java rename to src/main/java/hu/akarnokd/rxjava3/joins/JoinPatterns.java index 5fb076e4..593f065e 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/JoinPatterns.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/JoinPatterns.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import java.util.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern1.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern1.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/joins/Pattern1.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Pattern1.java index a581da20..bcef9e12 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern1.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern1.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import io.reactivex.Observable; import io.reactivex.functions.Function; diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern2.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern2.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/joins/Pattern2.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Pattern2.java index ff49be66..0633f0c3 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern2.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import io.reactivex.Observable; import io.reactivex.functions.BiFunction; diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern3.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern3.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/joins/Pattern3.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Pattern3.java index d13aa2e7..e16ff5b8 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern3.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern3.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import io.reactivex.Observable; import io.reactivex.functions.Function3; diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern4.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern4.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/joins/Pattern4.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Pattern4.java index 4f56936e..2db8c8f4 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern4.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern4.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import io.reactivex.Observable; import io.reactivex.functions.Function4; diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern5.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern5.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/joins/Pattern5.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Pattern5.java index 8d4c5711..65ca8e2c 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern5.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern5.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import io.reactivex.Observable; import io.reactivex.functions.Function5; diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern6.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern6.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/joins/Pattern6.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Pattern6.java index 8bd8e57c..92b6462a 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern6.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern6.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import io.reactivex.Observable; import io.reactivex.functions.Function6; diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern7.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern7.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/joins/Pattern7.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Pattern7.java index f7210e8b..ee638517 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern7.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern7.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import io.reactivex.Observable; import io.reactivex.functions.Function7; diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern8.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern8.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/joins/Pattern8.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Pattern8.java index fe752f36..d01ac60d 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern8.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern8.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import io.reactivex.Observable; import io.reactivex.functions.Function8; diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern9.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern9.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/joins/Pattern9.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Pattern9.java index b8aac139..ba740d26 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Pattern9.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern9.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import java.util.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/PatternN.java b/src/main/java/hu/akarnokd/rxjava3/joins/PatternN.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/joins/PatternN.java rename to src/main/java/hu/akarnokd/rxjava3/joins/PatternN.java index f1a61de2..eee2b840 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/PatternN.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/PatternN.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import java.util.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Plan.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/joins/Plan.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Plan.java index 0a2eecd6..da890e76 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Plan.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import java.util.Map; diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Plan1.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan1.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/joins/Plan1.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Plan1.java index d4e53f8d..db86dd0f 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Plan1.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan1.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; @@ -59,7 +59,7 @@ public void accept(T1 t1) { }, new Action() { @Override - public void run() throws Exception { + public void run() throws Throwable { ActivePlan0 ap = self.get(); firstJoinObserver.removeActivePlan(ap); deactivate.accept(ap); diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Plan2.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan2.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/joins/Plan2.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Plan2.java index 770a564d..a2d95f05 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Plan2.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; @@ -62,7 +62,7 @@ public void accept(T1 t1, T2 t2) { }, new Action() { @Override - public void run() throws Exception { + public void run() throws Throwable { ActivePlan0 ap = self.get(); jo1.removeActivePlan(ap); jo2.removeActivePlan(ap); diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Plan3.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan3.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/joins/Plan3.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Plan3.java index 3a7ec86e..4d0dffb7 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Plan3.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan3.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import hu.akarnokd.rxjava2.functions.Consumer3; +import hu.akarnokd.rxjava3.functions.Consumer3; import io.reactivex.Observer; import io.reactivex.functions.*; @@ -67,7 +67,7 @@ public void accept(T1 t1, T2 t2, T3 t3) { }, new Action() { @Override - public void run() throws Exception { + public void run() throws Throwable { ActivePlan0 ap = self.get(); jo1.removeActivePlan(ap); jo2.removeActivePlan(ap); diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Plan4.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan4.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/joins/Plan4.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Plan4.java index 8b670d1b..4f309a5a 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Plan4.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan4.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import hu.akarnokd.rxjava2.functions.Consumer4; +import hu.akarnokd.rxjava3.functions.Consumer4; import io.reactivex.Observer; import io.reactivex.functions.*; @@ -69,7 +69,7 @@ public void accept(T1 t1, T2 t2, T3 t3, T4 t4) { }, new Action() { @Override - public void run() throws Exception { + public void run() throws Throwable { ActivePlan0 ap = self.get(); jo1.removeActivePlan(ap); jo2.removeActivePlan(ap); diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Plan5.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan5.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/joins/Plan5.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Plan5.java index 1d759281..f487f8e7 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Plan5.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan5.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import hu.akarnokd.rxjava2.functions.Consumer5; +import hu.akarnokd.rxjava3.functions.Consumer5; import io.reactivex.Observer; import io.reactivex.functions.*; @@ -71,7 +71,7 @@ public void accept(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5) { }, new Action() { @Override - public void run() throws Exception { + public void run() throws Throwable { ActivePlan0 ap = self.get(); jo1.removeActivePlan(ap); jo2.removeActivePlan(ap); diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Plan6.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan6.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/joins/Plan6.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Plan6.java index 371ce1de..2e590d32 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Plan6.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan6.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import hu.akarnokd.rxjava2.functions.Consumer6; +import hu.akarnokd.rxjava3.functions.Consumer6; import io.reactivex.Observer; import io.reactivex.functions.*; @@ -73,7 +73,7 @@ public void accept(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) { }, new Action() { @Override - public void run() throws Exception { + public void run() throws Throwable { ActivePlan0 ap = self.get(); jo1.removeActivePlan(ap); jo2.removeActivePlan(ap); diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Plan7.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan7.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/joins/Plan7.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Plan7.java index a03abf82..7bcc98b2 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Plan7.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan7.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import hu.akarnokd.rxjava2.functions.Consumer7; +import hu.akarnokd.rxjava3.functions.Consumer7; import io.reactivex.Observer; import io.reactivex.functions.*; @@ -75,7 +75,7 @@ public void accept(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) { }, new Action() { @Override - public void run() throws Exception { + public void run() throws Throwable { ActivePlan0 ap = self.get(); jo1.removeActivePlan(ap); jo2.removeActivePlan(ap); diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Plan8.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan8.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/joins/Plan8.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Plan8.java index 018123cc..6c8eef62 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Plan8.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan8.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import hu.akarnokd.rxjava2.functions.Consumer8; +import hu.akarnokd.rxjava3.functions.Consumer8; import io.reactivex.Observer; import io.reactivex.functions.*; @@ -77,7 +77,7 @@ public void accept(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8) { }, new Action() { @Override - public void run() throws Exception { + public void run() throws Throwable { ActivePlan0 ap = self.get(); jo1.removeActivePlan(ap); jo2.removeActivePlan(ap); diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/Plan9.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan9.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/joins/Plan9.java rename to src/main/java/hu/akarnokd/rxjava3/joins/Plan9.java index d0452cea..2986e739 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/Plan9.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan9.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import hu.akarnokd.rxjava2.functions.Consumer9; +import hu.akarnokd.rxjava3.functions.Consumer9; import io.reactivex.Observer; import io.reactivex.functions.*; @@ -79,7 +79,7 @@ public void accept(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9 }, new Action() { @Override - public void run() throws Exception { + public void run() throws Throwable { ActivePlan0 ap = self.get(); jo1.removeActivePlan(ap); jo2.removeActivePlan(ap); diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/PlanN.java b/src/main/java/hu/akarnokd/rxjava3/joins/PlanN.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/joins/PlanN.java rename to src/main/java/hu/akarnokd/rxjava3/joins/PlanN.java index 913c4578..99752b01 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/PlanN.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/PlanN.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import java.util.*; import java.util.concurrent.atomic.AtomicReference; @@ -61,7 +61,7 @@ public void accept(Object[]args) { }, new Action() { @Override - public void run() throws Exception { + public void run() throws Throwable { for (JoinObserver1 jo : observers) { jo.removeActivePlan(self.get()); } diff --git a/src/main/java/hu/akarnokd/rxjava2/joins/package-info.java b/src/main/java/hu/akarnokd/rxjava3/joins/package-info.java similarity index 89% rename from src/main/java/hu/akarnokd/rxjava2/joins/package-info.java rename to src/main/java/hu/akarnokd/rxjava3/joins/package-info.java index 6bc12ec9..a141067a 100644 --- a/src/main/java/hu/akarnokd/rxjava2/joins/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/package-info.java @@ -16,10 +16,10 @@ /** * Utility methods for join patterns (more generic way than {@code combineLatest}) via - * {@link hu.akarnokd.rxjava2.joins.JoinObservable JoinObservable} wrapper and the {@code and/then/when} + * {@link hu.akarnokd.rxjava3.joins.JoinObservable JoinObservable} wrapper and the {@code and/then/when} * vocabulary; * a port of the * RxJavaJoins * library. */ -package hu.akarnokd.rxjava2.joins; \ No newline at end of file +package hu.akarnokd.rxjava3.joins; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava2/math/FlowableAverageDouble.java b/src/main/java/hu/akarnokd/rxjava3/math/FlowableAverageDouble.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/math/FlowableAverageDouble.java rename to src/main/java/hu/akarnokd/rxjava3/math/FlowableAverageDouble.java index daeb4276..52fd7be5 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/FlowableAverageDouble.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/FlowableAverageDouble.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/FlowableAverageFloat.java b/src/main/java/hu/akarnokd/rxjava3/math/FlowableAverageFloat.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/math/FlowableAverageFloat.java rename to src/main/java/hu/akarnokd/rxjava3/math/FlowableAverageFloat.java index d2b6d78f..47cf7c0f 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/FlowableAverageFloat.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/FlowableAverageFloat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/FlowableMinMax.java b/src/main/java/hu/akarnokd/rxjava3/math/FlowableMinMax.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/math/FlowableMinMax.java rename to src/main/java/hu/akarnokd/rxjava3/math/FlowableMinMax.java index 7c9f3a6d..32fd1d8e 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/FlowableMinMax.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/FlowableMinMax.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import java.util.Comparator; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/FlowableSource.java b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSource.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/math/FlowableSource.java rename to src/main/java/hu/akarnokd/rxjava3/math/FlowableSource.java index fa54fa33..f1e991a6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/FlowableSource.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import org.reactivestreams.Publisher; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/FlowableSumDouble.java b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumDouble.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/math/FlowableSumDouble.java rename to src/main/java/hu/akarnokd/rxjava3/math/FlowableSumDouble.java index 274e3a25..c1576b7b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/FlowableSumDouble.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumDouble.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/FlowableSumFloat.java b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumFloat.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/math/FlowableSumFloat.java rename to src/main/java/hu/akarnokd/rxjava3/math/FlowableSumFloat.java index c86f7cce..abb22146 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/FlowableSumFloat.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumFloat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/FlowableSumInt.java b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumInt.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/math/FlowableSumInt.java rename to src/main/java/hu/akarnokd/rxjava3/math/FlowableSumInt.java index b70361d1..baf1cc63 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/FlowableSumInt.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumInt.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/FlowableSumLong.java b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumLong.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/math/FlowableSumLong.java rename to src/main/java/hu/akarnokd/rxjava3/math/FlowableSumLong.java index f43b9c8f..9ce43595 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/FlowableSumLong.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumLong.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/MathFlowable.java b/src/main/java/hu/akarnokd/rxjava3/math/MathFlowable.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/math/MathFlowable.java rename to src/main/java/hu/akarnokd/rxjava3/math/MathFlowable.java index 804113aa..1b5780e3 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/MathFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/MathFlowable.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import java.util.Comparator; import org.reactivestreams.Publisher; -import hu.akarnokd.rxjava2.util.SelfComparator; +import hu.akarnokd.rxjava3.util.SelfComparator; import io.reactivex.Flowable; import io.reactivex.plugins.RxJavaPlugins; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/MathObservable.java b/src/main/java/hu/akarnokd/rxjava3/math/MathObservable.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/math/MathObservable.java rename to src/main/java/hu/akarnokd/rxjava3/math/MathObservable.java index 98beb15c..c1662fcc 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/MathObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/MathObservable.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import java.util.Comparator; -import hu.akarnokd.rxjava2.util.SelfComparator; +import hu.akarnokd.rxjava3.util.SelfComparator; import io.reactivex.*; import io.reactivex.plugins.RxJavaPlugins; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/ObservableAverageDouble.java b/src/main/java/hu/akarnokd/rxjava3/math/ObservableAverageDouble.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/math/ObservableAverageDouble.java rename to src/main/java/hu/akarnokd/rxjava3/math/ObservableAverageDouble.java index 0bf39b73..dffe14af 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/ObservableAverageDouble.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/ObservableAverageDouble.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import io.reactivex.*; import io.reactivex.internal.observers.DeferredScalarObserver; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/ObservableAverageFloat.java b/src/main/java/hu/akarnokd/rxjava3/math/ObservableAverageFloat.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/math/ObservableAverageFloat.java rename to src/main/java/hu/akarnokd/rxjava3/math/ObservableAverageFloat.java index 3bdb2ebd..e2dc99b7 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/ObservableAverageFloat.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/ObservableAverageFloat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import io.reactivex.internal.observers.DeferredScalarObserver; import io.reactivex.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/ObservableMinMax.java b/src/main/java/hu/akarnokd/rxjava3/math/ObservableMinMax.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/math/ObservableMinMax.java rename to src/main/java/hu/akarnokd/rxjava3/math/ObservableMinMax.java index 04c44f99..333f6326 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/ObservableMinMax.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/ObservableMinMax.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import java.util.Comparator; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/ObservableSource.java b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSource.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/math/ObservableSource.java rename to src/main/java/hu/akarnokd/rxjava3/math/ObservableSource.java index 31ec9df2..76cfcbaf 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/ObservableSource.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import io.reactivex.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/ObservableSumDouble.java b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumDouble.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/math/ObservableSumDouble.java rename to src/main/java/hu/akarnokd/rxjava3/math/ObservableSumDouble.java index 9ff3f19e..c7407c88 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/ObservableSumDouble.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumDouble.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import io.reactivex.internal.observers.DeferredScalarObserver; import io.reactivex.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/ObservableSumFloat.java b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumFloat.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/math/ObservableSumFloat.java rename to src/main/java/hu/akarnokd/rxjava3/math/ObservableSumFloat.java index f5ca0005..15226ccd 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/ObservableSumFloat.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumFloat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import io.reactivex.internal.observers.DeferredScalarObserver; import io.reactivex.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/ObservableSumInt.java b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumInt.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/math/ObservableSumInt.java rename to src/main/java/hu/akarnokd/rxjava3/math/ObservableSumInt.java index 3651e415..1c9776a6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/ObservableSumInt.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumInt.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import io.reactivex.internal.observers.DeferredScalarObserver; import io.reactivex.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/ObservableSumLong.java b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumLong.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/math/ObservableSumLong.java rename to src/main/java/hu/akarnokd/rxjava3/math/ObservableSumLong.java index 7096ffa1..64d09a91 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/ObservableSumLong.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumLong.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; import io.reactivex.internal.observers.DeferredScalarObserver; import io.reactivex.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/math/package-info.java b/src/main/java/hu/akarnokd/rxjava3/math/package-info.java similarity index 83% rename from src/main/java/hu/akarnokd/rxjava2/math/package-info.java rename to src/main/java/hu/akarnokd/rxjava3/math/package-info.java index d24a6897..57287989 100644 --- a/src/main/java/hu/akarnokd/rxjava2/math/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/package-info.java @@ -16,10 +16,10 @@ /** * Utility methods for aggregating and reducing flows with numeric content via - * {@link hu.akarnokd.rxjava2.math.MathFlowable MathFlowable} - * and {@link hu.akarnokd.rxjava2.math.MathObservable MathObservable}; + * {@link hu.akarnokd.rxjava3.math.MathFlowable MathFlowable} + * and {@link hu.akarnokd.rxjava3.math.MathObservable MathObservable}; * a port of the * RxJavaMath * library. */ -package hu.akarnokd.rxjava2.math; \ No newline at end of file +package hu.akarnokd.rxjava3.math; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/BasicEmitter.java b/src/main/java/hu/akarnokd/rxjava3/operators/BasicEmitter.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/operators/BasicEmitter.java rename to src/main/java/hu/akarnokd/rxjava3/operators/BasicEmitter.java index 5479b94d..0413a81f 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/BasicEmitter.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/BasicEmitter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; /** * Abstraction over a Subscriber. diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/BasicMergeSubscription.java b/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/BasicMergeSubscription.java rename to src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java index 62efe94d..5c3bde92 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/BasicMergeSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.Arrays; import java.util.Comparator; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalCompletable.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletable.java similarity index 91% rename from src/main/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalCompletable.java rename to src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletable.java index fdfe5779..e87ade66 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletable.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; -import java.util.concurrent.Callable; 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.functions.*; import io.reactivex.internal.disposables.DisposableHelper; import io.reactivex.internal.functions.ObjectHelper; @@ -35,12 +34,12 @@ final class CompletableFlatMapSignalCompletable extends Completable final Completable source; - final Callable onCompleteHandler; + final Supplier onCompleteHandler; final Function onErrorHandler; CompletableFlatMapSignalCompletable(Completable source, - Callable onCompleteHandler, + Supplier onCompleteHandler, Function onErrorHandler) { this.source = source; this.onCompleteHandler = onCompleteHandler; @@ -62,12 +61,12 @@ static final class FlatMapSignalConsumer final SignalConsumer consumer; - final Callable onCompleteHandler; + final Supplier onCompleteHandler; final Function onErrorHandler; FlatMapSignalConsumer(CompletableObserver downstream, - Callable onCompleteHandler, + Supplier onCompleteHandler, Function onErrorHandler) { this.consumer = new SignalConsumer(downstream); this.onCompleteHandler = onCompleteHandler; @@ -97,7 +96,7 @@ public void onComplete() { CompletableSource next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.call(), "The onCompleteHandler returned a null CompletableSource"); + next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalFlowable.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowable.java similarity index 91% rename from src/main/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalFlowable.java rename to src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowable.java index feff70eb..58f85bc1 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowable.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; -import java.util.concurrent.Callable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -24,7 +23,7 @@ import io.reactivex.*; import io.reactivex.disposables.Disposable; import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.internal.disposables.DisposableHelper; import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.internal.subscriptions.SubscriptionHelper; @@ -38,12 +37,12 @@ final class CompletableFlatMapSignalFlowable extends Flowable final Completable source; - final Callable> onCompleteHandler; + final Supplier> onCompleteHandler; final Function> onErrorHandler; CompletableFlatMapSignalFlowable(Completable source, - Callable> onCompleteHandler, + Supplier> onCompleteHandler, Function> onErrorHandler) { this.source = source; this.onCompleteHandler = onCompleteHandler; @@ -65,14 +64,14 @@ static final class FlatMapSignalConsumer final SignalConsumer consumer; - final Callable> onCompleteHandler; + final Supplier> onCompleteHandler; final Function> onErrorHandler; Disposable upstream; FlatMapSignalConsumer(Subscriber downstream, - Callable> onCompleteHandler, + Supplier> onCompleteHandler, Function> onErrorHandler) { this.consumer = new SignalConsumer(downstream); this.onCompleteHandler = onCompleteHandler; @@ -103,7 +102,7 @@ public void onComplete() { Publisher next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.call(), "The onCompleteHandler returned a null Publisher"); + next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalMaybe.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybe.java similarity index 91% rename from src/main/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalMaybe.java rename to src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybe.java index ac30e05a..264dccf8 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybe.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; -import java.util.concurrent.Callable; 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.functions.*; import io.reactivex.internal.disposables.DisposableHelper; import io.reactivex.internal.functions.ObjectHelper; @@ -35,12 +34,12 @@ final class CompletableFlatMapSignalMaybe extends Maybe final Completable source; - final Callable> onCompleteHandler; + final Supplier> onCompleteHandler; final Function> onErrorHandler; CompletableFlatMapSignalMaybe(Completable source, - Callable> onCompleteHandler, + Supplier> onCompleteHandler, Function> onErrorHandler) { this.source = source; this.onCompleteHandler = onCompleteHandler; @@ -62,12 +61,12 @@ static final class FlatMapSignalConsumer final SignalConsumer consumer; - final Callable> onCompleteHandler; + final Supplier> onCompleteHandler; final Function> onErrorHandler; FlatMapSignalConsumer(MaybeObserver downstream, - Callable> onCompleteHandler, + Supplier> onCompleteHandler, Function> onErrorHandler) { this.consumer = new SignalConsumer(downstream); this.onCompleteHandler = onCompleteHandler; @@ -97,7 +96,7 @@ public void onComplete() { MaybeSource next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.call(), "The onCompleteHandler returned a null MaybeSource"); + next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalObservable.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservable.java similarity index 91% rename from src/main/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalObservable.java rename to src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservable.java index 45234424..dc849b28 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservable.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; -import java.util.concurrent.Callable; 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.functions.*; import io.reactivex.internal.disposables.DisposableHelper; import io.reactivex.internal.functions.ObjectHelper; @@ -35,12 +34,12 @@ final class CompletableFlatMapSignalObservable extends Observable final Completable source; - final Callable> onCompleteHandler; + final Supplier> onCompleteHandler; final Function> onErrorHandler; CompletableFlatMapSignalObservable(Completable source, - Callable> onCompleteHandler, + Supplier> onCompleteHandler, Function> onErrorHandler) { this.source = source; this.onCompleteHandler = onCompleteHandler; @@ -62,12 +61,12 @@ static final class FlatMapSignalConsumer final SignalConsumer consumer; - final Callable> onCompleteHandler; + final Supplier> onCompleteHandler; final Function> onErrorHandler; FlatMapSignalConsumer(Observer downstream, - Callable> onCompleteHandler, + Supplier> onCompleteHandler, Function> onErrorHandler) { this.consumer = new SignalConsumer(downstream); this.onCompleteHandler = onCompleteHandler; @@ -97,7 +96,7 @@ public void onComplete() { ObservableSource next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.call(), "The onCompleteHandler returned a null ObservableSource"); + next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalSingle.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingle.java similarity index 91% rename from src/main/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalSingle.java rename to src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingle.java index 45da9f7e..c878c4f4 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingle.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; -import java.util.concurrent.Callable; 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.functions.*; import io.reactivex.internal.disposables.DisposableHelper; import io.reactivex.internal.functions.ObjectHelper; @@ -35,12 +34,12 @@ final class CompletableFlatMapSignalSingle extends Single final Completable source; - final Callable> onCompleteHandler; + final Supplier> onCompleteHandler; final Function> onErrorHandler; CompletableFlatMapSignalSingle(Completable source, - Callable> onCompleteHandler, + Supplier> onCompleteHandler, Function> onErrorHandler) { this.source = source; this.onCompleteHandler = onCompleteHandler; @@ -62,12 +61,12 @@ static final class FlatMapSignalConsumer final SignalConsumer consumer; - final Callable> onCompleteHandler; + final Supplier> onCompleteHandler; final Function> onErrorHandler; FlatMapSignalConsumer(SingleObserver downstream, - Callable> onCompleteHandler, + Supplier> onCompleteHandler, Function> onErrorHandler) { this.consumer = new SignalConsumer(downstream); this.onCompleteHandler = onCompleteHandler; @@ -97,7 +96,7 @@ public void onComplete() { SingleSource next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.call(), "The onCompleteHandler returned a null SingleSource"); + next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/CompletableTransformers.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableTransformers.java similarity index 91% rename from src/main/java/hu/akarnokd/rxjava2/operators/CompletableTransformers.java rename to src/main/java/hu/akarnokd/rxjava3/operators/CompletableTransformers.java index fe54201e..b8afb2b2 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/CompletableTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableTransformers.java @@ -14,12 +14,10 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.operators; import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.internal.functions.ObjectHelper; /** @@ -48,7 +46,7 @@ private CompletableTransformers() { * @since 0.20.2 */ public static CompletableTransformer flatMap( - Callable onCompleteHandler, + Supplier onCompleteHandler, Function onErrorHandler) { ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/Completables.java b/src/main/java/hu/akarnokd/rxjava3/operators/Completables.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/operators/Completables.java rename to src/main/java/hu/akarnokd/rxjava3/operators/Completables.java index db1a2bbd..d297f4a3 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/Completables.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/Completables.java @@ -14,19 +14,17 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.operators; import org.reactivestreams.Publisher; import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.internal.functions.ObjectHelper; /** * Additional operators in the form of {@link CompletableConverter}s, - * use {@link Completable#as(CompletableConverter)} + * use {@link Completable#to(CompletableConverter)} * to apply the operators to an existing sequence. * * @see CompletableTransformers @@ -51,7 +49,7 @@ private Completables() { * @since 0.20.2 */ public static CompletableConverter> flatMapMaybe( - Callable> onCompleteHandler, + Supplier> onCompleteHandler, Function> onErrorHandler) { ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); @@ -70,7 +68,7 @@ public static CompletableConverter> flatMapMaybe( * @since 0.20.2 */ public static CompletableConverter> flatMapSingle( - Callable> onCompleteHandler, + Supplier> onCompleteHandler, Function> onErrorHandler) { ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); @@ -89,7 +87,7 @@ public static CompletableConverter> flatMapSingle( * @since 0.20.2 */ public static CompletableConverter> flatMapObservable( - Callable> onCompleteHandler, + Supplier> onCompleteHandler, Function> onErrorHandler) { ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); @@ -108,7 +106,7 @@ public static CompletableConverter> flatMapObservable( * @since 0.20.2 */ public static CompletableConverter> flatMapFlowable( - Callable> onCompleteHandler, + Supplier> onCompleteHandler, Function> onErrorHandler) { ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/ExpandStrategy.java b/src/main/java/hu/akarnokd/rxjava3/operators/ExpandStrategy.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/operators/ExpandStrategy.java rename to src/main/java/hu/akarnokd/rxjava3/operators/ExpandStrategy.java index da8d7595..0cb32655 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/ExpandStrategy.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ExpandStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; /** * Represents the strategies for recursive expansion with the {@code expand()} operator. diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableAsyncEmitter.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableAsyncEmitter.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableAsyncEmitter.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableAsyncEmitter.java index 9b18ec9d..65b76867 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableAsyncEmitter.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableAsyncEmitter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import io.reactivex.Emitter; import io.reactivex.annotations.Experimental; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableBufferPredicate.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicate.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableBufferPredicate.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicate.java index 7cb68fea..3824aefd 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableBufferPredicate.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicate.java @@ -14,16 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.Collection; -import java.util.concurrent.Callable; import org.reactivestreams.*; import io.reactivex.*; import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; +import io.reactivex.functions.*; import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.internal.fuseable.ConditionalSubscriber; import io.reactivex.internal.subscriptions.*; @@ -55,10 +54,10 @@ enum Mode { final Mode mode; - final Callable bufferSupplier; + final Supplier bufferSupplier; FlowableBufferPredicate(Publisher source, Predicate predicate, Mode mode, - Callable bufferSupplier) { + Supplier bufferSupplier) { this.source = source; this.predicate = predicate; this.mode = mode; @@ -70,7 +69,7 @@ protected void subscribeActual(Subscriber s) { C buffer; try { - buffer = ObjectHelper.requireNonNull(bufferSupplier.call(), "The bufferSupplier returned a null buffer"); + buffer = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); @@ -94,7 +93,7 @@ static final class BufferPredicateSubscriber> final Mode mode; - final Callable bufferSupplier; + final Supplier bufferSupplier; C buffer; @@ -105,7 +104,7 @@ static final class BufferPredicateSubscriber> BufferPredicateSubscriber(Subscriber downstream, C buffer, Predicate predicate, Mode mode, - Callable bufferSupplier) { + Supplier bufferSupplier) { this.downstream = downstream; this.predicate = predicate; this.mode = mode; @@ -152,7 +151,7 @@ public boolean tryOnNext(T t) { downstream.onNext(buf); try { - buffer = bufferSupplier.call(); + buffer = bufferSupplier.get(); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); @@ -175,7 +174,7 @@ public boolean tryOnNext(T t) { } else { downstream.onNext(buf); try { - buf = bufferSupplier.call(); + buf = bufferSupplier.get(); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); @@ -194,7 +193,7 @@ public boolean tryOnNext(T t) { downstream.onNext(buf); try { - buffer = bufferSupplier.call(); + buffer = bufferSupplier.get(); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableCacheLast.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCacheLast.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableCacheLast.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableCacheLast.java index 82d42ff4..8f72f537 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableCacheLast.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCacheLast.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableCoalesce.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCoalesce.java similarity index 93% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableCoalesce.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableCoalesce.java index b2417917..745151a3 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableCoalesce.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCoalesce.java @@ -14,16 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; -import java.util.concurrent.Callable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; import io.reactivex.*; import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiConsumer; +import io.reactivex.functions.*; import io.reactivex.internal.fuseable.SimplePlainQueue; import io.reactivex.internal.queue.SpscLinkedArrayQueue; import io.reactivex.internal.subscriptions.SubscriptionHelper; @@ -41,13 +40,13 @@ final class FlowableCoalesce extends Flowable implements FlowableTransf final Publisher source; - final Callable containerSupplier; + final Supplier containerSupplier; final BiConsumer coalescer; final int bufferSize; - FlowableCoalesce(Publisher source, Callable containerSupplier, BiConsumer coalescer, int bufferSize) { + FlowableCoalesce(Publisher source, Supplier containerSupplier, BiConsumer coalescer, int bufferSize) { this.source = source; this.containerSupplier = containerSupplier; this.coalescer = coalescer; @@ -71,7 +70,7 @@ static final class CoalesceSubscriber extends AtomicInteger final Subscriber downstream; - final Callable containerSupplier; + final Supplier containerSupplier; final BiConsumer coalescer; @@ -93,7 +92,7 @@ static final class CoalesceSubscriber extends AtomicInteger long emitted; - CoalesceSubscriber(Subscriber downstream, Callable containerSupplier, + CoalesceSubscriber(Subscriber downstream, Supplier containerSupplier, BiConsumer coalescer, int bufferSize) { this.downstream = downstream; this.containerSupplier = containerSupplier; @@ -120,7 +119,7 @@ public void onNext(T t) { R c = container; try { if (c == null) { - c = containerSupplier.call(); + c = containerSupplier.get(); container = c; } coalescer.accept(c, t); @@ -212,7 +211,7 @@ void drainLoop() { if (!empty) { try { if (c == null) { - c = containerSupplier.call(); + c = containerSupplier.get(); container = c; } diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableDebounceFirst.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirst.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableDebounceFirst.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirst.java index beeb2bd7..000f5a4a 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableDebounceFirst.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirst.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableErrorJump.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableErrorJump.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableErrorJump.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableErrorJump.java index 0e7c2455..0d2d6811 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableErrorJump.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableErrorJump.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableEvery.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableEvery.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableEvery.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableEvery.java index 1ebe5d53..a36855c3 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableEvery.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableEvery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableExpand.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableExpand.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java index 30370d7f..ff44a2bd 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableExpand.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.ArrayDeque; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableFilterAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsync.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableFilterAsync.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsync.java index 54108636..bf46a093 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableFilterAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsync.java @@ -14,18 +14,17 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; -import java.util.concurrent.Callable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.operators.FlowableMapAsync.AsyncSupport; -import hu.akarnokd.rxjava2.operators.FlowableMapAsync.MapAsyncSubscriber.InnerSubscriber; +import hu.akarnokd.rxjava3.operators.FlowableMapAsync.AsyncSupport; +import hu.akarnokd.rxjava3.operators.FlowableMapAsync.MapAsyncSubscriber.InnerSubscriber; import io.reactivex.*; import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.internal.subscriptions.SubscriptionHelper; import io.reactivex.internal.util.*; @@ -251,11 +250,11 @@ void drain() { } if (p != null) { - if (p instanceof Callable) { + if (p instanceof Supplier) { Boolean u; try { - u = ((Callable)p).call(); + u = ((Supplier)p).get(); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); error.addThrowable(ex); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableFlatMapAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableFlatMapAsync.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java index 34cba435..16bcdd1b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableFlatMapAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.operators.FlowableFlatMapSync.*; +import hu.akarnokd.rxjava3.operators.FlowableFlatMapSync.*; import io.reactivex.*; import io.reactivex.functions.Function; import io.reactivex.internal.fuseable.SimpleQueue; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableFlatMapSync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableFlatMapSync.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java index 2930ed42..c10a1397 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableFlatMapSync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableGenerateAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsync.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableGenerateAsync.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsync.java index 5ab5b630..7ba59436 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableGenerateAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsync.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; -import java.util.concurrent.Callable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -40,13 +39,13 @@ */ final class FlowableGenerateAsync extends Flowable { - final Callable initialState; + final Supplier initialState; final BiFunction, ? extends S> asyncGenerator; final Consumer stateCleanup; - FlowableGenerateAsync(Callable initialState, + FlowableGenerateAsync(Supplier initialState, BiFunction, ? extends S> asyncGenerator, Consumer stateCleanup) { this.initialState = initialState; @@ -59,7 +58,7 @@ protected void subscribeActual(Subscriber s) { S state; try { - state = initialState.call(); + state = initialState.get(); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableIndexOf.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableIndexOf.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableIndexOf.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableIndexOf.java index 27c89541..750ce5b7 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableIndexOf.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableIndexOf.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableIntervalBackpressure.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableIntervalBackpressure.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableIntervalBackpressure.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableIntervalBackpressure.java index fdfa5e56..c07911b8 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableIntervalBackpressure.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableIntervalBackpressure.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableMapAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapAsync.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableMapAsync.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapAsync.java index a7816de1..6143b9e5 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableMapAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapAsync.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; -import java.util.concurrent.Callable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -267,12 +266,12 @@ void drain() { } if (p != null) { - if (p instanceof Callable) { + if (p instanceof Supplier) { R v; try { @SuppressWarnings("unchecked") - U u = ((Callable)p).call(); + U u = ((Supplier)p).get(); if (u != null) { v = ObjectHelper.requireNonNull(combiner.apply(t, u), "The combiner returned a null value"); } else { diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableMapFilter.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapFilter.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableMapFilter.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapFilter.java index 1e5f6bcb..d995b6ae 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableMapFilter.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import org.reactivestreams.*; @@ -180,7 +180,7 @@ public void doComplete() { } @Override - public R poll() throws Exception { + public R poll() throws Throwable { for (;;) { T v = qs.poll(); @@ -355,7 +355,7 @@ public void doComplete() { } @Override - public R poll() throws Exception { + public R poll() throws Throwable { for (;;) { T v = qs.poll(); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableOnBackpressureTimeout.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeout.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableOnBackpressureTimeout.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeout.java index 359da15e..42d11d17 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableOnBackpressureTimeout.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeout.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.ArrayDeque; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableOrderedMerge.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMerge.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableOrderedMerge.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMerge.java index f506ad86..66cad69d 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableOrderedMerge.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMerge.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.Arrays; import java.util.Comparator; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowablePartialCollect.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollect.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowablePartialCollect.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollect.java index 856036f1..2722c495 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowablePartialCollect.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollect.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableRepeatScalar.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatScalar.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableRepeatScalar.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatScalar.java index 7ae6bd8a..e7ecec8a 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableRepeatScalar.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatScalar.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableRepeatCallable.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatSupplier.java similarity index 80% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableRepeatCallable.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatSupplier.java index 9fb9e4aa..6827cbba 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableRepeatCallable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatSupplier.java @@ -14,40 +14,39 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.operators; 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.fuseable.ConditionalSubscriber; import io.reactivex.internal.subscriptions.*; import io.reactivex.internal.util.BackpressureHelper; /** - * Repeatedly calls a Callable indefinitely. + * Repeatedly calls a Supplier indefinitely. * * @param the value type * * @since 0.14.2 */ -final class FlowableRepeatCallable extends Flowable { +final class FlowableRepeatSupplier extends Flowable { - final Callable callable; + final Supplier supplier; - FlowableRepeatCallable(Callable callable) { - this.callable = callable; + FlowableRepeatSupplier(Supplier supplier) { + this.supplier = supplier; } @Override protected void subscribeActual(Subscriber s) { if (s instanceof ConditionalSubscriber) { - s.onSubscribe(new RepeatCallableConditionalSubscription((ConditionalSubscriber)s, callable)); + s.onSubscribe(new RepeatCallableConditionalSubscription((ConditionalSubscriber)s, supplier)); } else { - s.onSubscribe(new RepeatCallableSubscription(s, callable)); + s.onSubscribe(new RepeatCallableSubscription(s, supplier)); } } @@ -57,13 +56,13 @@ static final class RepeatCallableSubscription extends BasicQueueSubscription< final Subscriber downstream; - final Callable callable; + final Supplier supplier; volatile boolean cancelled; - RepeatCallableSubscription(Subscriber downstream, Callable callable) { + RepeatCallableSubscription(Subscriber downstream, Supplier supplier) { this.downstream = downstream; - this.callable = callable; + this.supplier = supplier; } @Override @@ -80,7 +79,7 @@ public void request(long n) { } void fastpath() { - Callable c = callable; + Supplier c = supplier; for (;;) { if (cancelled) { break; @@ -89,7 +88,7 @@ void fastpath() { T v; try { - v = ObjectHelper.requireNonNull(c.call(), "The callable returned a null value"); + v = ObjectHelper.requireNonNull(c.get(), "The supplier returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); @@ -101,7 +100,7 @@ void fastpath() { } void slowpath(long r) { - Callable c = callable; + Supplier c = supplier; long e = 0L; @@ -115,7 +114,7 @@ void slowpath(long r) { T v; try { - v = ObjectHelper.requireNonNull(c.call(), "The callable returned a null value"); + v = ObjectHelper.requireNonNull(c.get(), "The supplier returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); @@ -156,8 +155,8 @@ public int requestFusion(int mode) { } @Override - public T poll() throws Exception { - return ObjectHelper.requireNonNull(callable.call(), "The callable returned a null value"); + public T poll() throws Throwable { + return ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null value"); } @Override @@ -177,13 +176,13 @@ static final class RepeatCallableConditionalSubscription extends BasicQueueSu final ConditionalSubscriber downstream; - final Callable callable; + final Supplier supplier; volatile boolean cancelled; - RepeatCallableConditionalSubscription(ConditionalSubscriber downstream, Callable callable) { + RepeatCallableConditionalSubscription(ConditionalSubscriber downstream, Supplier supplier) { this.downstream = downstream; - this.callable = callable; + this.supplier = supplier; } @Override @@ -200,7 +199,7 @@ public void request(long n) { } void fastpath() { - Callable c = callable; + Supplier c = supplier; for (;;) { if (cancelled) { break; @@ -209,7 +208,7 @@ void fastpath() { T v; try { - v = ObjectHelper.requireNonNull(c.call(), "The callable returned a null value"); + v = ObjectHelper.requireNonNull(c.get(), "The supplier returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); @@ -221,7 +220,7 @@ void fastpath() { } void slowpath(long r) { - Callable c = callable; + Supplier c = supplier; long e = 0L; @@ -235,7 +234,7 @@ void slowpath(long r) { T v; try { - v = ObjectHelper.requireNonNull(c.call(), "The callable returned a null value"); + v = ObjectHelper.requireNonNull(c.get(), "The supplier returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); @@ -276,8 +275,8 @@ public int requestFusion(int mode) { } @Override - public T poll() throws Exception { - return ObjectHelper.requireNonNull(callable.call(), "The callable returned a null value"); + public T poll() throws Throwable { + return ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null value"); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableRequestObserveOn.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOn.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableRequestObserveOn.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOn.java index 9515997e..5c327d04 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableRequestObserveOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOn.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.AtomicLong; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableRequestSample.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSample.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableRequestSample.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSample.java index fa58a2e1..68f4bcd0 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableRequestSample.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSample.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableRequestSampleTime.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTime.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableRequestSampleTime.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTime.java index b80d0d23..fa4cc838 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableRequestSampleTime.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTime.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableSpanout.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSpanout.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableSpanout.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableSpanout.java index 4ec0b56d..a5d3d207 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableSpanout.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSpanout.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableSwitchFlatMap.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMap.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableSwitchFlatMap.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMap.java index 5fa0917c..12cfc15f 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableSwitchFlatMap.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.*; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableSwitchIfEmptyMany.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyMany.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableSwitchIfEmptyMany.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyMany.java index 3cd68f9f..6a58621b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableSwitchIfEmptyMany.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyMany.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.Iterator; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableSwitchIfEmptyManyArray.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArray.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableSwitchIfEmptyManyArray.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArray.java index 237ec5c8..0a88557f 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableSwitchIfEmptyManyArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArray.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableSwitchOnFirst.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirst.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableSwitchOnFirst.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirst.java index fb1d7226..914c64b7 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableSwitchOnFirst.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirst.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableTimeoutLast.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLast.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableTimeoutLast.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLast.java index b3086884..c75688d6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableTimeoutLast.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLast.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableTransformers.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTransformers.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableTransformers.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableTransformers.java index e372e064..124ac5be 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTransformers.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.*; import java.util.concurrent.*; import org.reactivestreams.Publisher; -import hu.akarnokd.rxjava2.util.BiFunctionSecondIdentity; +import hu.akarnokd.rxjava3.util.BiFunctionSecondIdentity; import io.reactivex.*; import io.reactivex.annotations.*; import io.reactivex.functions.*; @@ -141,14 +141,14 @@ public static FlowableTransformer> bufferWhile(Predicate the collection type * @param predicate the predicate receiving the current value and if returns false, * a new collection is created with the specified item - * @param bufferSupplier the callable that returns a fresh collection + * @param bufferSupplier the supplier that returns a fresh collection * @return the new FlowableTransformer instance * * @since 0.8.0 */ @SchedulerSupport(SchedulerSupport.NONE) @BackpressureSupport(BackpressureKind.FULL) - public static > FlowableTransformer bufferWhile(Predicate predicate, Callable bufferSupplier) { + public static > FlowableTransformer bufferWhile(Predicate predicate, Supplier bufferSupplier) { return new FlowableBufferPredicate(null, predicate, FlowableBufferPredicate.Mode.BEFORE, bufferSupplier); } @@ -175,14 +175,14 @@ public static FlowableTransformer> bufferUntil(Predicate the collection type * @param predicate the predicate receiving the current item and if returns true, * the current collection is emitted and a fresh empty collection is created - * @param bufferSupplier the callable that returns a fresh collection + * @param bufferSupplier the supplier that returns a fresh collection * @return the new Flowable instance * * @since 0.8.0 */ @SchedulerSupport(SchedulerSupport.NONE) @BackpressureSupport(BackpressureKind.FULL) - public static > FlowableTransformer bufferUntil(Predicate predicate, Callable bufferSupplier) { + public static > FlowableTransformer bufferUntil(Predicate predicate, Supplier bufferSupplier) { return new FlowableBufferPredicate(null, predicate, FlowableBufferPredicate.Mode.AFTER, bufferSupplier); } @@ -209,14 +209,14 @@ public static FlowableTransformer> bufferSplit(Predicate the collection type * @param predicate the predicate receiving the current item and if returns true, * the current collection is emitted and a fresh empty collection is created - * @param bufferSupplier the callable that returns a fresh collection + * @param bufferSupplier the Supplier that returns a fresh collection * @return the new Flowable instance * * @since 0.14.3 */ @SchedulerSupport(SchedulerSupport.NONE) @BackpressureSupport(BackpressureKind.FULL) - public static > FlowableTransformer bufferSplit(Predicate predicate, Callable bufferSupplier) { + public static > FlowableTransformer bufferSplit(Predicate predicate, Supplier bufferSupplier) { return new FlowableBufferPredicate(null, predicate, FlowableBufferPredicate.Mode.SPLIT, bufferSupplier); } @@ -1083,7 +1083,7 @@ public static FlowableTransformer filterAsync(Function FlowableTransformer coalesce(Callable containerSupplier, BiConsumer coalescer) { + public static FlowableTransformer coalesce(Supplier containerSupplier, BiConsumer coalescer) { return coalesce(containerSupplier, coalescer, Flowable.bufferSize()); } @@ -1098,7 +1098,7 @@ public static FlowableTransformer coalesce(Callable containerSup * @return the new FlowableTransformer instance * @since 0.17.3 */ - public static FlowableTransformer coalesce(Callable containerSupplier, BiConsumer coalescer, int bufferSize) { + public static FlowableTransformer coalesce(Supplier containerSupplier, BiConsumer coalescer, int bufferSize) { ObjectHelper.requireNonNull(containerSupplier, "containerSupplier is null"); ObjectHelper.requireNonNull(coalescer, "coalescer is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); @@ -1379,8 +1379,9 @@ public static FlowableTransformer errorJump(FlowableTransformer * Note that the very first item is not included in the follow-up sequence if the switch happens. - * Use {@link Flowable#startWith(Object)} to add it back if necessary. + * Use {@link Flowable#startWithItem(Object)} to add it back if necessary. * + * @param the element type of the selected flow * @param predicate a predicate that receives the very first item and should return true * to indicate to switch streams. If the predicate returns false, the main sequence is streamed * till its end. diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableValve.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableValve.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java index c126f013..33463b78 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableValve.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableWindowPredicate.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicate.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableWindowPredicate.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicate.java index ebf66939..574ab017 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableWindowPredicate.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableZipLatest.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableZipLatest.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/FlowableZipLatest.java rename to src/main/java/hu/akarnokd/rxjava3/operators/FlowableZipLatest.java index 0c636be4..8a14ebe4 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/FlowableZipLatest.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableZipLatest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.Arrays; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/Flowables.java b/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/operators/Flowables.java rename to src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java index dafd9a74..08caad89 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/Flowables.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.Comparator; import java.util.concurrent.*; @@ -268,18 +268,18 @@ public static Flowable repeat(T item) { } /** - * Repeatedly calls the given Callable to produce items indefinitely. + * Repeatedly calls the given Supplier to produce items indefinitely. * @param the value type - * @param callable the Callable to call + * @param supplier the Supplier to call * @return the new Flowable instance * * @since 0.14.2 */ @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) - public static Flowable repeatCallable(Callable callable) { - ObjectHelper.requireNonNull(callable, "callable is null"); - return RxJavaPlugins.onAssembly(new FlowableRepeatCallable(callable)); + public static Flowable repeatSupplier(Supplier supplier) { + ObjectHelper.requireNonNull(supplier, "supplier is null"); + return RxJavaPlugins.onAssembly(new FlowableRepeatSupplier(supplier)); } /** @@ -913,7 +913,7 @@ public static Flowable zipLatest(Publisher source1, P * * @param the generated item type * @param the state associated with an individual subscription. - * @param initialState the {@link Callable} that returns a state object for each individual + * @param initialState the {@link Supplier} that returns a state object for each individual * {@link org.reactivestreams.Subscriber Subscriber} to the returned {@code Flowable}. * @param asyncGenerator the {@link BiFunction} called with the current state value and the * {@link FlowableAsyncEmitter} object and should return a new state value @@ -926,14 +926,14 @@ public static Flowable zipLatest(Publisher source1, P * the flow is cancelled or terminates via {@link FlowableAsyncEmitter#onError(Throwable)} * or {@link FlowableAsyncEmitter#onComplete()}. * @return the new Flowable instance - * @see Flowable#generate(Callable, BiFunction, Consumer) + * @see Flowable#generate(Supplier, BiFunction, Consumer) * @see FlowableAsyncEmitter * @since 0.18.9 */ @CheckReturnValue @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) - public static Flowable generateAsync(Callable initialState, BiFunction, S> asyncGenerator, Consumer stateCleanup) { + public static Flowable generateAsync(Supplier initialState, BiFunction, S> asyncGenerator, Consumer stateCleanup) { ObjectHelper.requireNonNull(initialState, "initialState is null"); ObjectHelper.requireNonNull(asyncGenerator, "asyncGenerator is null"); ObjectHelper.requireNonNull(stateCleanup, "stateCleanup is null"); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalCompletable.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletable.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalCompletable.java rename to src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletable.java index e1c955a9..60c2e50b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletable.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; -import java.util.concurrent.Callable; 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.functions.*; import io.reactivex.internal.disposables.DisposableHelper; import io.reactivex.internal.functions.ObjectHelper; @@ -39,12 +38,12 @@ final class MaybeFlatMapSignalCompletable extends Completable final Function onErrorHandler; - final Callable onCompleteHandler; + final Supplier onCompleteHandler; MaybeFlatMapSignalCompletable(Maybe source, Function onSuccessHandler, Function onErrorHandler, - Callable onCompleteHandler) { + Supplier onCompleteHandler) { this.source = source; this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; @@ -70,13 +69,13 @@ static final class FlatMapSignalConsumer final Function onErrorHandler; - final Callable onCompleteHandler; + final Supplier onCompleteHandler; FlatMapSignalConsumer( CompletableObserver downstream, Function onSuccessHandler, Function onErrorHandler, - Callable onCompleteHandler) { + Supplier onCompleteHandler) { this.consumer = new SignalConsumer(downstream); this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; @@ -121,7 +120,7 @@ public void onComplete() { CompletableSource next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.call(), "The onCompleteHandler returned a null CompletableSource"); + next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalFlowable.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowable.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalFlowable.java rename to src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowable.java index 96121d61..4cc3d1b4 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowable.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; -import java.util.concurrent.Callable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -24,7 +23,7 @@ import io.reactivex.*; import io.reactivex.disposables.Disposable; import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.internal.disposables.DisposableHelper; import io.reactivex.internal.functions.ObjectHelper; import io.reactivex.internal.subscriptions.SubscriptionHelper; @@ -42,12 +41,12 @@ final class MaybeFlatMapSignalFlowable extends Flowable final Function> onErrorHandler; - final Callable> onCompleteHandler; + final Supplier> onCompleteHandler; MaybeFlatMapSignalFlowable(Maybe source, Function> onSuccessHandler, Function> onErrorHandler, - Callable> onCompleteHandler) { + Supplier> onCompleteHandler) { this.source = source; this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; @@ -73,7 +72,7 @@ static final class FlatMapSignalConsumer final Function> onErrorHandler; - final Callable> onCompleteHandler; + final Supplier> onCompleteHandler; Disposable upstream; @@ -81,7 +80,7 @@ static final class FlatMapSignalConsumer Subscriber downstream, Function> onSuccessHandler, Function> onErrorHandler, - Callable> onCompleteHandler) { + Supplier> onCompleteHandler) { this.consumer = new SignalConsumer(downstream); this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; @@ -127,7 +126,7 @@ public void onComplete() { Publisher next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.call(), "The onCompleteHandler returned a null Publisher"); + next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalMaybe.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybe.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalMaybe.java rename to src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybe.java index 8c057138..8c52dea2 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybe.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; -import java.util.concurrent.Callable; 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.functions.*; import io.reactivex.internal.disposables.DisposableHelper; import io.reactivex.internal.functions.ObjectHelper; @@ -39,12 +38,12 @@ final class MaybeFlatMapSignalMaybe extends Maybe final Function> onErrorHandler; - final Callable> onCompleteHandler; + final Supplier> onCompleteHandler; MaybeFlatMapSignalMaybe(Maybe source, Function> onSuccessHandler, Function> onErrorHandler, - Callable> onCompleteHandler) { + Supplier> onCompleteHandler) { this.source = source; this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; @@ -70,13 +69,13 @@ static final class FlatMapSignalConsumer final Function> onErrorHandler; - final Callable> onCompleteHandler; + final Supplier> onCompleteHandler; FlatMapSignalConsumer( MaybeObserver downstream, Function> onSuccessHandler, Function> onErrorHandler, - Callable> onCompleteHandler) { + Supplier> onCompleteHandler) { this.consumer = new SignalConsumer(downstream); this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; @@ -121,7 +120,7 @@ public void onComplete() { MaybeSource next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.call(), "The onCompleteHandler returned a null MaybeSource"); + next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalObservable.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservable.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalObservable.java rename to src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservable.java index 2b6a14cf..885e1564 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservable.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; -import java.util.concurrent.Callable; 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.functions.*; import io.reactivex.internal.disposables.DisposableHelper; import io.reactivex.internal.functions.ObjectHelper; @@ -39,12 +38,12 @@ final class MaybeFlatMapSignalObservable extends Observable final Function> onErrorHandler; - final Callable> onCompleteHandler; + final Supplier> onCompleteHandler; MaybeFlatMapSignalObservable(Maybe source, Function> onSuccessHandler, Function> onErrorHandler, - Callable> onCompleteHandler) { + Supplier> onCompleteHandler) { this.source = source; this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; @@ -70,13 +69,13 @@ static final class FlatMapSignalConsumer final Function> onErrorHandler; - final Callable> onCompleteHandler; + final Supplier> onCompleteHandler; FlatMapSignalConsumer( Observer downstream, Function> onSuccessHandler, Function> onErrorHandler, - Callable> onCompleteHandler) { + Supplier> onCompleteHandler) { this.consumer = new SignalConsumer(downstream); this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; @@ -121,7 +120,7 @@ public void onComplete() { ObservableSource next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.call(), "The onCompleteHandler returned a null ObservableSource"); + next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalSingle.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingle.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalSingle.java rename to src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingle.java index 8fab67c1..c32af7d1 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingle.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; -import java.util.concurrent.Callable; 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.functions.*; import io.reactivex.internal.disposables.DisposableHelper; import io.reactivex.internal.functions.ObjectHelper; @@ -39,12 +38,12 @@ final class MaybeFlatMapSignalSingle extends Single final Function> onErrorHandler; - final Callable> onCompleteHandler; + final Supplier> onCompleteHandler; MaybeFlatMapSignalSingle(Maybe source, Function> onSuccessHandler, Function> onErrorHandler, - Callable> onCompleteHandler) { + Supplier> onCompleteHandler) { this.source = source; this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; @@ -70,13 +69,13 @@ static final class FlatMapSignalConsumer final Function> onErrorHandler; - final Callable> onCompleteHandler; + final Supplier> onCompleteHandler; FlatMapSignalConsumer( SingleObserver downstream, Function> onSuccessHandler, Function> onErrorHandler, - Callable> onCompleteHandler) { + Supplier> onCompleteHandler) { this.consumer = new SignalConsumer(downstream); this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; @@ -121,7 +120,7 @@ public void onComplete() { SingleSource next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.call(), "The onCompleteHandler returned a null SingleSource"); + next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/MaybeTransformers.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeTransformers.java similarity index 92% rename from src/main/java/hu/akarnokd/rxjava2/operators/MaybeTransformers.java rename to src/main/java/hu/akarnokd/rxjava3/operators/MaybeTransformers.java index 43117a2d..a91f9646 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/MaybeTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeTransformers.java @@ -14,12 +14,10 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.operators; import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.internal.functions.ObjectHelper; /** @@ -54,7 +52,7 @@ private MaybeTransformers() { public static MaybeTransformer flatMap( Function> onSuccessHandler, Function> onErrorHandler, - Callable> onCompleteHandler) { + Supplier> onCompleteHandler) { ObjectHelper.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/Maybes.java b/src/main/java/hu/akarnokd/rxjava3/operators/Maybes.java similarity index 93% rename from src/main/java/hu/akarnokd/rxjava2/operators/Maybes.java rename to src/main/java/hu/akarnokd/rxjava3/operators/Maybes.java index 0a5003d5..0922573d 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/Maybes.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/Maybes.java @@ -14,19 +14,17 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; - -import java.util.concurrent.Callable; +package hu.akarnokd.rxjava3.operators; import org.reactivestreams.Publisher; import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.internal.functions.ObjectHelper; /** * Additional operators in the form of {@link MaybeConverter}s, - * use {@link Maybe#as(MaybeConverter)} + * use {@link Maybe#to(MaybeConverter)} * to apply the operators to an existing sequence. * * @see MaybeTransformers @@ -55,7 +53,7 @@ private Maybes() { public static MaybeConverter flatMapCompletable( Function onSuccessHandler, Function onErrorHandler, - Callable onCompleteHandler) { + Supplier onCompleteHandler) { ObjectHelper.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); @@ -79,7 +77,7 @@ public static MaybeConverter flatMapCompletable( public static MaybeConverter> flatMapSingle( Function> onSuccessHandler, Function> onErrorHandler, - Callable> onCompleteHandler) { + Supplier> onCompleteHandler) { ObjectHelper.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); @@ -103,7 +101,7 @@ public static MaybeConverter> flatMapSingle( public static MaybeConverter> flatMapObservable( Function> onSuccessHandler, Function> onErrorHandler, - Callable> onCompleteHandler) { + Supplier> onCompleteHandler) { ObjectHelper.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); @@ -127,7 +125,7 @@ public static MaybeConverter> flatMapObservable( public static MaybeConverter> flatMapFlowable( Function> onSuccessHandler, Function> onErrorHandler, - Callable> onCompleteHandler) { + Supplier> onCompleteHandler) { ObjectHelper.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableErrorJump.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableErrorJump.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/ObservableErrorJump.java rename to src/main/java/hu/akarnokd/rxjava3/operators/ObservableErrorJump.java index 68a97863..56165963 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableErrorJump.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableErrorJump.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableFilterAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/ObservableFilterAsync.java rename to src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java index 5a8dfa3e..f6a60c27 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableFilterAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableFlatMapDrop.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDrop.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/ObservableFlatMapDrop.java rename to src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDrop.java index e61186e4..2b26ef81 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableFlatMapDrop.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDrop.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableFlatMapLatest.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatest.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/ObservableFlatMapLatest.java rename to src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatest.java index 6978e012..4a5dfcc9 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableFlatMapLatest.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableIndexOf.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableIndexOf.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/operators/ObservableIndexOf.java rename to src/main/java/hu/akarnokd/rxjava3/operators/ObservableIndexOf.java index f9e05c0f..11eb9c99 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableIndexOf.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableIndexOf.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import io.reactivex.*; import io.reactivex.exceptions.Exceptions; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableMapAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/ObservableMapAsync.java rename to src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java index 3d17531a..e702fd8a 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableMapAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableObserveOnDrop.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDrop.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/ObservableObserveOnDrop.java rename to src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDrop.java index 8c13f2df..d98d38ed 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableObserveOnDrop.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDrop.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableObserveOnLatest.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatest.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/ObservableObserveOnLatest.java rename to src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatest.java index c5ddcda7..45c4624d 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableObserveOnLatest.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableTransformers.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableTransformers.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/ObservableTransformers.java rename to src/main/java/hu/akarnokd/rxjava3/operators/ObservableTransformers.java index eac631cc..c298b05f 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableTransformers.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; -import hu.akarnokd.rxjava2.util.BiFunctionSecondIdentity; +import hu.akarnokd.rxjava3.util.BiFunctionSecondIdentity; import io.reactivex.*; import io.reactivex.annotations.*; import io.reactivex.functions.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableValve.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/ObservableValve.java rename to src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java index 1484cd9d..02e7d6e2 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/ObservableValve.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/Observables.java b/src/main/java/hu/akarnokd/rxjava3/operators/Observables.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/operators/Observables.java rename to src/main/java/hu/akarnokd/rxjava3/operators/Observables.java index a53b96c9..408a62d2 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/Observables.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/Observables.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; /** * Utility class to create Observable sources. diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/PartialCollectEmitter.java b/src/main/java/hu/akarnokd/rxjava3/operators/PartialCollectEmitter.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/operators/PartialCollectEmitter.java rename to src/main/java/hu/akarnokd/rxjava3/operators/PartialCollectEmitter.java index 2452496f..73594ad0 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/PartialCollectEmitter.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/PartialCollectEmitter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; /** * Provides callbacks and methods to support the partial collect operator: diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalCompletable.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletable.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalCompletable.java rename to src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletable.java index 233b42fc..a8545eec 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalFlowable.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowable.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalFlowable.java rename to src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowable.java index 42eecd0e..20655d18 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalMaybe.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybe.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalMaybe.java rename to src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybe.java index c9ebbba2..9f66c57d 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybe.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalObservable.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservable.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalObservable.java rename to src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservable.java index 80a4a624..01362410 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalSingle.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingle.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalSingle.java rename to src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingle.java index 1f362894..f869e061 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingle.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/SingleTransformers.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleTransformers.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/operators/SingleTransformers.java rename to src/main/java/hu/akarnokd/rxjava3/operators/SingleTransformers.java index 3b13ddac..a8f11087 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/SingleTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleTransformers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import io.reactivex.*; import io.reactivex.functions.Function; diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/Singles.java b/src/main/java/hu/akarnokd/rxjava3/operators/Singles.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/operators/Singles.java rename to src/main/java/hu/akarnokd/rxjava3/operators/Singles.java index dffaeed1..0e2f98ae 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/Singles.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/Singles.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import org.reactivestreams.Publisher; @@ -24,7 +24,7 @@ /** * Additional operators in the form of {@link SingleConverter}s, - * use {@link Single#as(SingleConverter)} + * use {@link Single#to(SingleConverter)} * to apply the operators to an existing sequence. * * @see SingleTransformers diff --git a/src/main/java/hu/akarnokd/rxjava2/operators/package-info.java b/src/main/java/hu/akarnokd/rxjava3/operators/package-info.java similarity index 57% rename from src/main/java/hu/akarnokd/rxjava2/operators/package-info.java rename to src/main/java/hu/akarnokd/rxjava3/operators/package-info.java index 9a428e3d..e1f63cb7 100644 --- a/src/main/java/hu/akarnokd/rxjava2/operators/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/package-info.java @@ -18,16 +18,16 @@ * Utility methods for uncommon, custom, special and exotic operators for RxJava flows * in the form of transformers and converters: *

    - *
  • {@link hu.akarnokd.rxjava2.operators.FlowableTransformers FlowableTransformers}, - * {@link hu.akarnokd.rxjava2.operators.Flowables Flowables},
    • - *
  • {@link hu.akarnokd.rxjava2.operators.ObservableTransformers ObservableTransformers}, - * {@link hu.akarnokd.rxjava2.operators.Observables Observables},
    • - *
  • {@link hu.akarnokd.rxjava2.operators.MaybeTransformers MaybeTransformers}, - * {@link hu.akarnokd.rxjava2.operators.Maybes Maybes},
    • - *
  • {@link hu.akarnokd.rxjava2.operators.SingleTransformers SingleTransformers}, - * {@link hu.akarnokd.rxjava2.operators.Singles Singles},
    • - *
  • {@link hu.akarnokd.rxjava2.operators.CompletableTransformers CompletableTransformers} and - * {@link hu.akarnokd.rxjava2.operators.Completables Completables}.
    • + *
  • {@link hu.akarnokd.rxjava3.operators.FlowableTransformers FlowableTransformers}, + * {@link hu.akarnokd.rxjava3.operators.Flowables Flowables},
    • + *
  • {@link hu.akarnokd.rxjava3.operators.ObservableTransformers ObservableTransformers}, + * {@link hu.akarnokd.rxjava3.operators.Observables Observables},
    • + *
  • {@link hu.akarnokd.rxjava3.operators.MaybeTransformers MaybeTransformers}, + * {@link hu.akarnokd.rxjava3.operators.Maybes Maybes},
    • + *
  • {@link hu.akarnokd.rxjava3.operators.SingleTransformers SingleTransformers}, + * {@link hu.akarnokd.rxjava3.operators.Singles Singles},
    • + *
  • {@link hu.akarnokd.rxjava3.operators.CompletableTransformers CompletableTransformers} and + * {@link hu.akarnokd.rxjava3.operators.Completables Completables}.
    • *
*/ -package hu.akarnokd.rxjava2.operators; \ No newline at end of file +package hu.akarnokd.rxjava3.operators; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava2/parallel/ParallelOrderedMerge.java b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMerge.java similarity index 94% rename from src/main/java/hu/akarnokd/rxjava2/parallel/ParallelOrderedMerge.java rename to src/main/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMerge.java index eaf80b12..2a24bc76 100644 --- a/src/main/java/hu/akarnokd/rxjava2/parallel/ParallelOrderedMerge.java +++ b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMerge.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.parallel; +package hu.akarnokd.rxjava3.parallel; import java.util.Comparator; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.operators.BasicMergeSubscription; +import hu.akarnokd.rxjava3.operators.BasicMergeSubscription; import io.reactivex.Flowable; import io.reactivex.parallel.ParallelFlowable; diff --git a/src/main/java/hu/akarnokd/rxjava2/parallel/ParallelSumDouble.java b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumDouble.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/parallel/ParallelSumDouble.java rename to src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumDouble.java index 8acabccf..400c852b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/parallel/ParallelSumDouble.java +++ b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumDouble.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.parallel; +package hu.akarnokd.rxjava3.parallel; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/parallel/ParallelSumInteger.java b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumInteger.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/parallel/ParallelSumInteger.java rename to src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumInteger.java index a802e031..95901be9 100644 --- a/src/main/java/hu/akarnokd/rxjava2/parallel/ParallelSumInteger.java +++ b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumInteger.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.parallel; +package hu.akarnokd.rxjava3.parallel; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/parallel/ParallelSumLong.java b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumLong.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/parallel/ParallelSumLong.java rename to src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumLong.java index e548d8e5..727a167b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/parallel/ParallelSumLong.java +++ b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumLong.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.parallel; +package hu.akarnokd.rxjava3.parallel; import org.reactivestreams.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/parallel/ParallelTransformers.java b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/parallel/ParallelTransformers.java rename to src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java index 7eed9b0c..f2984618 100644 --- a/src/main/java/hu/akarnokd/rxjava2/parallel/ParallelTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.parallel; +package hu.akarnokd.rxjava3.parallel; import java.util.Comparator; diff --git a/src/main/java/hu/akarnokd/rxjava2/parallel/package-info.java b/src/main/java/hu/akarnokd/rxjava3/parallel/package-info.java similarity index 88% rename from src/main/java/hu/akarnokd/rxjava2/parallel/package-info.java rename to src/main/java/hu/akarnokd/rxjava3/parallel/package-info.java index 3bcb97c3..0fd9c61f 100644 --- a/src/main/java/hu/akarnokd/rxjava2/parallel/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/parallel/package-info.java @@ -16,6 +16,6 @@ /** * Utility methods for parallel aggregation and reduction for {@link io.reactivex.parallel.ParallelFlowable ParallelFlowable}s via - * {@link hu.akarnokd.rxjava2.parallel.ParallelTransformers ParallelTransformers}. + * {@link hu.akarnokd.rxjava3.parallel.ParallelTransformers ParallelTransformers}. */ -package hu.akarnokd.rxjava2.parallel; \ No newline at end of file +package hu.akarnokd.rxjava3.parallel; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava2/processors/DispatchWorkProcessor.java b/src/main/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessor.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/processors/DispatchWorkProcessor.java rename to src/main/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessor.java index a9e1aa0d..eb56c537 100644 --- a/src/main/java/hu/akarnokd/rxjava2/processors/DispatchWorkProcessor.java +++ b/src/main/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessor.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.processors; +package hu.akarnokd.rxjava3.processors; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.util.SpmcLinkedArrayQueue; +import hu.akarnokd.rxjava3.util.SpmcLinkedArrayQueue; import io.reactivex.*; import io.reactivex.Scheduler.Worker; import io.reactivex.disposables.Disposable; diff --git a/src/main/java/hu/akarnokd/rxjava2/processors/FlowableProcessorWrap.java b/src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessorWrap.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/processors/FlowableProcessorWrap.java rename to src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessorWrap.java index 0db08f52..f8145bbe 100644 --- a/src/main/java/hu/akarnokd/rxjava2/processors/FlowableProcessorWrap.java +++ b/src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessorWrap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.processors; +package hu.akarnokd.rxjava3.processors; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/processors/FlowableProcessors.java b/src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessors.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/processors/FlowableProcessors.java rename to src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessors.java index 6396ae52..107b858e 100644 --- a/src/main/java/hu/akarnokd/rxjava2/processors/FlowableProcessors.java +++ b/src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessors.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.processors; +package hu.akarnokd.rxjava3.processors; import org.reactivestreams.Processor; diff --git a/src/main/java/hu/akarnokd/rxjava2/processors/RefCountProcessor.java b/src/main/java/hu/akarnokd/rxjava3/processors/RefCountProcessor.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/processors/RefCountProcessor.java rename to src/main/java/hu/akarnokd/rxjava3/processors/RefCountProcessor.java index 424122a4..2d58ecf8 100644 --- a/src/main/java/hu/akarnokd/rxjava2/processors/RefCountProcessor.java +++ b/src/main/java/hu/akarnokd/rxjava3/processors/RefCountProcessor.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package hu.akarnokd.rxjava2.processors; +package hu.akarnokd.rxjava3.processors; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/processors/package-info.java b/src/main/java/hu/akarnokd/rxjava3/processors/package-info.java similarity index 82% rename from src/main/java/hu/akarnokd/rxjava2/processors/package-info.java rename to src/main/java/hu/akarnokd/rxjava3/processors/package-info.java index abe8766b..7e06e2df 100644 --- a/src/main/java/hu/akarnokd/rxjava2/processors/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/processors/package-info.java @@ -16,8 +16,8 @@ /** * Special processors such as - * {@link hu.akarnokd.rxjava2.processors.DispatchWorkProcessor DispatchWorkProcessor} + * {@link hu.akarnokd.rxjava3.processors.DispatchWorkProcessor DispatchWorkProcessor} * and generic utilities for {@link io.reactivex.processors.FlowableProcessor FlowableProcessor}s - * via {@link hu.akarnokd.rxjava2.processors.FlowableProcessors} methods. + * via {@link hu.akarnokd.rxjava3.processors.FlowableProcessors} methods. */ -package hu.akarnokd.rxjava2.processors; \ No newline at end of file +package hu.akarnokd.rxjava3.processors; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava2/schedulers/BlockingScheduler.java b/src/main/java/hu/akarnokd/rxjava3/schedulers/BlockingScheduler.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/schedulers/BlockingScheduler.java rename to src/main/java/hu/akarnokd/rxjava3/schedulers/BlockingScheduler.java index 91c84258..ce939ca6 100644 --- a/src/main/java/hu/akarnokd/rxjava2/schedulers/BlockingScheduler.java +++ b/src/main/java/hu/akarnokd/rxjava3/schedulers/BlockingScheduler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.schedulers; +package hu.akarnokd.rxjava3.schedulers; import java.util.concurrent.*; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/schedulers/ParallelScheduler.java b/src/main/java/hu/akarnokd/rxjava3/schedulers/ParallelScheduler.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/schedulers/ParallelScheduler.java rename to src/main/java/hu/akarnokd/rxjava3/schedulers/ParallelScheduler.java index 9b345bbe..a3a316d3 100644 --- a/src/main/java/hu/akarnokd/rxjava2/schedulers/ParallelScheduler.java +++ b/src/main/java/hu/akarnokd/rxjava3/schedulers/ParallelScheduler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.schedulers; +package hu.akarnokd.rxjava3.schedulers; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/schedulers/SharedScheduler.java b/src/main/java/hu/akarnokd/rxjava3/schedulers/SharedScheduler.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/schedulers/SharedScheduler.java rename to src/main/java/hu/akarnokd/rxjava3/schedulers/SharedScheduler.java index 3639e9e2..af0c7609 100644 --- a/src/main/java/hu/akarnokd/rxjava2/schedulers/SharedScheduler.java +++ b/src/main/java/hu/akarnokd/rxjava3/schedulers/SharedScheduler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.schedulers; +package hu.akarnokd.rxjava3.schedulers; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/schedulers/package-info.java b/src/main/java/hu/akarnokd/rxjava3/schedulers/package-info.java similarity index 75% rename from src/main/java/hu/akarnokd/rxjava2/schedulers/package-info.java rename to src/main/java/hu/akarnokd/rxjava3/schedulers/package-info.java index 25eecc07..3feb603b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/schedulers/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/schedulers/package-info.java @@ -16,8 +16,8 @@ /** * Special scheduler implementations, such as - * {@link hu.akarnokd.rxjava2.schedulers.BlockingScheduler BlockingScheduler}, - * {@link hu.akarnokd.rxjava2.schedulers.ParallelScheduler ParallelScheduler} and - * {@link hu.akarnokd.rxjava2.schedulers.SharedScheduler SharedScheduler}. + * {@link hu.akarnokd.rxjava3.schedulers.BlockingScheduler BlockingScheduler}, + * {@link hu.akarnokd.rxjava3.schedulers.ParallelScheduler ParallelScheduler} and + * {@link hu.akarnokd.rxjava3.schedulers.SharedScheduler SharedScheduler}. */ -package hu.akarnokd.rxjava2.schedulers; \ No newline at end of file +package hu.akarnokd.rxjava3.schedulers; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava2/string/FlowableCharSequence.java b/src/main/java/hu/akarnokd/rxjava3/string/FlowableCharSequence.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/string/FlowableCharSequence.java rename to src/main/java/hu/akarnokd/rxjava3/string/FlowableCharSequence.java index 6433d3f9..df01b056 100644 --- a/src/main/java/hu/akarnokd/rxjava2/string/FlowableCharSequence.java +++ b/src/main/java/hu/akarnokd/rxjava3/string/FlowableCharSequence.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.string; +package hu.akarnokd.rxjava3.string; import org.reactivestreams.Subscriber; diff --git a/src/main/java/hu/akarnokd/rxjava2/string/FlowableSplit.java b/src/main/java/hu/akarnokd/rxjava3/string/FlowableSplit.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/string/FlowableSplit.java rename to src/main/java/hu/akarnokd/rxjava3/string/FlowableSplit.java index 703f4575..c5f1eaa9 100644 --- a/src/main/java/hu/akarnokd/rxjava2/string/FlowableSplit.java +++ b/src/main/java/hu/akarnokd/rxjava3/string/FlowableSplit.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.string; +package hu.akarnokd.rxjava3.string; import java.util.concurrent.atomic.*; import java.util.regex.Pattern; diff --git a/src/main/java/hu/akarnokd/rxjava2/string/ObservableCharSequence.java b/src/main/java/hu/akarnokd/rxjava3/string/ObservableCharSequence.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/string/ObservableCharSequence.java rename to src/main/java/hu/akarnokd/rxjava3/string/ObservableCharSequence.java index 0f57c501..ffeb1206 100644 --- a/src/main/java/hu/akarnokd/rxjava2/string/ObservableCharSequence.java +++ b/src/main/java/hu/akarnokd/rxjava3/string/ObservableCharSequence.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.string; +package hu.akarnokd.rxjava3.string; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/main/java/hu/akarnokd/rxjava2/string/StringFlowable.java b/src/main/java/hu/akarnokd/rxjava3/string/StringFlowable.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/string/StringFlowable.java rename to src/main/java/hu/akarnokd/rxjava3/string/StringFlowable.java index df39a664..82d22074 100644 --- a/src/main/java/hu/akarnokd/rxjava2/string/StringFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/string/StringFlowable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.string; +package hu.akarnokd.rxjava3.string; import java.util.regex.Pattern; diff --git a/src/main/java/hu/akarnokd/rxjava2/string/StringObservable.java b/src/main/java/hu/akarnokd/rxjava3/string/StringObservable.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/string/StringObservable.java rename to src/main/java/hu/akarnokd/rxjava3/string/StringObservable.java index cc80f3c5..aa353e84 100644 --- a/src/main/java/hu/akarnokd/rxjava2/string/StringObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/string/StringObservable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.string; +package hu.akarnokd.rxjava3.string; import io.reactivex.*; import io.reactivex.plugins.RxJavaPlugins; diff --git a/src/main/java/hu/akarnokd/rxjava2/string/package-info.java b/src/main/java/hu/akarnokd/rxjava3/string/package-info.java similarity index 83% rename from src/main/java/hu/akarnokd/rxjava2/string/package-info.java rename to src/main/java/hu/akarnokd/rxjava3/string/package-info.java index 5086d0fe..0fec0e0f 100644 --- a/src/main/java/hu/akarnokd/rxjava2/string/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/string/package-info.java @@ -16,10 +16,10 @@ /** * Utility methods working with strings and character sequences via - * {@link hu.akarnokd.rxjava2.string.StringFlowable} and - * {@link hu.akarnokd.rxjava2.string.StringObservable StringObservable}; + * {@link hu.akarnokd.rxjava3.string.StringFlowable} and + * {@link hu.akarnokd.rxjava3.string.StringObservable StringObservable}; * a partial port of the * RxJavaString * library. */ -package hu.akarnokd.rxjava2.string; \ No newline at end of file +package hu.akarnokd.rxjava3.string; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava2/subjects/DispatchWorkSubject.java b/src/main/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubject.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/subjects/DispatchWorkSubject.java rename to src/main/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubject.java index 157e1bc6..9b611b4a 100644 --- a/src/main/java/hu/akarnokd/rxjava2/subjects/DispatchWorkSubject.java +++ b/src/main/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubject.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.subjects; +package hu.akarnokd.rxjava3.subjects; import java.util.concurrent.atomic.*; -import hu.akarnokd.rxjava2.util.SpmcLinkedArrayQueue; +import hu.akarnokd.rxjava3.util.SpmcLinkedArrayQueue; import io.reactivex.*; import io.reactivex.Scheduler.Worker; import io.reactivex.disposables.Disposable; diff --git a/src/main/java/hu/akarnokd/rxjava2/subjects/RefCountSubject.java b/src/main/java/hu/akarnokd/rxjava3/subjects/RefCountSubject.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/subjects/RefCountSubject.java rename to src/main/java/hu/akarnokd/rxjava3/subjects/RefCountSubject.java index 5a3889b7..f3c2b7c8 100644 --- a/src/main/java/hu/akarnokd/rxjava2/subjects/RefCountSubject.java +++ b/src/main/java/hu/akarnokd/rxjava3/subjects/RefCountSubject.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package hu.akarnokd.rxjava2.subjects; +package hu.akarnokd.rxjava3.subjects; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/subjects/Subjects.java b/src/main/java/hu/akarnokd/rxjava3/subjects/Subjects.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/subjects/Subjects.java rename to src/main/java/hu/akarnokd/rxjava3/subjects/Subjects.java index ff5f9e18..c2da06b2 100644 --- a/src/main/java/hu/akarnokd/rxjava2/subjects/Subjects.java +++ b/src/main/java/hu/akarnokd/rxjava3/subjects/Subjects.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.subjects; +package hu.akarnokd.rxjava3.subjects; import io.reactivex.annotations.*; import io.reactivex.internal.functions.ObjectHelper; diff --git a/src/main/java/hu/akarnokd/rxjava2/subjects/UnicastWorkSubject.java b/src/main/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubject.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/subjects/UnicastWorkSubject.java rename to src/main/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubject.java index 1bf64a2c..c6453372 100644 --- a/src/main/java/hu/akarnokd/rxjava2/subjects/UnicastWorkSubject.java +++ b/src/main/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubject.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.subjects; +package hu.akarnokd.rxjava3.subjects; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/subjects/package-info.java b/src/main/java/hu/akarnokd/rxjava3/subjects/package-info.java similarity index 76% rename from src/main/java/hu/akarnokd/rxjava2/subjects/package-info.java rename to src/main/java/hu/akarnokd/rxjava3/subjects/package-info.java index 865891f1..b6f35a32 100644 --- a/src/main/java/hu/akarnokd/rxjava2/subjects/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/subjects/package-info.java @@ -16,9 +16,9 @@ /** * Special subjects such as - * {@link hu.akarnokd.rxjava2.subjects.UnicastWorkSubject UnicastWorkSubject}, - * {@link hu.akarnokd.rxjava2.subjects.DispatchWorkSubject DispatchWorkSubject} + * {@link hu.akarnokd.rxjava3.subjects.UnicastWorkSubject UnicastWorkSubject}, + * {@link hu.akarnokd.rxjava3.subjects.DispatchWorkSubject DispatchWorkSubject} * and generic utilities for {@link io.reactivex.subjects.Subject Subject}s - * via {@link hu.akarnokd.rxjava2.subjects.Subjects} methods. + * via {@link hu.akarnokd.rxjava3.subjects.Subjects} methods. */ -package hu.akarnokd.rxjava2.subjects; \ No newline at end of file +package hu.akarnokd.rxjava3.subjects; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava2/util/AlwaysFalseBooleanSupplier.java b/src/main/java/hu/akarnokd/rxjava3/util/AlwaysFalseBooleanSupplier.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/util/AlwaysFalseBooleanSupplier.java rename to src/main/java/hu/akarnokd/rxjava3/util/AlwaysFalseBooleanSupplier.java index cae3a219..5d519879 100644 --- a/src/main/java/hu/akarnokd/rxjava2/util/AlwaysFalseBooleanSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/AlwaysFalseBooleanSupplier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.util; +package hu.akarnokd.rxjava3.util; import io.reactivex.functions.BooleanSupplier; diff --git a/src/main/java/hu/akarnokd/rxjava2/util/AlwaysTrueBooleanSupplier.java b/src/main/java/hu/akarnokd/rxjava3/util/AlwaysTrueBooleanSupplier.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/util/AlwaysTrueBooleanSupplier.java rename to src/main/java/hu/akarnokd/rxjava3/util/AlwaysTrueBooleanSupplier.java index 4f62d478..3440a83b 100644 --- a/src/main/java/hu/akarnokd/rxjava2/util/AlwaysTrueBooleanSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/AlwaysTrueBooleanSupplier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.util; +package hu.akarnokd.rxjava3.util; import io.reactivex.functions.BooleanSupplier; diff --git a/src/main/java/hu/akarnokd/rxjava2/util/BiFunctionSecondIdentity.java b/src/main/java/hu/akarnokd/rxjava3/util/BiFunctionSecondIdentity.java similarity index 97% rename from src/main/java/hu/akarnokd/rxjava2/util/BiFunctionSecondIdentity.java rename to src/main/java/hu/akarnokd/rxjava3/util/BiFunctionSecondIdentity.java index 82698cf9..1e5b9f6e 100644 --- a/src/main/java/hu/akarnokd/rxjava2/util/BiFunctionSecondIdentity.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/BiFunctionSecondIdentity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.util; +package hu.akarnokd.rxjava3.util; import io.reactivex.functions.BiFunction; diff --git a/src/main/java/hu/akarnokd/rxjava2/util/CompositeSubscription.java b/src/main/java/hu/akarnokd/rxjava3/util/CompositeSubscription.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/util/CompositeSubscription.java rename to src/main/java/hu/akarnokd/rxjava3/util/CompositeSubscription.java index 85ff03e6..ab547b1f 100644 --- a/src/main/java/hu/akarnokd/rxjava2/util/CompositeSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/CompositeSubscription.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.util; +package hu.akarnokd.rxjava3.util; import org.reactivestreams.Subscription; diff --git a/src/main/java/hu/akarnokd/rxjava2/util/SelfComparator.java b/src/main/java/hu/akarnokd/rxjava3/util/SelfComparator.java similarity index 96% rename from src/main/java/hu/akarnokd/rxjava2/util/SelfComparator.java rename to src/main/java/hu/akarnokd/rxjava3/util/SelfComparator.java index 7892df20..7c5aa356 100644 --- a/src/main/java/hu/akarnokd/rxjava2/util/SelfComparator.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/SelfComparator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.util; +package hu.akarnokd.rxjava3.util; import java.util.Comparator; diff --git a/src/main/java/hu/akarnokd/rxjava2/util/SneakyThrows.java b/src/main/java/hu/akarnokd/rxjava3/util/SneakyThrows.java similarity index 88% rename from src/main/java/hu/akarnokd/rxjava2/util/SneakyThrows.java rename to src/main/java/hu/akarnokd/rxjava3/util/SneakyThrows.java index 1c50ffb7..391e08a3 100644 --- a/src/main/java/hu/akarnokd/rxjava2/util/SneakyThrows.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/SneakyThrows.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.util; +package hu.akarnokd.rxjava3.util; /** * Utility class to throw arbitrary Throwables. @@ -26,7 +26,7 @@ private SneakyThrows() { } @SuppressWarnings("unchecked") - public static E justThrow(Throwable error) throws E { + public static E justThrowX(Throwable error) throws E { throw (E)error; } diff --git a/src/main/java/hu/akarnokd/rxjava2/util/SpmcLinkedArrayQueue.java b/src/main/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueue.java similarity index 99% rename from src/main/java/hu/akarnokd/rxjava2/util/SpmcLinkedArrayQueue.java rename to src/main/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueue.java index beab4aca..7b6c92bc 100644 --- a/src/main/java/hu/akarnokd/rxjava2/util/SpmcLinkedArrayQueue.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.util; +package hu.akarnokd.rxjava3.util; import java.util.concurrent.atomic.*; diff --git a/src/main/java/hu/akarnokd/rxjava2/util/SpscOneQueue.java b/src/main/java/hu/akarnokd/rxjava3/util/SpscOneQueue.java similarity index 98% rename from src/main/java/hu/akarnokd/rxjava2/util/SpscOneQueue.java rename to src/main/java/hu/akarnokd/rxjava3/util/SpscOneQueue.java index acbb2b53..0e89883e 100644 --- a/src/main/java/hu/akarnokd/rxjava2/util/SpscOneQueue.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/SpscOneQueue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.util; +package hu.akarnokd.rxjava3.util; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/hu/akarnokd/rxjava2/util/package-info.java b/src/main/java/hu/akarnokd/rxjava3/util/package-info.java similarity index 95% rename from src/main/java/hu/akarnokd/rxjava2/util/package-info.java rename to src/main/java/hu/akarnokd/rxjava3/util/package-info.java index edde44da..5979e2f8 100644 --- a/src/main/java/hu/akarnokd/rxjava2/util/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/package-info.java @@ -17,4 +17,4 @@ /** * Utility classes and methods supporting the other utilities in this library. */ -package hu.akarnokd.rxjava2.util; \ No newline at end of file +package hu.akarnokd.rxjava3.util; \ No newline at end of file diff --git a/src/test/java/hu/akarnokd/rxjava2/async/AsyncFlowableTest.java b/src/test/java/hu/akarnokd/rxjava3/async/AsyncFlowableTest.java similarity index 89% rename from src/test/java/hu/akarnokd/rxjava2/async/AsyncFlowableTest.java rename to src/test/java/hu/akarnokd/rxjava3/async/AsyncFlowableTest.java index 9a569e7e..92f84d9a 100644 --- a/src/test/java/hu/akarnokd/rxjava2/async/AsyncFlowableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/async/AsyncFlowableTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.async; +package hu.akarnokd.rxjava3.async; import static org.junit.Assert.*; @@ -26,7 +26,7 @@ import org.junit.Test; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.functions.*; +import hu.akarnokd.rxjava3.functions.*; import io.reactivex.Flowable; import io.reactivex.disposables.Disposable; import io.reactivex.functions.*; @@ -41,9 +41,9 @@ public void startDefault() { final AtomicInteger counter = new AtomicInteger(); - Flowable source = AsyncFlowable.start(new Callable() { + Flowable source = AsyncFlowable.start(new Supplier() { @Override - public Integer call() throws Exception { + public Integer get() throws Exception { return counter.incrementAndGet(); } }); @@ -61,9 +61,9 @@ public Integer call() throws Exception { public void startCustomScheduler() { final AtomicInteger counter = new AtomicInteger(); - Flowable source = AsyncFlowable.start(new Callable() { + Flowable source = AsyncFlowable.start(new Supplier() { @Override - public Integer call() throws Exception { + public Integer get() throws Exception { return counter.incrementAndGet(); } }, Schedulers.single()); @@ -78,69 +78,77 @@ public Integer call() throws Exception { } @SuppressWarnings("rawtypes") - static final class MultiFunction extends AtomicReference + static final class MultiFunction implements Action, Consumer, BiConsumer, Consumer3, Consumer4, Consumer5, Consumer6, Consumer7, Consumer8, Consumer9, - Supplier, Function, BiFunction, Function3, Function4, Function5, - Function6, Function7, Function8, Function9 { + SimpleCallable, Function, BiFunction, Function3, Function4, Function5, + Function6, Function7, Function8, Function9, Supplier { - private static final long serialVersionUID = 6872582538056292053L; + final AtomicReference state = new AtomicReference(); + + void setState(String s) { + state.set(s); + } + + String getState() { + return state.get(); + } @Override public void accept(Object t1, Object t2, Object t3, Object t4, Object t5, Object t6, Object t7, Object t8, Object t9) throws Exception { - set("" + t1 + t2 + t3 + t4 + t5 + t6 + t7 + t8 + t9); + setState("" + t1 + t2 + t3 + t4 + t5 + t6 + t7 + t8 + t9); } @Override public void accept(Object t1, Object t2, Object t3, Object t4, Object t5, Object t6, Object t7, Object t8) throws Exception { - set("" + t1 + t2 + t3 + t4 + t5 + t6 + t7 + t8); + setState("" + t1 + t2 + t3 + t4 + t5 + t6 + t7 + t8); } @Override public void accept(Object t1, Object t2, Object t3, Object t4, Object t5, Object t6, Object t7) throws Exception { - set("" + t1 + t2 + t3 + t4 + t5 + t6 + t7); + setState("" + t1 + t2 + t3 + t4 + t5 + t6 + t7); } @Override public void accept(Object t1, Object t2, Object t3, Object t4, Object t5, Object t6) throws Exception { - set("" + t1 + t2 + t3 + t4 + t5 + t6); + setState("" + t1 + t2 + t3 + t4 + t5 + t6); } @Override public void accept(Object t1, Object t2, Object t3, Object t4, Object t5) throws Exception { - set("" + t1 + t2 + t3 + t4 + t5); + setState("" + t1 + t2 + t3 + t4 + t5); } @Override public void accept(Object t1, Object t2, Object t3, Object t4) throws Exception { - set("" + t1 + t2 + t3 + t4); + setState("" + t1 + t2 + t3 + t4); } @Override public void accept(Object t1, Object t2, Object t3) throws Exception { - set("" + t1 + t2 + t3); + setState("" + t1 + t2 + t3); } @Override public void accept(Object t1, Object t2) throws Exception { - set("" + t1 + t2); + setState("" + t1 + t2); } @Override public void accept(Object t) throws Exception { if (t instanceof Object[]) { - set(Arrays.toString((Object[])t)); + setState(Arrays.toString((Object[])t)); } else { - set("" + t); + setState("" + t); } } @Override public void run() throws Exception { - set("-"); + setState("-"); } @Override @@ -198,7 +206,12 @@ public Object apply(Object t) throws Exception { public Object call() { return "-"; } - } + + @Override + public Object get() { + return "-"; + } +} @Test public void toAsyncConsumer0() { @@ -227,7 +240,7 @@ public void toAsyncConsumer1() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "1"); + assertEquals(f.getState(), "1"); } @SuppressWarnings({ "unchecked" }) @@ -241,7 +254,7 @@ public void toAsyncConsumer2() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "12"); + assertEquals(f.getState(), "12"); } @SuppressWarnings({ "unchecked" }) @@ -255,7 +268,7 @@ public void toAsyncConsumer3() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "123"); + assertEquals(f.getState(), "123"); } @SuppressWarnings({ "unchecked" }) @@ -269,7 +282,7 @@ public void toAsyncConsumer4() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "1234"); + assertEquals(f.getState(), "1234"); } @SuppressWarnings({ "unchecked" }) @@ -283,7 +296,7 @@ public void toAsyncConsumer5() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "12345"); + assertEquals(f.getState(), "12345"); } @SuppressWarnings({ "unchecked" }) @@ -297,7 +310,7 @@ public void toAsyncConsumer6() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "123456"); + assertEquals(f.getState(), "123456"); } @SuppressWarnings({ "unchecked" }) @@ -311,7 +324,7 @@ public void toAsyncConsumer7() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "1234567"); + assertEquals(f.getState(), "1234567"); } @SuppressWarnings({ "unchecked" }) @@ -325,7 +338,7 @@ public void toAsyncConsumer8() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "12345678"); + assertEquals(f.getState(), "12345678"); } @SuppressWarnings({ "unchecked" }) @@ -339,7 +352,7 @@ public void toAsyncConsumer9() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "123456789"); + assertEquals(f.getState(), "123456789"); } @SuppressWarnings({ "unchecked" }) @@ -353,15 +366,27 @@ public void toAsyncConsumerN() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]"); + assertEquals(f.getState(), "[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]"); + } + + @SuppressWarnings({ "unchecked" }) + @Test + public void toAsyncCallableFunction0() { + MultiFunction f = new MultiFunction(); + + AsyncFlowable.toAsyncCallable((SimpleCallable)f) + .call() + .test() + .awaitDone(5, TimeUnit.SECONDS) + .assertResult("-"); } @SuppressWarnings({ "unchecked" }) @Test - public void toAsyncFunction0() { + public void toAsyncSupplierFunction0() { MultiFunction f = new MultiFunction(); - AsyncFlowable.toAsync((Supplier)f) + AsyncFlowable.toAsyncSupplier((Supplier)f) .call() .test() .awaitDone(5, TimeUnit.SECONDS) @@ -515,7 +540,7 @@ public void toAsyncConsumer1Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "1"); + assertEquals(f.getState(), "1"); } @SuppressWarnings({ "unchecked" }) @@ -529,7 +554,7 @@ public void toAsyncConsumer2Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "12"); + assertEquals(f.getState(), "12"); } @SuppressWarnings({ "unchecked" }) @@ -543,7 +568,7 @@ public void toAsyncConsumer3Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "123"); + assertEquals(f.getState(), "123"); } @SuppressWarnings({ "unchecked" }) @@ -557,7 +582,7 @@ public void toAsyncConsumer4Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "1234"); + assertEquals(f.getState(), "1234"); } @SuppressWarnings({ "unchecked" }) @@ -571,7 +596,7 @@ public void toAsyncConsumer5Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "12345"); + assertEquals(f.getState(), "12345"); } @SuppressWarnings({ "unchecked" }) @@ -585,7 +610,7 @@ public void toAsyncConsumer6Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "123456"); + assertEquals(f.getState(), "123456"); } @SuppressWarnings({ "unchecked" }) @@ -599,7 +624,7 @@ public void toAsyncConsumer7Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "1234567"); + assertEquals(f.getState(), "1234567"); } @SuppressWarnings({ "unchecked" }) @@ -613,7 +638,7 @@ public void toAsyncConsumer8Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "12345678"); + assertEquals(f.getState(), "12345678"); } @SuppressWarnings({ "unchecked" }) @@ -627,7 +652,7 @@ public void toAsyncConsumer9Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "123456789"); + assertEquals(f.getState(), "123456789"); } @SuppressWarnings({ "unchecked" }) @@ -641,15 +666,27 @@ public void toAsyncConsumerNScheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]"); + assertEquals(f.getState(), "[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]"); + } + + @SuppressWarnings({ "unchecked" }) + @Test + public void toAsyncCallableFunction0Scheduler() { + MultiFunction f = new MultiFunction(); + + AsyncFlowable.toAsyncCallable((SimpleCallable)f, Schedulers.single()) + .call() + .test() + .awaitDone(5, TimeUnit.SECONDS) + .assertResult("-"); } @SuppressWarnings({ "unchecked" }) @Test - public void toAsyncFunction0Scheduler() { + public void toAsyncSupplierFunction0Scheduler() { MultiFunction f = new MultiFunction(); - AsyncFlowable.toAsync((Supplier)f, Schedulers.single()) + AsyncFlowable.toAsyncSupplier((Supplier)f, Schedulers.single()) .call() .test() .awaitDone(5, TimeUnit.SECONDS) @@ -780,9 +817,9 @@ public void toAsyncFunctionNScheduler() { public void startFuture() { final FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, 1); ft.run(); - AsyncFlowable.startFuture(new Callable>() { + AsyncFlowable.startFuture(new Supplier>() { @Override - public Future call() throws Exception { + public Future get() throws Exception { return ft; } }) @@ -795,9 +832,9 @@ public Future call() throws Exception { public void startFutureNull() { final FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, null); ft.run(); - AsyncFlowable.startFuture(new Callable>() { + AsyncFlowable.startFuture(new Supplier>() { @Override - public Future call() throws Exception { + public Future get() throws Exception { return ft; } }) @@ -810,9 +847,9 @@ public Future call() throws Exception { public void startFutureCustomScheduler() { final FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, 1); ft.run(); - AsyncFlowable.startFuture(new Callable>() { + AsyncFlowable.startFuture(new Supplier>() { @Override - public Future call() throws Exception { + public Future get() throws Exception { return ft; } }, Schedulers.single()) @@ -826,9 +863,9 @@ public void deferFuture() { final FutureTask> ft = new FutureTask>(Functions.EMPTY_RUNNABLE, Flowable.just(1)); ft.run(); - AsyncFlowable.deferFuture(new Callable>>() { + AsyncFlowable.deferFuture(new Supplier>>() { @Override - public Future> call() throws Exception { + public Future> get() throws Exception { return ft; } }) @@ -842,9 +879,9 @@ public void deferFutureCustomScheduler() { final FutureTask> ft = new FutureTask>(Functions.EMPTY_RUNNABLE, Flowable.just(1)); ft.run(); - AsyncFlowable.deferFuture(new Callable>>() { + AsyncFlowable.deferFuture(new Supplier>>() { @Override - public Future> call() throws Exception { + public Future> get() throws Exception { return ft; } }, Schedulers.single()) diff --git a/src/test/java/hu/akarnokd/rxjava2/async/AsyncObservableTest.java b/src/test/java/hu/akarnokd/rxjava3/async/AsyncObservableTest.java similarity index 83% rename from src/test/java/hu/akarnokd/rxjava2/async/AsyncObservableTest.java rename to src/test/java/hu/akarnokd/rxjava3/async/AsyncObservableTest.java index cb36900d..3a1b2cdd 100644 --- a/src/test/java/hu/akarnokd/rxjava2/async/AsyncObservableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/async/AsyncObservableTest.java @@ -14,18 +14,19 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.async; +package hu.akarnokd.rxjava3.async; import static org.junit.Assert.*; import java.io.IOException; import java.util.*; import java.util.concurrent.*; -import java.util.concurrent.atomic.*; +import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; -import hu.akarnokd.rxjava2.functions.*; +import hu.akarnokd.rxjava3.async.AsyncFlowableTest.MultiFunction; +import hu.akarnokd.rxjava3.functions.*; import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; @@ -41,9 +42,9 @@ public void startDefault() { final AtomicInteger counter = new AtomicInteger(); - Observable source = AsyncObservable.start(new Callable() { + Observable source = AsyncObservable.start(new Supplier() { @Override - public Integer call() throws Exception { + public Integer get() throws Exception { return counter.incrementAndGet(); } }); @@ -61,9 +62,9 @@ public Integer call() throws Exception { public void startCustomScheduler() { final AtomicInteger counter = new AtomicInteger(); - Observable source = AsyncObservable.start(new Callable() { + Observable source = AsyncObservable.start(new Supplier() { @Override - public Integer call() throws Exception { + public Integer get() throws Exception { return counter.incrementAndGet(); } }, Schedulers.single()); @@ -77,129 +78,6 @@ public Integer call() throws Exception { } } - @SuppressWarnings("rawtypes") - static final class MultiFunction extends AtomicReference - implements Action, Consumer, BiConsumer, Consumer3, Consumer4, Consumer5, - Consumer6, Consumer7, Consumer8, Consumer9, - Supplier, Function, BiFunction, Function3, Function4, Function5, - Function6, Function7, Function8, Function9 { - - private static final long serialVersionUID = 6872582538056292053L; - - @Override - public void accept(Object t1, Object t2, Object t3, Object t4, Object t5, Object t6, Object t7, Object t8, - Object t9) throws Exception { - set("" + t1 + t2 + t3 + t4 + t5 + t6 + t7 + t8 + t9); - } - - @Override - public void accept(Object t1, Object t2, Object t3, Object t4, Object t5, Object t6, Object t7, Object t8) - throws Exception { - set("" + t1 + t2 + t3 + t4 + t5 + t6 + t7 + t8); - } - - @Override - public void accept(Object t1, Object t2, Object t3, Object t4, Object t5, Object t6, Object t7) - throws Exception { - set("" + t1 + t2 + t3 + t4 + t5 + t6 + t7); - } - - @Override - public void accept(Object t1, Object t2, Object t3, Object t4, Object t5, Object t6) throws Exception { - set("" + t1 + t2 + t3 + t4 + t5 + t6); - } - - @Override - public void accept(Object t1, Object t2, Object t3, Object t4, Object t5) throws Exception { - set("" + t1 + t2 + t3 + t4 + t5); - } - - @Override - public void accept(Object t1, Object t2, Object t3, Object t4) throws Exception { - set("" + t1 + t2 + t3 + t4); - } - - @Override - public void accept(Object t1, Object t2, Object t3) throws Exception { - set("" + t1 + t2 + t3); - } - - @Override - public void accept(Object t1, Object t2) throws Exception { - set("" + t1 + t2); - } - - @Override - public void accept(Object t) throws Exception { - if (t instanceof Object[]) { - set(Arrays.toString((Object[])t)); - } else { - set("" + t); - } - } - - @Override - public void run() throws Exception { - set("-"); - } - - @Override - public Object apply(Object t1, Object t2, Object t3, Object t4, Object t5, Object t6, Object t7, Object t8, - Object t9) throws Exception { - return "" + t1 + t2 + t3 + t4 + t5 + t6 + t7 + t8 + t9; - } - - @Override - public Object apply(Object t1, Object t2, Object t3, Object t4, Object t5, Object t6, Object t7, Object t8) - throws Exception { - return "" + t1 + t2 + t3 + t4 + t5 + t6 + t7 + t8; - } - - @Override - public Object apply(Object t1, Object t2, Object t3, Object t4, Object t5, Object t6, Object t7) - throws Exception { - return "" + t1 + t2 + t3 + t4 + t5 + t6 + t7; - } - - @Override - public Object apply(Object t1, Object t2, Object t3, Object t4, Object t5, Object t6) throws Exception { - return "" + t1 + t2 + t3 + t4 + t5 + t6; - } - - @Override - public Object apply(Object t1, Object t2, Object t3, Object t4, Object t5) throws Exception { - return "" + t1 + t2 + t3 + t4 + t5; - } - - @Override - public Object apply(Object t1, Object t2, Object t3, Object t4) throws Exception { - return "" + t1 + t2 + t3 + t4; - } - - @Override - public Object apply(Object t1, Object t2, Object t3) throws Exception { - return "" + t1 + t2 + t3; - } - - @Override - public Object apply(Object t1, Object t2) throws Exception { - return "" + t1 + t2; - } - - @Override - public Object apply(Object t) throws Exception { - if (t instanceof Object[]) { - return Arrays.toString((Object[])t); - } - return "" + t; - } - - @Override - public Object call() { - return "-"; - } - } - @Test public void toAsyncConsumer0() { final AtomicInteger counter = new AtomicInteger(); @@ -227,7 +105,7 @@ public void toAsyncConsumer1() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "1"); + assertEquals(f.getState(), "1"); } @SuppressWarnings({ "unchecked" }) @@ -241,7 +119,7 @@ public void toAsyncConsumer2() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "12"); + assertEquals(f.getState(), "12"); } @SuppressWarnings({ "unchecked" }) @@ -255,7 +133,7 @@ public void toAsyncConsumer3() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "123"); + assertEquals(f.getState(), "123"); } @SuppressWarnings({ "unchecked" }) @@ -269,7 +147,7 @@ public void toAsyncConsumer4() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "1234"); + assertEquals(f.getState(), "1234"); } @SuppressWarnings({ "unchecked" }) @@ -283,7 +161,7 @@ public void toAsyncConsumer5() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "12345"); + assertEquals(f.getState(), "12345"); } @SuppressWarnings({ "unchecked" }) @@ -297,7 +175,7 @@ public void toAsyncConsumer6() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "123456"); + assertEquals(f.getState(), "123456"); } @SuppressWarnings({ "unchecked" }) @@ -311,7 +189,7 @@ public void toAsyncConsumer7() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "1234567"); + assertEquals(f.getState(), "1234567"); } @SuppressWarnings({ "unchecked" }) @@ -325,7 +203,7 @@ public void toAsyncConsumer8() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "12345678"); + assertEquals(f.getState(), "12345678"); } @SuppressWarnings({ "unchecked" }) @@ -339,7 +217,7 @@ public void toAsyncConsumer9() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "123456789"); + assertEquals(f.getState(), "123456789"); } @SuppressWarnings({ "unchecked" }) @@ -353,7 +231,7 @@ public void toAsyncConsumerN() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]"); + assertEquals(f.getState(), "[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]"); } @SuppressWarnings({ "unchecked" }) @@ -361,7 +239,19 @@ public void toAsyncConsumerN() { public void toAsyncFunction0() { MultiFunction f = new MultiFunction(); - AsyncObservable.toAsync((Supplier)f) + AsyncObservable.toAsyncCallable((SimpleCallable)f) + .call() + .test() + .awaitDone(5, TimeUnit.SECONDS) + .assertResult("-"); + } + + @SuppressWarnings({ "unchecked" }) + @Test + public void toAsyncSupplierFunction0() { + MultiFunction f = new MultiFunction(); + + AsyncObservable.toAsyncSupplier((Supplier)f) .call() .test() .awaitDone(5, TimeUnit.SECONDS) @@ -515,7 +405,7 @@ public void toAsyncConsumer1Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "1"); + assertEquals(f.getState(), "1"); } @SuppressWarnings({ "unchecked" }) @@ -529,7 +419,7 @@ public void toAsyncConsumer2Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "12"); + assertEquals(f.getState(), "12"); } @SuppressWarnings({ "unchecked" }) @@ -543,7 +433,7 @@ public void toAsyncConsumer3Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "123"); + assertEquals(f.getState(), "123"); } @SuppressWarnings({ "unchecked" }) @@ -557,7 +447,7 @@ public void toAsyncConsumer4Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "1234"); + assertEquals(f.getState(), "1234"); } @SuppressWarnings({ "unchecked" }) @@ -571,7 +461,7 @@ public void toAsyncConsumer5Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "12345"); + assertEquals(f.getState(), "12345"); } @SuppressWarnings({ "unchecked" }) @@ -585,7 +475,7 @@ public void toAsyncConsumer6Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "123456"); + assertEquals(f.getState(), "123456"); } @SuppressWarnings({ "unchecked" }) @@ -599,7 +489,7 @@ public void toAsyncConsumer7Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "1234567"); + assertEquals(f.getState(), "1234567"); } @SuppressWarnings({ "unchecked" }) @@ -613,7 +503,7 @@ public void toAsyncConsumer8Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "12345678"); + assertEquals(f.getState(), "12345678"); } @SuppressWarnings({ "unchecked" }) @@ -627,7 +517,7 @@ public void toAsyncConsumer9Scheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "123456789"); + assertEquals(f.getState(), "123456789"); } @SuppressWarnings({ "unchecked" }) @@ -641,7 +531,19 @@ public void toAsyncConsumerNScheduler() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(AnyValue.INSTANCE); - assertEquals(f.get(), "[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]"); + assertEquals(f.getState(), "[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]"); + } + + @SuppressWarnings({ "unchecked" }) + @Test + public void toAsyncCallableFunction0Scheduler() { + MultiFunction f = new MultiFunction(); + + AsyncObservable.toAsyncCallable((SimpleCallable)f, Schedulers.single()) + .call() + .test() + .awaitDone(5, TimeUnit.SECONDS) + .assertResult("-"); } @SuppressWarnings({ "unchecked" }) @@ -649,7 +551,7 @@ public void toAsyncConsumerNScheduler() { public void toAsyncFunction0Scheduler() { MultiFunction f = new MultiFunction(); - AsyncObservable.toAsync((Supplier)f, Schedulers.single()) + AsyncObservable.toAsyncSupplier((Supplier)f, Schedulers.single()) .call() .test() .awaitDone(5, TimeUnit.SECONDS) @@ -780,9 +682,9 @@ public void toAsyncFunctionNScheduler() { public void startFuture() { final FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, 1); ft.run(); - AsyncObservable.startFuture(new Callable>() { + AsyncObservable.startFuture(new Supplier>() { @Override - public Future call() throws Exception { + public Future get() throws Exception { return ft; } }) @@ -795,9 +697,9 @@ public Future call() throws Exception { public void startFutureNull() { final FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, null); ft.run(); - AsyncObservable.startFuture(new Callable>() { + AsyncObservable.startFuture(new Supplier>() { @Override - public Future call() throws Exception { + public Future get() throws Exception { return ft; } }) @@ -810,9 +712,9 @@ public Future call() throws Exception { public void startFutureCustomScheduler() { final FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, 1); ft.run(); - AsyncObservable.startFuture(new Callable>() { + AsyncObservable.startFuture(new Supplier>() { @Override - public Future call() throws Exception { + public Future get() throws Exception { return ft; } }, Schedulers.single()) @@ -826,9 +728,9 @@ public void deferFuture() { final FutureTask> ft = new FutureTask>(Functions.EMPTY_RUNNABLE, Observable.just(1)); ft.run(); - AsyncObservable.deferFuture(new Callable>>() { + AsyncObservable.deferFuture(new Supplier>>() { @Override - public Future> call() throws Exception { + public Future> get() throws Exception { return ft; } }) @@ -842,9 +744,9 @@ public void deferFutureCustomScheduler() { final FutureTask> ft = new FutureTask>(Functions.EMPTY_RUNNABLE, Observable.just(1)); ft.run(); - AsyncObservable.deferFuture(new Callable>>() { + AsyncObservable.deferFuture(new Supplier>>() { @Override - public Future> call() throws Exception { + public Future> get() throws Exception { return ft; } }, Schedulers.single()) diff --git a/src/test/java/hu/akarnokd/rxjava2/basetypes/NonoProcessorTest.java b/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoProcessorTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/basetypes/NonoProcessorTest.java rename to src/test/java/hu/akarnokd/rxjava3/basetypes/NonoProcessorTest.java index adba5d51..1269ed77 100644 --- a/src/test/java/hu/akarnokd/rxjava2/basetypes/NonoProcessorTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoProcessorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import static org.junit.Assert.*; @@ -24,7 +24,7 @@ import org.junit.Test; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.internal.subscriptions.BooleanSubscription; import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.schedulers.Schedulers; diff --git a/src/test/java/hu/akarnokd/rxjava2/basetypes/NonoTest.java b/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoTest.java similarity index 96% rename from src/test/java/hu/akarnokd/rxjava2/basetypes/NonoTest.java rename to src/test/java/hu/akarnokd/rxjava3/basetypes/NonoTest.java index 6c2803a4..3f59aeca 100644 --- a/src/test/java/hu/akarnokd/rxjava2/basetypes/NonoTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import static org.junit.Assert.*; @@ -25,7 +25,7 @@ import org.junit.*; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.*; import io.reactivex.Observable; import io.reactivex.exceptions.CompositeException; @@ -88,9 +88,9 @@ public void error() { @Test public void errorSupplier() { - Nono.error(new Callable() { + Nono.error(new Supplier() { @Override - public Throwable call() throws Exception { + public Throwable get() throws Exception { return new IOException(); } }) @@ -100,9 +100,9 @@ public Throwable call() throws Exception { @Test public void errorSupplierThrows() { - Nono.error(new Callable() { + Nono.error(new Supplier() { @Override - public Throwable call() throws Exception { + public Throwable get() throws Exception { throw new IOException(); } }) @@ -114,9 +114,9 @@ public Throwable call() throws Exception { public void defer() { final int[] counter = { 0 }; - Nono np = Nono.defer(new Callable() { + Nono np = Nono.defer(new Supplier() { @Override - public Nono call() throws Exception { + public Nono get() throws Exception { if (counter[0]++ == 0) { return Nono.error(new IOException()); } @@ -141,9 +141,9 @@ public Nono call() throws Exception { @Test public void deferThrows() { - Nono np = Nono.defer(new Callable() { + Nono np = Nono.defer(new Supplier() { @Override - public Nono call() throws Exception { + public Nono get() throws Exception { throw new IOException(); } }); @@ -734,7 +734,7 @@ public void timerScheduler() { @Test public void using() { Nono.using( - Functions.justCallable(1), + Functions.justSupplier(1), Functions.justFunction(Nono.complete()), this ) @@ -747,7 +747,7 @@ public void using() { @Test public void usingError() { Nono.using( - Functions.justCallable(1), + Functions.justSupplier(1), Functions.justFunction(ioError), this ) @@ -760,7 +760,7 @@ public void usingError() { @Test public void usingNonEager() { Nono.using( - Functions.justCallable(1), + Functions.justSupplier(1), Functions.justFunction(Nono.complete()), this, false ) @@ -773,7 +773,7 @@ public void usingNonEager() { @Test public void usingNonEagerError() { Nono.using( - Functions.justCallable(1), + Functions.justSupplier(1), Functions.justFunction(ioError), this, false ) @@ -785,9 +785,9 @@ public void usingNonEagerError() { @Test public void usingResourceThrows() { - Nono.using(new Callable() { + Nono.using(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Exception { throw new IllegalArgumentException(); } }, @@ -800,7 +800,7 @@ public Object call() throws Exception { @Test public void usingSourceThrows() { - Nono.using(Functions.justCallable(0), + Nono.using(Functions.justSupplier(0), new Function() { @Override public Nono apply(Integer v) throws Exception { @@ -815,7 +815,7 @@ public Nono apply(Integer v) throws Exception { @Test public void usingDisposerThrows1() { - Nono.using(Functions.justCallable(0), + Nono.using(Functions.justSupplier(0), Functions.justFunction(Nono.complete()), new Consumer() { @Override @@ -829,8 +829,9 @@ public void accept(Integer t) throws Exception { } @Test + @SuppressWarnings("unchecked") public void usingDisposerThrows2() { - Nono.using(Functions.justCallable(0), + TestSubscriber ts = Nono.using(Functions.justSupplier(0), Functions.justFunction(ioError), new Consumer() { @Override @@ -841,20 +842,16 @@ public void accept(Integer t) throws Exception { ) .test() .assertFailure(CompositeException.class) - .assertOf(new Consumer>() { - @SuppressWarnings("unchecked") - @Override - public void accept(TestSubscriber ts) throws Exception { - TestHelper.assertCompositeExceptions(ts, IOException.class, IllegalArgumentException.class); - } - }); + ; + + TestHelper.assertCompositeExceptions(ts, IOException.class, IllegalArgumentException.class); } @Test public void usingDisposerThrows3() { List errors = TestHelper.trackPluginErrors(); try { - Nono.using(Functions.justCallable(0), + Nono.using(Functions.justSupplier(0), Functions.justFunction(Nono.complete()), new Consumer() { @Override @@ -872,9 +869,10 @@ public void accept(Integer t) throws Exception { } } + @SuppressWarnings("unchecked") @Test public void usingDisposerThrows4() { - Nono.using(Functions.justCallable(0), + TestSubscriber ts = Nono.using(Functions.justSupplier(0), new Function() { @Override public Nono apply(Integer v) throws Exception { @@ -890,21 +888,17 @@ public void accept(Integer t) throws Exception { ) .test() .assertFailure(CompositeException.class) - .assertOf(new Consumer>() { - @SuppressWarnings("unchecked") - @Override - public void accept(TestSubscriber ts) throws Exception { - TestHelper.assertCompositeExceptions(ts, - IOException.class, IllegalArgumentException.class); - } - }); + ; + + TestHelper.assertCompositeExceptions(ts, + IOException.class, IllegalArgumentException.class); } @Test public void usingDisposerThrows5() { List errors = TestHelper.trackPluginErrors(); try { - Nono.using(Functions.justCallable(0), + Nono.using(Functions.justSupplier(0), new Function() { @Override public Nono apply(Integer v) throws Exception { @@ -1363,14 +1357,14 @@ public void onErrorResumeNextError2() { @Test public void flatMap1() { - Nono.fromAction(this).flatMap(Functions.justFunction(Flowable.just(1)), Functions.justCallable(Flowable.just(2))) + Nono.fromAction(this).flatMap(Functions.justFunction(Flowable.just(1)), Functions.justSupplier(Flowable.just(2))) .test() .assertResult(2); } @Test public void flatMap2() { - Nono.fromAction(this).flatMap(Functions.justFunction(Flowable.just(1)), Functions.justCallable(Flowable.range(10, 5))) + Nono.fromAction(this).flatMap(Functions.justFunction(Flowable.just(1)), Functions.justSupplier(Flowable.range(10, 5))) .rebatchRequests(1) .test() .assertResult(10, 11, 12, 13, 14); @@ -1380,7 +1374,7 @@ public void flatMap2() { @Test public void flatMap3() { - ioError.flatMap(Functions.justFunction(Flowable.just(1)), Functions.justCallable(Flowable.just(2))) + ioError.flatMap(Functions.justFunction(Flowable.just(1)), Functions.justSupplier(Flowable.just(2))) .test() .assertResult(1); } @@ -1389,7 +1383,7 @@ public void flatMap3() { public void flatMap4() { ioError.flatMap( Functions.justFunction(Flowable.error(new IllegalArgumentException())), - Functions.justCallable(Flowable.just(2))) + Functions.justSupplier(Flowable.just(2))) .test() .assertFailure(IllegalArgumentException.class); } @@ -1398,7 +1392,7 @@ public void flatMap4() { public void flatMap5() { Nono.fromAction(this).flatMap( Functions.justFunction(Flowable.just(1)), - Functions.justCallable(Flowable.error(new IllegalArgumentException())) + Functions.justSupplier(Flowable.error(new IllegalArgumentException())) ) .test() .assertFailure(IllegalArgumentException.class); @@ -1681,14 +1675,16 @@ public void accept(Throwable t) throws Exception { }) .test() .assertFailure(CompositeException.class) - .assertOf(new Consumer>() { + .assertError(new Predicate() { @Override - public void accept(TestSubscriber ts) throws Exception { - List list = TestHelper.compositeList(ts.errors().get(0)); + public boolean test(Throwable error) throws Throwable { + List list = TestHelper.compositeList(error); TestHelper.assertError(list, 0, IOException.class); TestHelper.assertError(list, 1, IllegalArgumentException.class); + return true; } - }); + }) + ; Assert.assertEquals(1, count); } @@ -1855,16 +1851,14 @@ public void doFinally2() { @Test public void doFinally3() { - Nono.never() + TestSubscriber ts = Nono.never() .doFinally(this) .test() - .assertOf(new Consumer>() { - @Override - public void accept(TestSubscriber ts) throws Exception { - ts.cancel(); - } - }) - .assertEmpty(); + ; + + ts.cancel(); + + ts.assertEmpty(); Assert.assertEquals(1, count); } @@ -2151,12 +2145,13 @@ public boolean test(Throwable e) throws Exception { }) .test() .assertFailure(CompositeException.class) - .assertOf(new Consumer>() { + .assertError(new Predicate() { @Override - public void accept(TestSubscriber ts) throws Exception { - List errors = TestHelper.compositeList(ts.errors().get(0)); + public boolean test(Throwable error) throws Throwable { + List errors = TestHelper.compositeList(error); TestHelper.assertError(errors, 0, IOException.class); TestHelper.assertError(errors, 1, IllegalArgumentException.class); + return true; } }); } diff --git a/src/test/java/hu/akarnokd/rxjava2/basetypes/PerhapsTest.java b/src/test/java/hu/akarnokd/rxjava3/basetypes/PerhapsTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/basetypes/PerhapsTest.java rename to src/test/java/hu/akarnokd/rxjava3/basetypes/PerhapsTest.java index c7b40686..2bd87b64 100644 --- a/src/test/java/hu/akarnokd/rxjava2/basetypes/PerhapsTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/basetypes/PerhapsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import static org.junit.Assert.*; @@ -25,7 +25,7 @@ import org.junit.Test; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.*; import io.reactivex.disposables.Disposable; import io.reactivex.exceptions.CompositeException; @@ -270,9 +270,9 @@ public void error() { @Test public void errorSupplier() { - Perhaps.error(new Callable() { + Perhaps.error(new Supplier() { @Override - public Throwable call() throws Exception { + public Throwable get() throws Exception { return new IOException(); } }) @@ -282,9 +282,9 @@ public Throwable call() throws Exception { @Test public void errorSupplierThrows() { - Perhaps.error(new Callable() { + Perhaps.error(new Supplier() { @Override - public Throwable call() throws Exception { + public Throwable get() throws Exception { throw new IOException(); } }) @@ -294,9 +294,9 @@ public Throwable call() throws Exception { @Test public void errorSupplierNull() { - Perhaps.error(new Callable() { + Perhaps.error(new Supplier() { @Override - public Throwable call() throws Exception { + public Throwable get() throws Exception { return null; } }) @@ -344,11 +344,11 @@ public void never() { @Test public void defer() { - Perhaps sp = Perhaps.defer(new Callable>() { + Perhaps sp = Perhaps.defer(new Supplier>() { int i; @Override - public Perhaps call() throws Exception { + public Perhaps get() throws Exception { return Perhaps.just(++i); } }); @@ -360,9 +360,9 @@ public Perhaps call() throws Exception { @Test public void deferThrows() { - Perhaps sp = Perhaps.defer(new Callable>() { + Perhaps sp = Perhaps.defer(new Supplier>() { @Override - public Perhaps call() throws Exception { + public Perhaps get() throws Exception { throw new IOException(); } }); @@ -961,7 +961,7 @@ public void timerScheduler() { @Test public void usingEager() { - Perhaps.using(Functions.justCallable(1), + Perhaps.using(Functions.justSupplier(1), Functions.justFunction(Perhaps.just(1)), this) .test() .assertResult(1); @@ -971,7 +971,7 @@ public void usingEager() { @Test public void usingEagerError() { - Perhaps.using(Functions.justCallable(1), + Perhaps.using(Functions.justSupplier(1), Functions.justFunction(Perhaps.error(new IOException())), this) .test() .assertFailure(IOException.class); @@ -981,7 +981,7 @@ public void usingEagerError() { @Test public void usingNonEager() { - Perhaps.using(Functions.justCallable(1), + Perhaps.using(Functions.justSupplier(1), Functions.justFunction(Perhaps.just(1)), this, false) .test() @@ -1527,7 +1527,7 @@ public void flatMapSignal() { Perhaps.just(1).flatMap( Functions.justFunction(Perhaps.just(2)), Functions.justFunction(Perhaps.just(3)), - Functions.justCallable(Perhaps.just(4)) + Functions.justSupplier(Perhaps.just(4)) ) .test() .assertResult(2); @@ -1538,7 +1538,7 @@ public void flatMapSignalError() { Perhaps.error(new IOException()).flatMap( Functions.justFunction(Perhaps.just(2)), Functions.justFunction(Perhaps.just(3)), - Functions.justCallable(Perhaps.just(4)) + Functions.justSupplier(Perhaps.just(4)) ) .test() .assertResult(3); @@ -1549,7 +1549,7 @@ public void flatMapSignalError2() { Perhaps.just(1).flatMap( Functions.justFunction(Perhaps.error(new IOException())), Functions.justFunction(Perhaps.just(3)), - Functions.justCallable(Perhaps.just(4)) + Functions.justSupplier(Perhaps.just(4)) ) .test() .assertFailure(IOException.class); @@ -1560,7 +1560,7 @@ public void flatMapSignalError3() { Perhaps.error(new IOException()).flatMap( Functions.justFunction(Perhaps.just(2)), Functions.justFunction(Perhaps.error(new IllegalArgumentException())), - Functions.justCallable(Perhaps.just(4)) + Functions.justSupplier(Perhaps.just(4)) ) .test() .assertFailure(IllegalArgumentException.class); @@ -2207,9 +2207,9 @@ public void retryTimesNegative() { public void retryInfinite() { final int[] counter = { 0 }; - Perhaps.defer(new Callable>() { + Perhaps.defer(new Supplier>() { @Override - public Perhaps call() throws Exception { + public Perhaps get() throws Exception { if (++counter[0] == 5) { return Perhaps.just(1); } @@ -2225,9 +2225,9 @@ public Perhaps call() throws Exception { public void retryPredicate() { final int[] counter = { 0 }; - Perhaps.defer(new Callable>() { + Perhaps.defer(new Supplier>() { @Override - public Perhaps call() throws Exception { + public Perhaps get() throws Exception { if (++counter[0] == 5) { return Perhaps.error(new IllegalArgumentException()); } diff --git a/src/test/java/hu/akarnokd/rxjava2/basetypes/SoloTest.java b/src/test/java/hu/akarnokd/rxjava3/basetypes/SoloTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/basetypes/SoloTest.java rename to src/test/java/hu/akarnokd/rxjava3/basetypes/SoloTest.java index 97af2937..9a3847d8 100644 --- a/src/test/java/hu/akarnokd/rxjava2/basetypes/SoloTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/basetypes/SoloTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.basetypes; +package hu.akarnokd.rxjava3.basetypes; import static org.junit.Assert.*; @@ -25,7 +25,7 @@ import org.junit.Test; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.*; import io.reactivex.disposables.Disposable; import io.reactivex.exceptions.CompositeException; @@ -211,9 +211,9 @@ public void error() { @Test public void errorSupplier() { - Solo.error(new Callable() { + Solo.error(new Supplier() { @Override - public Throwable call() throws Exception { + public Throwable get() throws Exception { return new IOException(); } }) @@ -223,9 +223,9 @@ public Throwable call() throws Exception { @Test public void errorSupplierThrows() { - Solo.error(new Callable() { + Solo.error(new Supplier() { @Override - public Throwable call() throws Exception { + public Throwable get() throws Exception { throw new IOException(); } }) @@ -235,9 +235,9 @@ public Throwable call() throws Exception { @Test public void errorSupplierNull() { - Solo.error(new Callable() { + Solo.error(new Supplier() { @Override - public Throwable call() throws Exception { + public Throwable get() throws Exception { return null; } }) @@ -285,11 +285,11 @@ public void never() { @Test public void defer() { - Solo sp = Solo.defer(new Callable>() { + Solo sp = Solo.defer(new Supplier>() { int i; @Override - public Solo call() throws Exception { + public Solo get() throws Exception { return Solo.just(++i); } }); @@ -301,9 +301,9 @@ public Solo call() throws Exception { @Test public void deferThrows() { - Solo sp = Solo.defer(new Callable>() { + Solo sp = Solo.defer(new Supplier>() { @Override - public Solo call() throws Exception { + public Solo get() throws Exception { throw new IOException(); } }); @@ -902,7 +902,7 @@ public void timerScheduler() { @Test public void usingEager() { - Solo.using(Functions.justCallable(1), + Solo.using(Functions.justSupplier(1), Functions.justFunction(Solo.just(1)), this) .test() .assertResult(1); @@ -912,7 +912,7 @@ public void usingEager() { @Test public void usingEagerError() { - Solo.using(Functions.justCallable(1), + Solo.using(Functions.justSupplier(1), Functions.justFunction(Solo.error(new IOException())), this) .test() .assertFailure(IOException.class); @@ -922,7 +922,7 @@ public void usingEagerError() { @Test public void usingNonEager() { - Solo.using(Functions.justCallable(1), + Solo.using(Functions.justSupplier(1), Functions.justFunction(Solo.just(1)), this, false) .test() @@ -2135,9 +2135,9 @@ public void retryTimesNegative() { public void retryInfinite() { final int[] counter = { 0 }; - Solo.defer(new Callable>() { + Solo.defer(new Supplier>() { @Override - public Solo call() throws Exception { + public Solo get() throws Exception { if (++counter[0] == 5) { return Solo.just(1); } @@ -2153,9 +2153,9 @@ public Solo call() throws Exception { public void retryPredicate() { final int[] counter = { 0 }; - Solo.defer(new Callable>() { + Solo.defer(new Supplier>() { @Override - public Solo call() throws Exception { + public Solo get() throws Exception { if (++counter[0] == 5) { return Solo.error(new IllegalArgumentException()); } diff --git a/src/test/java/hu/akarnokd/rxjava2/consumers/CompletableConsumersTest.java b/src/test/java/hu/akarnokd/rxjava3/consumers/CompletableConsumersTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/consumers/CompletableConsumersTest.java rename to src/test/java/hu/akarnokd/rxjava3/consumers/CompletableConsumersTest.java index 4a44d493..b4753c4f 100644 --- a/src/test/java/hu/akarnokd/rxjava2/consumers/CompletableConsumersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/consumers/CompletableConsumersTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.consumers; +package hu.akarnokd.rxjava3.consumers; import static org.junit.Assert.*; @@ -23,7 +23,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.*; import io.reactivex.disposables.*; import io.reactivex.exceptions.CompositeException; diff --git a/src/test/java/hu/akarnokd/rxjava2/consumers/FlowableConsumersTest.java b/src/test/java/hu/akarnokd/rxjava3/consumers/FlowableConsumersTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/consumers/FlowableConsumersTest.java rename to src/test/java/hu/akarnokd/rxjava3/consumers/FlowableConsumersTest.java index c0f9731f..68050794 100644 --- a/src/test/java/hu/akarnokd/rxjava2/consumers/FlowableConsumersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/consumers/FlowableConsumersTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.consumers; +package hu.akarnokd.rxjava3.consumers; import static org.junit.Assert.*; @@ -24,7 +24,7 @@ import org.junit.Test; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.Flowable; import io.reactivex.disposables.*; import io.reactivex.exceptions.*; diff --git a/src/test/java/hu/akarnokd/rxjava2/consumers/MaybeConsumersTest.java b/src/test/java/hu/akarnokd/rxjava3/consumers/MaybeConsumersTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/consumers/MaybeConsumersTest.java rename to src/test/java/hu/akarnokd/rxjava3/consumers/MaybeConsumersTest.java index 703e52e6..6b62bd34 100644 --- a/src/test/java/hu/akarnokd/rxjava2/consumers/MaybeConsumersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/consumers/MaybeConsumersTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.consumers; +package hu.akarnokd.rxjava3.consumers; import static org.junit.Assert.*; @@ -23,7 +23,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.*; import io.reactivex.disposables.*; import io.reactivex.exceptions.CompositeException; diff --git a/src/test/java/hu/akarnokd/rxjava2/consumers/ObservableConsumersTest.java b/src/test/java/hu/akarnokd/rxjava3/consumers/ObservableConsumersTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/consumers/ObservableConsumersTest.java rename to src/test/java/hu/akarnokd/rxjava3/consumers/ObservableConsumersTest.java index b2560e2f..04e774de 100644 --- a/src/test/java/hu/akarnokd/rxjava2/consumers/ObservableConsumersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/consumers/ObservableConsumersTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.consumers; +package hu.akarnokd.rxjava3.consumers; import static org.junit.Assert.*; @@ -23,7 +23,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.disposables.*; diff --git a/src/test/java/hu/akarnokd/rxjava2/consumers/SingleConsumersTest.java b/src/test/java/hu/akarnokd/rxjava3/consumers/SingleConsumersTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/consumers/SingleConsumersTest.java rename to src/test/java/hu/akarnokd/rxjava3/consumers/SingleConsumersTest.java index b2eb479d..49689066 100644 --- a/src/test/java/hu/akarnokd/rxjava2/consumers/SingleConsumersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/consumers/SingleConsumersTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.consumers; +package hu.akarnokd.rxjava3.consumers; import static org.junit.Assert.*; @@ -23,7 +23,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.*; import io.reactivex.disposables.*; import io.reactivex.exceptions.CompositeException; diff --git a/src/test/java/hu/akarnokd/rxjava2/debug/RxJava2AssemblyTrackingTest.java b/src/test/java/hu/akarnokd/rxjava3/debug/RxJava3AssemblyTrackingTest.java similarity index 84% rename from src/test/java/hu/akarnokd/rxjava2/debug/RxJava2AssemblyTrackingTest.java rename to src/test/java/hu/akarnokd/rxjava3/debug/RxJava3AssemblyTrackingTest.java index 3334d06f..8d051e5d 100644 --- a/src/test/java/hu/akarnokd/rxjava2/debug/RxJava2AssemblyTrackingTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/debug/RxJava3AssemblyTrackingTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug; +package hu.akarnokd.rxjava3.debug; import static org.junit.Assert.*; @@ -23,6 +23,7 @@ import org.junit.Test; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.*; import io.reactivex.disposables.Disposable; import io.reactivex.functions.Action; @@ -35,7 +36,7 @@ /** * Named as such to avoid being filtered out in stacktraces of this test. */ -public class RxJava2AssemblyTrackingTest { +public class RxJava3AssemblyTrackingTest { // @Test public void printFilter() { @@ -50,7 +51,7 @@ public static void main(String[] args) throws Exception { public void run() { System.err.println(new RxJavaAssemblyException().stacktrace()); } - }).blockingGet(); + }).blockingAwait(); ExecutorService exec = Executors.newSingleThreadExecutor(); @@ -95,9 +96,9 @@ public void flowable() { TestSubscriber ts = source.test() .assertFailure(IOException.class, 1, 2, 3, 4, 5); - String st = RxJavaAssemblyException.find(ts.errors().get(0)).stacktrace(); + String st = RxJavaAssemblyException.find(TestHelper.errors(ts).get(0)).stacktrace(); - assertTrue(st, st.contains("RxJava2AssemblyTrackingTest.createFlowable")); + assertTrue(st, st.contains("RxJava3AssemblyTrackingTest.createFlowable")); } finally { RxJavaAssemblyTracking.disable(); @@ -108,7 +109,7 @@ public void flowable() { TestSubscriber ts = source.test() .assertFailure(IOException.class, 1, 2, 3, 4, 5); - assertNull(RxJavaAssemblyException.find(ts.errors().get(0))); + assertNull(RxJavaAssemblyException.find(TestHelper.errors(ts).get(0))); } @Test @@ -120,9 +121,9 @@ public void observable() { TestObserver to = source.test() .assertFailure(IOException.class, 1, 2, 3, 4, 5); - String st = RxJavaAssemblyException.find(to.errors().get(0)).stacktrace(); + String st = RxJavaAssemblyException.find(TestHelper.errors(to).get(0)).stacktrace(); - assertTrue(st, st.contains("RxJava2AssemblyTrackingTest.createObservable")); + assertTrue(st, st.contains("RxJava3AssemblyTrackingTest.createObservable")); } finally { RxJavaAssemblyTracking.disable(); @@ -133,7 +134,7 @@ public void observable() { TestSubscriber ts = source.test() .assertFailure(IOException.class, 1, 2, 3, 4, 5); - assertNull(RxJavaAssemblyException.find(ts.errors().get(0))); + assertNull(RxJavaAssemblyException.find(TestHelper.errors(ts).get(0))); } @Test @@ -145,9 +146,9 @@ public void single() { TestObserver to = source.test() .assertFailure(IOException.class); - String st = RxJavaAssemblyException.find(to.errors().get(0)).stacktrace(); + String st = RxJavaAssemblyException.find(TestHelper.errors(to).get(0)).stacktrace(); - assertTrue(st, st.contains("RxJava2AssemblyTrackingTest.createSingle")); + assertTrue(st, st.contains("RxJava3AssemblyTrackingTest.createSingle")); } finally { RxJavaAssemblyTracking.disable(); @@ -158,7 +159,7 @@ public void single() { TestObserver to = source.test() .assertFailure(IOException.class); - assertNull(RxJavaAssemblyException.find(to.errors().get(0))); + assertNull(RxJavaAssemblyException.find(TestHelper.errors(to).get(0))); } @Test @@ -170,9 +171,9 @@ public void maybe() { TestObserver to = source.test() .assertFailure(IOException.class); - String st = RxJavaAssemblyException.find(to.errors().get(0)).stacktrace(); + String st = RxJavaAssemblyException.find(TestHelper.errors(to).get(0)).stacktrace(); - assertTrue(st, st.contains("RxJava2AssemblyTrackingTest.createMaybe")); + assertTrue(st, st.contains("RxJava3AssemblyTrackingTest.createMaybe")); } finally { RxJavaAssemblyTracking.disable(); @@ -183,7 +184,7 @@ public void maybe() { TestObserver to = source.test() .assertFailure(IOException.class); - assertNull(RxJavaAssemblyException.find(to.errors().get(0))); + assertNull(RxJavaAssemblyException.find(TestHelper.errors(to).get(0))); } @Test @@ -195,9 +196,9 @@ public void completable() { TestObserver to = source.test() .assertFailure(IOException.class); - String st = RxJavaAssemblyException.find(to.errors().get(0)).stacktrace(); + String st = RxJavaAssemblyException.find(TestHelper.errors(to).get(0)).stacktrace(); - assertTrue(st, st.contains("RxJava2AssemblyTrackingTest.createCompletable")); + assertTrue(st, st.contains("RxJava3AssemblyTrackingTest.createCompletable")); } finally { RxJavaAssemblyTracking.disable(); @@ -208,7 +209,7 @@ public void completable() { TestObserver to = source.test() .assertFailure(IOException.class); - assertNull(RxJavaAssemblyException.find(to.errors().get(0))); + assertNull(RxJavaAssemblyException.find(TestHelper.errors(to).get(0))); } @Test @@ -220,9 +221,9 @@ public void parallelFlowable() { TestSubscriber ts = source.sequential().test() .assertFailure(IOException.class, 1, 2, 3, 4, 5); - String st = RxJavaAssemblyException.find(ts.errors().get(0)).stacktrace(); + String st = RxJavaAssemblyException.find(TestHelper.errors(ts).get(0)).stacktrace(); - assertTrue(st, st.contains("RxJava2AssemblyTrackingTest.createParallelFlowable")); + assertTrue(st, st.contains("RxJava3AssemblyTrackingTest.createParallelFlowable")); } finally { RxJavaAssemblyTracking.disable(); @@ -233,7 +234,7 @@ public void parallelFlowable() { TestSubscriber ts = source.sequential().test() .assertFailure(IOException.class, 1, 2, 3, 4, 5); - assertNull(RxJavaAssemblyException.find(ts.errors().get(0))); + assertNull(RxJavaAssemblyException.find(TestHelper.errors(ts).get(0))); } @Test diff --git a/src/test/java/hu/akarnokd/rxjava2/debug/multihook/OnScheduleMultiHandlerManagerTest.java b/src/test/java/hu/akarnokd/rxjava3/debug/multihook/OnScheduleMultiHandlerManagerTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/debug/multihook/OnScheduleMultiHandlerManagerTest.java rename to src/test/java/hu/akarnokd/rxjava3/debug/multihook/OnScheduleMultiHandlerManagerTest.java index cc5af99e..31fe0400 100644 --- a/src/test/java/hu/akarnokd/rxjava2/debug/multihook/OnScheduleMultiHandlerManagerTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/debug/multihook/OnScheduleMultiHandlerManagerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.multihook; +package hu.akarnokd.rxjava3.debug.multihook; import static org.junit.Assert.*; @@ -23,7 +23,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.disposables.Disposable; import io.reactivex.functions.*; import io.reactivex.internal.functions.Functions; diff --git a/src/test/java/hu/akarnokd/rxjava2/debug/validator/RxJavaProtocolValidatorTest.java b/src/test/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidatorTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/debug/validator/RxJavaProtocolValidatorTest.java rename to src/test/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidatorTest.java index dfd9c92a..9eaa4d61 100644 --- a/src/test/java/hu/akarnokd/rxjava2/debug/validator/RxJavaProtocolValidatorTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidatorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.debug.validator; +package hu.akarnokd.rxjava3.debug.validator; import java.io.IOException; import java.util.List; @@ -22,9 +22,9 @@ import org.junit.*; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.debug.*; -import hu.akarnokd.rxjava2.functions.PlainConsumer; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.debug.*; +import hu.akarnokd.rxjava3.functions.PlainConsumer; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.*; import io.reactivex.disposables.*; import io.reactivex.flowables.ConnectableFlowable; @@ -350,6 +350,10 @@ protected void subscribeActual(Subscriber s) { @Override public void connect(Consumer connection) { } + + @Override + public void reset() { + } }; RxJavaProtocolValidator.setOnViolationHandler(this); @@ -413,6 +417,10 @@ protected void subscribeActual(Observer observer) { @Override public void connect(Consumer connection) { } + + @Override + public void reset() { + } }; RxJavaProtocolValidator.setOnViolationHandler(this); diff --git a/src/test/java/hu/akarnokd/rxjava2/expr/StatementCompletableTest.java b/src/test/java/hu/akarnokd/rxjava3/expr/StatementCompletableTest.java similarity index 92% rename from src/test/java/hu/akarnokd/rxjava2/expr/StatementCompletableTest.java rename to src/test/java/hu/akarnokd/rxjava3/expr/StatementCompletableTest.java index dd24535e..1d592ea3 100644 --- a/src/test/java/hu/akarnokd/rxjava2/expr/StatementCompletableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/expr/StatementCompletableTest.java @@ -14,23 +14,22 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; -import io.reactivex.Completable; -import io.reactivex.functions.BooleanSupplier; -import io.reactivex.schedulers.TestScheduler; -import org.junit.Before; -import org.junit.Test; +import java.util.*; + +import org.junit.*; import org.mockito.MockitoAnnotations; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.Callable; +import io.reactivex.Completable; +import io.reactivex.functions.*; +import io.reactivex.schedulers.TestScheduler; +@SuppressWarnings("rawtypes") public class StatementCompletableTest { TestScheduler scheduler; - Callable func; - Callable funcError; + Supplier func; + Supplier funcError; BooleanSupplier condition; BooleanSupplier conditionError; @@ -38,19 +37,19 @@ public class StatementCompletableTest { public void before() { MockitoAnnotations.initMocks(this); scheduler = new TestScheduler(); - func = new Callable() { + func = new Supplier() { int count = 1; @Override - public Integer call() { + public Integer get() { return count++; } }; - funcError = new Callable() { + funcError = new Supplier() { int count = 1; @Override - public Integer call() { + public Integer get() { if (count == 2) { throw new RuntimeException("Forced failure!"); } @@ -100,6 +99,7 @@ public void testSimple() { map.put(1, source1); map.put(2, source2); + @SuppressWarnings("unchecked") Completable result = StatementCompletable.switchCase(func, map, defaultSource); observe(result); @@ -114,6 +114,7 @@ public void testDefaultCase() { Map map = new HashMap(); map.put(1, source1); + @SuppressWarnings("unchecked") Completable result = StatementCompletable.switchCase(func, map, source2); observeError(result, RuntimeException.class); @@ -128,6 +129,7 @@ public void testCaseSelectorThrows() { Map map = new HashMap(); map.put(1, source1); + @SuppressWarnings("unchecked") Completable result = StatementCompletable.switchCase(funcError, map, defaultSource); observe(result); @@ -155,6 +157,7 @@ public Completable get(Object key) { map.put(1, source1); map.put(2, source2); + @SuppressWarnings("unchecked") Completable result = StatementCompletable.switchCase(func, map, defaultSource); observe(result); @@ -180,6 +183,7 @@ public Completable get(Object key) { }; map.put(1, source1); + @SuppressWarnings("unchecked") Completable result = StatementCompletable.switchCase(func, map, defaultSource); observe(result); @@ -196,6 +200,7 @@ public void testChosenCompletableThrows() { map.put(1, source1); map.put(2, source2); + @SuppressWarnings("unchecked") Completable result = StatementCompletable.switchCase(func, map, defaultSource); observe(result); diff --git a/src/test/java/hu/akarnokd/rxjava2/expr/StatementFlowableTest.java b/src/test/java/hu/akarnokd/rxjava3/expr/StatementFlowableTest.java similarity index 95% rename from src/test/java/hu/akarnokd/rxjava2/expr/StatementFlowableTest.java rename to src/test/java/hu/akarnokd/rxjava3/expr/StatementFlowableTest.java index 097c4e2b..2f3db822 100644 --- a/src/test/java/hu/akarnokd/rxjava2/expr/StatementFlowableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/expr/StatementFlowableTest.java @@ -14,22 +14,21 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; import java.util.*; -import java.util.concurrent.Callable; import org.junit.*; import org.mockito.MockitoAnnotations; import io.reactivex.Flowable; -import io.reactivex.functions.BooleanSupplier; +import io.reactivex.functions.*; import io.reactivex.schedulers.*; public class StatementFlowableTest { TestScheduler scheduler; - Callable func; - Callable funcError; + Supplier func; + Supplier funcError; BooleanSupplier condition; BooleanSupplier conditionError; int numRecursion = 250; @@ -38,19 +37,19 @@ public class StatementFlowableTest { public void before() { MockitoAnnotations.initMocks(this); scheduler = new TestScheduler(); - func = new Callable() { + func = new Supplier() { int count = 1; @Override - public Integer call() { + public Integer get() { return count++; } }; - funcError = new Callable() { + funcError = new Supplier() { int count = 1; @Override - public Integer call() { + public Integer get() { if (count == 2) { throw new RuntimeException("Forced failure!"); } @@ -87,7 +86,7 @@ void observe(Flowable source, T... values) { } void observeSequence(Flowable source, Iterable values) { - source.test().assertValueSequence(values).assertNoErrors().assertComplete().assertSubscribed(); + source.test().assertValueSequence(values).assertNoErrors().assertComplete(); } void observeError(Flowable source, Class error, T... valuesBeforeError) { @@ -95,7 +94,7 @@ void observeError(Flowable source, Class error, T... } void observeSequenceError(Flowable source, Class error, Iterable valuesBeforeError) { - source.test().assertValueSequence(valuesBeforeError).assertError(error).assertNotComplete().assertSubscribed(); + source.test().assertValueSequence(valuesBeforeError).assertError(error).assertNotComplete(); } @Test @@ -280,7 +279,7 @@ public void testDoWhile() { } @Test - public void testDoWhileOnce() throws Exception { + public void testDoWhileOnce() throws Throwable { Flowable source1 = Flowable.just(1, 2, 3); condition.getAsBoolean(); // toggle to false @@ -290,7 +289,7 @@ public void testDoWhileOnce() throws Exception { } @Test - public void testDoWhileConditionThrows() throws Exception { + public void testDoWhileConditionThrows() throws Throwable { Flowable source1 = Flowable.just(1, 2, 3); conditionError.getAsBoolean(); Flowable result = StatementFlowable.doWhile(source1, conditionError); @@ -384,7 +383,7 @@ public void testWhileDoConditionThrows() { } @Test - public void testWhileDoConditionThrowsImmediately() throws Exception { + public void testWhileDoConditionThrowsImmediately() throws Throwable { Flowable source1 = Flowable.just(1, 2, 3); conditionError.getAsBoolean(); Flowable result = StatementFlowable.whileDo(source1, conditionError); diff --git a/src/test/java/hu/akarnokd/rxjava2/expr/StatementMaybeTest.java b/src/test/java/hu/akarnokd/rxjava3/expr/StatementMaybeTest.java similarity index 94% rename from src/test/java/hu/akarnokd/rxjava2/expr/StatementMaybeTest.java rename to src/test/java/hu/akarnokd/rxjava3/expr/StatementMaybeTest.java index 8737cd06..a3153866 100644 --- a/src/test/java/hu/akarnokd/rxjava2/expr/StatementMaybeTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/expr/StatementMaybeTest.java @@ -14,23 +14,21 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; -import io.reactivex.Maybe; -import io.reactivex.functions.BooleanSupplier; -import io.reactivex.schedulers.TestScheduler; -import org.junit.Before; -import org.junit.Test; +import java.util.*; + +import org.junit.*; import org.mockito.MockitoAnnotations; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.Callable; +import io.reactivex.Maybe; +import io.reactivex.functions.*; +import io.reactivex.schedulers.TestScheduler; public class StatementMaybeTest { TestScheduler scheduler; - Callable func; - Callable funcError; + Supplier func; + Supplier funcError; BooleanSupplier condition; BooleanSupplier conditionError; @@ -38,19 +36,19 @@ public class StatementMaybeTest { public void before() { MockitoAnnotations.initMocks(this); scheduler = new TestScheduler(); - func = new Callable() { + func = new Supplier() { int count = 1; @Override - public Integer call() { + public Integer get() { return count++; } }; - funcError = new Callable() { + funcError = new Supplier() { int count = 1; @Override - public Integer call() { + public Integer get() { if (count == 2) { throw new RuntimeException("Forced failure!"); } @@ -86,10 +84,12 @@ void observe(Maybe source) { source.test().assertNoValues().assertNoErrors(); } + @SuppressWarnings("unchecked") void observe(Maybe source, T value) { source.test().assertResult(value); } + @SuppressWarnings("unchecked") void observeError(Maybe source, Class error) { source.test().assertFailure(error); } diff --git a/src/test/java/hu/akarnokd/rxjava2/expr/StatementObservableTest.java b/src/test/java/hu/akarnokd/rxjava3/expr/StatementObservableTest.java similarity index 95% rename from src/test/java/hu/akarnokd/rxjava2/expr/StatementObservableTest.java rename to src/test/java/hu/akarnokd/rxjava3/expr/StatementObservableTest.java index 5c35728f..5c643556 100644 --- a/src/test/java/hu/akarnokd/rxjava2/expr/StatementObservableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/expr/StatementObservableTest.java @@ -14,22 +14,21 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; import java.util.*; -import java.util.concurrent.Callable; import org.junit.*; import org.mockito.MockitoAnnotations; import io.reactivex.Observable; -import io.reactivex.functions.BooleanSupplier; +import io.reactivex.functions.*; import io.reactivex.schedulers.*; public class StatementObservableTest { TestScheduler scheduler; - Callable func; - Callable funcError; + Supplier func; + Supplier funcError; BooleanSupplier condition; BooleanSupplier conditionError; int numRecursion = 250; @@ -38,19 +37,19 @@ public class StatementObservableTest { public void before() { MockitoAnnotations.initMocks(this); scheduler = new TestScheduler(); - func = new Callable() { + func = new Supplier() { int count = 1; @Override - public Integer call() { + public Integer get() { return count++; } }; - funcError = new Callable() { + funcError = new Supplier() { int count = 1; @Override - public Integer call() { + public Integer get() { if (count == 2) { throw new RuntimeException("Forced failure!"); } @@ -87,7 +86,7 @@ void observe(Observable source, T... values) { } void observeSequence(Observable source, Iterable values) { - source.test().assertValueSequence(values).assertNoErrors().assertComplete().assertSubscribed(); + source.test().assertValueSequence(values).assertNoErrors().assertComplete(); } void observeError(Observable source, Class error, T... valuesBeforeError) { @@ -95,7 +94,7 @@ void observeError(Observable source, Class error, T. } void observeSequenceError(Observable source, Class error, Iterable valuesBeforeError) { - source.test().assertValueSequence(valuesBeforeError).assertError(error).assertNotComplete().assertSubscribed(); + source.test().assertValueSequence(valuesBeforeError).assertError(error).assertNotComplete(); } @Test @@ -280,7 +279,7 @@ public void testDoWhile() { } @Test - public void testDoWhileOnce() throws Exception { + public void testDoWhileOnce() throws Throwable { Observable source1 = Observable.just(1, 2, 3); condition.getAsBoolean(); // toggle to false @@ -290,7 +289,7 @@ public void testDoWhileOnce() throws Exception { } @Test - public void testDoWhileConditionThrows() throws Exception { + public void testDoWhileConditionThrows() throws Throwable { Observable source1 = Observable.just(1, 2, 3); conditionError.getAsBoolean(); Observable result = StatementObservable.doWhile(source1, conditionError); @@ -384,7 +383,7 @@ public void testWhileDoConditionThrows() { } @Test - public void testWhileDoConditionThrowsImmediately() throws Exception { + public void testWhileDoConditionThrowsImmediately() throws Throwable { Observable source1 = Observable.just(1, 2, 3); conditionError.getAsBoolean(); Observable result = StatementObservable.whileDo(source1, conditionError); diff --git a/src/test/java/hu/akarnokd/rxjava2/expr/StatementSingleTest.java b/src/test/java/hu/akarnokd/rxjava3/expr/StatementSingleTest.java similarity index 93% rename from src/test/java/hu/akarnokd/rxjava2/expr/StatementSingleTest.java rename to src/test/java/hu/akarnokd/rxjava3/expr/StatementSingleTest.java index f289b1e8..f6f20775 100644 --- a/src/test/java/hu/akarnokd/rxjava2/expr/StatementSingleTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/expr/StatementSingleTest.java @@ -14,24 +14,21 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.expr; +package hu.akarnokd.rxjava3.expr; -import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.functions.BooleanSupplier; -import io.reactivex.schedulers.TestScheduler; -import org.junit.Before; -import org.junit.Test; +import java.util.*; + +import org.junit.*; import org.mockito.MockitoAnnotations; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.Callable; +import io.reactivex.Single; +import io.reactivex.functions.*; +import io.reactivex.schedulers.TestScheduler; public class StatementSingleTest { TestScheduler scheduler; - Callable func; - Callable funcError; + Supplier func; + Supplier funcError; BooleanSupplier condition; BooleanSupplier conditionError; @@ -39,19 +36,19 @@ public class StatementSingleTest { public void before() { MockitoAnnotations.initMocks(this); scheduler = new TestScheduler(); - func = new Callable() { + func = new Supplier() { int count = 1; @Override - public Integer call() { + public Integer get() { return count++; } }; - funcError = new Callable() { + funcError = new Supplier() { int count = 1; @Override - public Integer call() { + public Integer get() { if (count == 2) { throw new RuntimeException("Forced failure!"); } @@ -83,10 +80,12 @@ public boolean getAsBoolean() { }; } + @SuppressWarnings("unchecked") void observe(Single source, T value) { source.test().assertResult(value); } + @SuppressWarnings("unchecked") void observeError(Single source, Class error) { source.test().assertFailure(error); } diff --git a/src/test/java/hu/akarnokd/rxjava2/functions/FunctionTaggingTest.java b/src/test/java/hu/akarnokd/rxjava3/functions/FunctionTaggingTest.java similarity index 96% rename from src/test/java/hu/akarnokd/rxjava2/functions/FunctionTaggingTest.java rename to src/test/java/hu/akarnokd/rxjava3/functions/FunctionTaggingTest.java index ce4b55ee..63db46ae 100644 --- a/src/test/java/hu/akarnokd/rxjava2/functions/FunctionTaggingTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/functions/FunctionTaggingTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.functions; +package hu.akarnokd.rxjava3.functions; import static org.junit.Assert.*; @@ -23,8 +23,8 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.functions.FunctionTagging.FunctionTaggingException; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.functions.FunctionTagging.FunctionTaggingException; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.functions.*; import io.reactivex.internal.functions.Functions; import io.reactivex.plugins.RxJavaPlugins; @@ -89,7 +89,7 @@ public void addLastWhenLoopCause() { } @Test - public void f1Tag() throws Exception { + public void f1Tag() throws Throwable { boolean enabled = FunctionTagging.isEnabled(); try { FunctionTagging.disable(); @@ -114,7 +114,7 @@ public void f1Tag() throws Exception { f = FunctionTagging.tagFunction(new Function() { @Override - public Integer apply(Integer a) throws Exception { + public Integer apply(Integer a) throws Throwable { return null; } }, "Custom tag"); @@ -128,7 +128,7 @@ public Integer apply(Integer a) throws Exception { f = FunctionTagging.tagFunction(new Function() { @Override - public Integer apply(Integer a) throws Exception { + public Integer apply(Integer a) throws Throwable { throw new IOException(); } }, "Custom tag"); @@ -148,14 +148,14 @@ public Integer apply(Integer a) throws Exception { } @Test - public void f2Tag() throws Exception { + public void f2Tag() throws Throwable { boolean enabled = FunctionTagging.isEnabled(); try { FunctionTagging.disable(); BiFunction f = FunctionTagging.tagBiFunction(new BiFunction() { @Override - public Integer apply(Integer a, Integer b) throws Exception { + public Integer apply(Integer a, Integer b) throws Throwable { return a; } }, "Custom tag"); @@ -165,7 +165,7 @@ public Integer apply(Integer a, Integer b) throws Exception { f = FunctionTagging.tagBiFunction(new BiFunction() { @Override - public Integer apply(Integer a, Integer b) throws Exception { + public Integer apply(Integer a, Integer b) throws Throwable { return b; } }, "Custom tag"); @@ -179,7 +179,7 @@ public Integer apply(Integer a, Integer b) throws Exception { f = FunctionTagging.tagBiFunction(new BiFunction() { @Override - public Integer apply(Integer a, Integer b) throws Exception { + public Integer apply(Integer a, Integer b) throws Throwable { return a; } }, "Custom tag"); @@ -195,7 +195,7 @@ public Integer apply(Integer a, Integer b) throws Exception { f = FunctionTagging.tagBiFunction(new BiFunction() { @Override - public Integer apply(Integer a, Integer b) throws Exception { + public Integer apply(Integer a, Integer b) throws Throwable { return b; } }, "Custom tag"); @@ -213,7 +213,7 @@ public Integer apply(Integer a, Integer b) throws Exception { f = FunctionTagging.tagBiFunction(new BiFunction() { @Override - public Integer apply(Integer a, Integer b) throws Exception { + public Integer apply(Integer a, Integer b) throws Throwable { return null; } }, "Custom tag"); @@ -227,7 +227,7 @@ public Integer apply(Integer a, Integer b) throws Exception { f = FunctionTagging.tagBiFunction(new BiFunction() { @Override - public Integer apply(Integer a, Integer b) throws Exception { + public Integer apply(Integer a, Integer b) throws Throwable { throw new IOException(); } }, "Custom tag"); @@ -247,14 +247,14 @@ public Integer apply(Integer a, Integer b) throws Exception { } @Test - public void f3Tag() throws Exception { + public void f3Tag() throws Throwable { boolean enabled = FunctionTagging.isEnabled(); try { FunctionTagging.disable(); Function3 f = FunctionTagging.tagFunction3(new Function3() { @Override - public Integer apply(Integer a, Integer b, Integer c) throws Exception { + public Integer apply(Integer a, Integer b, Integer c) throws Throwable { return a; } }, "Custom tag"); @@ -264,7 +264,7 @@ public Integer apply(Integer a, Integer b, Integer c) throws Exception { f = FunctionTagging.tagFunction3(new Function3() { @Override - public Integer apply(Integer a, Integer b, Integer c) throws Exception { + public Integer apply(Integer a, Integer b, Integer c) throws Throwable { return b; } }, "Custom tag"); @@ -274,7 +274,7 @@ public Integer apply(Integer a, Integer b, Integer c) throws Exception { f = FunctionTagging.tagFunction3(new Function3() { @Override - public Integer apply(Integer a, Integer b, Integer c) throws Exception { + public Integer apply(Integer a, Integer b, Integer c) throws Throwable { return c; } }, "Custom tag"); @@ -288,7 +288,7 @@ public Integer apply(Integer a, Integer b, Integer c) throws Exception { f = FunctionTagging.tagFunction3(new Function3() { @Override - public Integer apply(Integer a, Integer b, Integer c) throws Exception { + public Integer apply(Integer a, Integer b, Integer c) throws Throwable { return a; } }, "Custom tag"); @@ -304,7 +304,7 @@ public Integer apply(Integer a, Integer b, Integer c) throws Exception { f = FunctionTagging.tagFunction3(new Function3() { @Override - public Integer apply(Integer a, Integer b, Integer c) throws Exception { + public Integer apply(Integer a, Integer b, Integer c) throws Throwable { return b; } }, "Custom tag"); @@ -320,7 +320,7 @@ public Integer apply(Integer a, Integer b, Integer c) throws Exception { f = FunctionTagging.tagFunction3(new Function3() { @Override - public Integer apply(Integer a, Integer b, Integer c) throws Exception { + public Integer apply(Integer a, Integer b, Integer c) throws Throwable { return c; } }, "Custom tag"); @@ -338,7 +338,7 @@ public Integer apply(Integer a, Integer b, Integer c) throws Exception { f = FunctionTagging.tagFunction3(new Function3() { @Override - public Integer apply(Integer a, Integer b, Integer c) throws Exception { + public Integer apply(Integer a, Integer b, Integer c) throws Throwable { return null; } }, "Custom tag"); @@ -352,7 +352,7 @@ public Integer apply(Integer a, Integer b, Integer c) throws Exception { f = FunctionTagging.tagFunction3(new Function3() { @Override - public Integer apply(Integer a, Integer b, Integer c) throws Exception { + public Integer apply(Integer a, Integer b, Integer c) throws Throwable { throw new IOException(); } }, "Custom tag"); @@ -372,7 +372,7 @@ public Integer apply(Integer a, Integer b, Integer c) throws Exception { } @Test - public void f4Tag() throws Exception { + public void f4Tag() throws Throwable { boolean enabled = FunctionTagging.isEnabled(); try { FunctionTagging.disable(); @@ -380,7 +380,7 @@ public void f4Tag() throws Exception { Function4 f = FunctionTagging.tagFunction4( new Function4() { @Override - public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exception { + public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Throwable { return a; } }, "Custom tag"); @@ -391,7 +391,7 @@ public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exceptio f = FunctionTagging.tagFunction4( new Function4() { @Override - public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exception { + public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Throwable { return b; } }, "Custom tag"); @@ -402,7 +402,7 @@ public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exceptio f = FunctionTagging.tagFunction4( new Function4() { @Override - public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exception { + public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Throwable { return c; } }, "Custom tag"); @@ -413,7 +413,7 @@ public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exceptio f = FunctionTagging.tagFunction4( new Function4() { @Override - public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exception { + public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Throwable { return d; } }, "Custom tag"); @@ -428,7 +428,7 @@ public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exceptio f = FunctionTagging.tagFunction4( new Function4() { @Override - public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exception { + public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Throwable { return a; } }, "Custom tag"); @@ -445,7 +445,7 @@ public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exceptio f = FunctionTagging.tagFunction4( new Function4() { @Override - public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exception { + public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Throwable { return b; } }, "Custom tag"); @@ -462,7 +462,7 @@ public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exceptio f = FunctionTagging.tagFunction4( new Function4() { @Override - public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exception { + public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Throwable { return c; } }, "Custom tag"); @@ -479,7 +479,7 @@ public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exceptio f = FunctionTagging.tagFunction4( new Function4() { @Override - public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exception { + public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Throwable { return d; } }, "Custom tag"); @@ -498,7 +498,7 @@ public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exceptio f = FunctionTagging.tagFunction4( new Function4() { @Override - public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exception { + public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Throwable { return null; } }, "Custom tag"); @@ -513,7 +513,7 @@ public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exceptio f = FunctionTagging.tagFunction4( new Function4() { @Override - public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exception { + public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Throwable { throw new IOException(); } }, "Custom tag"); @@ -533,7 +533,7 @@ public Integer apply(Integer a, Integer b, Integer c, Integer d) throws Exceptio } @Test - public void f5Tag() throws Exception { + public void f5Tag() throws Throwable { boolean enabled = FunctionTagging.isEnabled(); try { FunctionTagging.disable(); @@ -620,7 +620,7 @@ public void f5Tag() throws Exception { } @Test - public void f6Tag() throws Exception { + public void f6Tag() throws Throwable { boolean enabled = FunctionTagging.isEnabled(); try { Function6 f; @@ -721,7 +721,7 @@ public void f6Tag() throws Exception { } @Test - public void f7Tag() throws Exception { + public void f7Tag() throws Throwable { boolean enabled = FunctionTagging.isEnabled(); try { Function7 f; @@ -827,7 +827,7 @@ public void f7Tag() throws Exception { } @Test - public void f8Tag() throws Exception { + public void f8Tag() throws Throwable { boolean enabled = FunctionTagging.isEnabled(); try { Function8 f; @@ -938,7 +938,7 @@ public void f8Tag() throws Exception { } @Test - public void f9Tag() throws Exception { + public void f9Tag() throws Throwable { boolean enabled = FunctionTagging.isEnabled(); try { Function9 f; @@ -1073,7 +1073,7 @@ static final class FunctionTaggingComposite implements @Override public Integer apply(Integer t1, Integer t2, Integer t3, Integer t4, Integer t5, Integer t6, Integer t7, Integer t8, Integer t9) - throws Exception { + throws Throwable { if (crash) { throw new IOException(); } @@ -1098,7 +1098,7 @@ public Integer apply(Integer t1, Integer t2, Integer t3, Integer t4, @Override public Integer apply(Integer t1, Integer t2, Integer t3, Integer t4, Integer t5, Integer t6, Integer t7, Integer t8) - throws Exception { + throws Throwable { if (crash) { throw new IOException(); } @@ -1121,7 +1121,7 @@ public Integer apply(Integer t1, Integer t2, Integer t3, Integer t4, @Override public Integer apply(Integer t1, Integer t2, Integer t3, Integer t4, - Integer t5, Integer t6, Integer t7) throws Exception { + Integer t5, Integer t6, Integer t7) throws Throwable { if (crash) { throw new IOException(); } @@ -1143,7 +1143,7 @@ public Integer apply(Integer t1, Integer t2, Integer t3, Integer t4, @Override public Integer apply(Integer t1, Integer t2, Integer t3, Integer t4, - Integer t5, Integer t6) throws Exception { + Integer t5, Integer t6) throws Throwable { if (crash) { throw new IOException(); } @@ -1164,7 +1164,7 @@ public Integer apply(Integer t1, Integer t2, Integer t3, Integer t4, @Override public Integer apply(Integer t1, Integer t2, Integer t3, Integer t4, - Integer t5) throws Exception { + Integer t5) throws Throwable { if (crash) { throw new IOException(); } diff --git a/src/test/java/hu/akarnokd/rxjava2/joins/OperatorJoinsTest.java b/src/test/java/hu/akarnokd/rxjava3/joins/OperatorJoinsTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/joins/OperatorJoinsTest.java rename to src/test/java/hu/akarnokd/rxjava3/joins/OperatorJoinsTest.java index b2ac8aed..01314df3 100644 --- a/src/test/java/hu/akarnokd/rxjava2/joins/OperatorJoinsTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/joins/OperatorJoinsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.joins; +package hu.akarnokd.rxjava3.joins; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; @@ -25,7 +25,7 @@ import org.junit.*; import org.mockito.*; -import hu.akarnokd.rxjava2.test.TestException; +import hu.akarnokd.rxjava3.test.TestException; import io.reactivex.*; import io.reactivex.functions.*; import io.reactivex.internal.functions.Functions; @@ -470,10 +470,10 @@ public void whenComplicated() { zs.onComplete(); // t == 300, completed 3, triggers when() oncompleted - System.out.println("Events: " + to.valueCount()); + System.out.println("Events: " + to.values().size()); to.assertValues(7, 16, 7, -4); - to.assertTerminated(); + to.assertNoErrors().assertComplete(); InOrder inOrder = inOrder(observer); diff --git a/src/test/java/hu/akarnokd/rxjava2/math/MathFlowableTest.java b/src/test/java/hu/akarnokd/rxjava3/math/MathFlowableTest.java similarity index 96% rename from src/test/java/hu/akarnokd/rxjava2/math/MathFlowableTest.java rename to src/test/java/hu/akarnokd/rxjava3/math/MathFlowableTest.java index c68d0b5e..063edcce 100644 --- a/src/test/java/hu/akarnokd/rxjava2/math/MathFlowableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/math/MathFlowableTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; -import static hu.akarnokd.rxjava2.math.MathFlowable.*; +import static hu.akarnokd.rxjava3.math.MathFlowable.*; import org.junit.Test; -import hu.akarnokd.rxjava2.test.BaseTest; +import hu.akarnokd.rxjava3.test.BaseTest; import io.reactivex.Flowable; public class MathFlowableTest extends BaseTest { diff --git a/src/test/java/hu/akarnokd/rxjava2/math/MathObservableTest.java b/src/test/java/hu/akarnokd/rxjava3/math/MathObservableTest.java similarity index 96% rename from src/test/java/hu/akarnokd/rxjava2/math/MathObservableTest.java rename to src/test/java/hu/akarnokd/rxjava3/math/MathObservableTest.java index 870b1fd8..4938015d 100644 --- a/src/test/java/hu/akarnokd/rxjava2/math/MathObservableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/math/MathObservableTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.math; +package hu.akarnokd.rxjava3.math; -import static hu.akarnokd.rxjava2.math.MathObservable.*; +import static hu.akarnokd.rxjava3.math.MathObservable.*; import org.junit.Test; -import hu.akarnokd.rxjava2.test.BaseTest; +import hu.akarnokd.rxjava3.test.BaseTest; import io.reactivex.Observable; public class MathObservableTest extends BaseTest { diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalCompletableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletableTest.java similarity index 83% rename from src/test/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalCompletableTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletableTest.java index 6193ec69..ad5b548d 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalCompletableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletableTest.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertEquals; -import java.util.concurrent.Callable; - import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.subjects.CompletableSubject; public class CompletableFlatMapSignalCompletableTest { @@ -35,9 +33,9 @@ public void normal() { Completable.complete() .compose(CompletableTransformers.flatMap( - new Callable() { + new Supplier() { @Override - public CompletableSource call() throws Exception { + public CompletableSource get() throws Exception { counts[0]++; return Completable.complete(); } @@ -64,9 +62,9 @@ public void error() { Completable.error(new TestException()) .compose(CompletableTransformers.flatMap( - new Callable() { + new Supplier() { @Override - public CompletableSource call() throws Exception { + public CompletableSource get() throws Exception { counts[0]++; return Completable.complete(); } @@ -93,9 +91,9 @@ public void normalCrash() { Completable.complete() .compose(CompletableTransformers.flatMap( - new Callable() { + new Supplier() { @Override - public CompletableSource call() throws Exception { + public CompletableSource get() throws Exception { counts[0]++; throw new TestException("onComplete"); } @@ -110,7 +108,8 @@ public CompletableSource apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onComplete"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onComplete")); assertEquals(1, counts[0]); assertEquals(0, counts[1]); @@ -122,9 +121,9 @@ public void errorCrash() { Completable.error(new TestException("main")) .compose(CompletableTransformers.flatMap( - new Callable() { + new Supplier() { @Override - public CompletableSource call() throws Exception { + public CompletableSource get() throws Exception { counts[0]++; throw new TestException("onComplete"); } @@ -139,7 +138,8 @@ public CompletableSource apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onError"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onError")); assertEquals(0, counts[0]); assertEquals(1, counts[1]); @@ -149,9 +149,9 @@ public CompletableSource apply(Throwable e) public void disposed() { TestHelper.checkDisposed(CompletableSubject.create() .compose(CompletableTransformers.flatMap( - new Callable() { + new Supplier() { @Override - public CompletableSource call() throws Exception { + public CompletableSource get() throws Exception { return Completable.complete(); } }, @@ -172,9 +172,9 @@ public void doubleOnSubscribe() { @Override public CompletableSource apply(Completable c) throws Exception { return c.compose(CompletableTransformers.flatMap( - new Callable() { + new Supplier() { @Override - public CompletableSource call() throws Exception { + public CompletableSource get() throws Exception { return Completable.complete(); } }, diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalFlowableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowableTest.java similarity index 80% rename from src/test/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalFlowableTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowableTest.java index 2ef1824e..9d549d3b 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalFlowableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowableTest.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertEquals; -import java.util.concurrent.Callable; - import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.subjects.CompletableSubject; import io.reactivex.subscribers.TestSubscriber; @@ -35,10 +33,10 @@ public void success() { final int[] counts = { 0, 0 }; Completable.complete() - .as(Completables.flatMapFlowable( - new Callable>() { + .to(Completables.flatMapFlowable( + new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { counts[0]++; return Flowable.just(1); } @@ -64,10 +62,10 @@ public void empty() { final int[] counts = { 0, 0 }; Completable.complete() - .as(Completables.flatMapFlowable( - new Callable>() { + .to(Completables.flatMapFlowable( + new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { counts[0]++; return Flowable.empty(); } @@ -93,10 +91,10 @@ public void error() { final int[] counts = { 0, 0 }; Completable.error(new TestException()) - .as(Completables.flatMapFlowable( - new Callable>() { + .to(Completables.flatMapFlowable( + new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { counts[0]++; return Flowable.empty(); } @@ -120,9 +118,9 @@ public Flowable apply(Throwable e) @Test public void backpressure() { TestSubscriber ts = Completable.complete() - .as(Completables.flatMapFlowable(new Callable>() { + .to(Completables.flatMapFlowable(new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { return Flowable.range(1, 5); } }, @@ -155,10 +153,10 @@ public void normalCrash() { final int[] counts = { 0, 0 }; Completable.complete() - .as(Completables.flatMapFlowable( - new Callable>() { + .to(Completables.flatMapFlowable( + new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { counts[0]++; throw new TestException("onComplete"); } @@ -173,7 +171,8 @@ public Flowable apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onComplete"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onComplete")); assertEquals(1, counts[0]); assertEquals(0, counts[1]); @@ -184,10 +183,10 @@ public void errorCrash() { final int[] counts = { 0, 0 }; Completable.error(new TestException("main")) - .as(Completables.flatMapFlowable( - new Callable>() { + .to(Completables.flatMapFlowable( + new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { counts[0]++; throw new TestException("onComplete"); } @@ -202,7 +201,8 @@ public Flowable apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onError"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onError")); assertEquals(0, counts[0]); assertEquals(1, counts[1]); @@ -211,10 +211,10 @@ public Flowable apply(Throwable e) @Test public void disposed() { TestHelper.checkDisposed(CompletableSubject.create() - .as(Completables.flatMapFlowable( - new Callable>() { + .to(Completables.flatMapFlowable( + new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { return Flowable.empty(); } }, @@ -234,10 +234,10 @@ public void doubleOnSubscribe() { TestHelper.checkDoubleOnSubscribeCompletableToFlowable(new Function>() { @Override public Flowable apply(Completable c) throws Exception { - return c.as(Completables.flatMapFlowable( - new Callable>() { + return c.to(Completables.flatMapFlowable( + new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { return Flowable.empty(); } }, diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalMaybeTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybeTest.java similarity index 80% rename from src/test/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalMaybeTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybeTest.java index 7c8d0552..5ff3721c 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalMaybeTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybeTest.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertEquals; -import java.util.concurrent.Callable; - import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.subjects.CompletableSubject; public class CompletableFlatMapSignalMaybeTest { @@ -34,10 +32,10 @@ public void success() { final int[] counts = { 0, 0 }; Completable.complete() - .as(Completables.flatMapMaybe( - new Callable>() { + .to(Completables.flatMapMaybe( + new Supplier>() { @Override - public Maybe call() throws Exception { + public Maybe get() throws Exception { counts[0]++; return Maybe.just(1); } @@ -63,10 +61,10 @@ public void empty() { final int[] counts = { 0, 0 }; Completable.complete() - .as(Completables.flatMapMaybe( - new Callable>() { + .to(Completables.flatMapMaybe( + new Supplier>() { @Override - public Maybe call() throws Exception { + public Maybe get() throws Exception { counts[0]++; return Maybe.empty(); } @@ -92,10 +90,10 @@ public void error() { final int[] counts = { 0, 0 }; Completable.error(new TestException()) - .as(Completables.flatMapMaybe( - new Callable>() { + .to(Completables.flatMapMaybe( + new Supplier>() { @Override - public Maybe call() throws Exception { + public Maybe get() throws Exception { counts[0]++; return Maybe.empty(); } @@ -121,10 +119,10 @@ public void normalCrash() { final int[] counts = { 0, 0 }; Completable.complete() - .as(Completables.flatMapMaybe( - new Callable>() { + .to(Completables.flatMapMaybe( + new Supplier>() { @Override - public Maybe call() throws Exception { + public Maybe get() throws Exception { counts[0]++; throw new TestException("onComplete"); } @@ -139,7 +137,8 @@ public Maybe apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onComplete"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onComplete")); assertEquals(1, counts[0]); assertEquals(0, counts[1]); @@ -150,10 +149,10 @@ public void errorCrash() { final int[] counts = { 0, 0 }; Completable.error(new TestException("main")) - .as(Completables.flatMapMaybe( - new Callable>() { + .to(Completables.flatMapMaybe( + new Supplier>() { @Override - public Maybe call() throws Exception { + public Maybe get() throws Exception { counts[0]++; throw new TestException("onComplete"); } @@ -168,7 +167,8 @@ public Maybe apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onError"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onError")); assertEquals(0, counts[0]); assertEquals(1, counts[1]); @@ -177,10 +177,10 @@ public Maybe apply(Throwable e) @Test public void disposed() { TestHelper.checkDisposed(CompletableSubject.create() - .as(Completables.flatMapMaybe( - new Callable>() { + .to(Completables.flatMapMaybe( + new Supplier>() { @Override - public Maybe call() throws Exception { + public Maybe get() throws Exception { return Maybe.empty(); } }, @@ -200,10 +200,10 @@ public void doubleOnSubscribe() { TestHelper.checkDoubleOnSubscribeCompletableToMaybe(new Function>() { @Override public Maybe apply(Completable c) throws Exception { - return c.as(Completables.flatMapMaybe( - new Callable>() { + return c.to(Completables.flatMapMaybe( + new Supplier>() { @Override - public Maybe call() throws Exception { + public Maybe get() throws Exception { return Maybe.empty(); } }, diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalObservableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservableTest.java similarity index 79% rename from src/test/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalObservableTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservableTest.java index 518c4efd..f0c33092 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalObservableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservableTest.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertEquals; -import java.util.concurrent.Callable; - import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.subjects.CompletableSubject; public class CompletableFlatMapSignalObservableTest { @@ -34,10 +32,10 @@ public void success() { final int[] counts = { 0, 0 }; Completable.complete() - .as(Completables.flatMapObservable( - new Callable>() { + .to(Completables.flatMapObservable( + new Supplier>() { @Override - public Observable call() throws Exception { + public Observable get() throws Exception { counts[0]++; return Observable.just(1); } @@ -63,10 +61,10 @@ public void empty() { final int[] counts = { 0, 0 }; Completable.complete() - .as(Completables.flatMapObservable( - new Callable>() { + .to(Completables.flatMapObservable( + new Supplier>() { @Override - public Observable call() throws Exception { + public Observable get() throws Exception { counts[0]++; return Observable.empty(); } @@ -92,10 +90,10 @@ public void error() { final int[] counts = { 0, 0 }; Completable.error(new TestException()) - .as(Completables.flatMapObservable( - new Callable>() { + .to(Completables.flatMapObservable( + new Supplier>() { @Override - public Observable call() throws Exception { + public Observable get() throws Exception { counts[0]++; return Observable.empty(); } @@ -121,10 +119,10 @@ public void normalCrash() { final int[] counts = { 0, 0 }; Completable.complete() - .as(Completables.flatMapObservable( - new Callable>() { + .to(Completables.flatMapObservable( + new Supplier>() { @Override - public Observable call() throws Exception { + public Observable get() throws Exception { counts[0]++; throw new TestException("onComplete"); } @@ -139,7 +137,8 @@ public Observable apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onComplete"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onComplete")); assertEquals(1, counts[0]); assertEquals(0, counts[1]); @@ -150,10 +149,10 @@ public void errorCrash() { final int[] counts = { 0, 0 }; Completable.error(new TestException("main")) - .as(Completables.flatMapObservable( - new Callable>() { + .to(Completables.flatMapObservable( + new Supplier>() { @Override - public Observable call() throws Exception { + public Observable get() throws Exception { counts[0]++; throw new TestException("onComplete"); } @@ -168,7 +167,8 @@ public Observable apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onError"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onError")); assertEquals(0, counts[0]); assertEquals(1, counts[1]); @@ -177,10 +177,10 @@ public Observable apply(Throwable e) @Test public void disposed() { TestHelper.checkDisposed(CompletableSubject.create() - .as(Completables.flatMapObservable( - new Callable>() { + .to(Completables.flatMapObservable( + new Supplier>() { @Override - public Observable call() throws Exception { + public Observable get() throws Exception { return Observable.empty(); } }, @@ -200,10 +200,10 @@ public void doubleOnSubscribe() { TestHelper.checkDoubleOnSubscribeCompletableToObservable(new Function>() { @Override public Observable apply(Completable c) throws Exception { - return c.as(Completables.flatMapObservable( - new Callable>() { + return c.to(Completables.flatMapObservable( + new Supplier>() { @Override - public Observable call() throws Exception { + public Observable get() throws Exception { return Observable.empty(); } }, diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalSingleTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingleTest.java similarity index 79% rename from src/test/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalSingleTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingleTest.java index 89cb20f5..398044f3 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/CompletableFlatMapSignalSingleTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingleTest.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertEquals; -import java.util.concurrent.Callable; - import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.subjects.CompletableSubject; public class CompletableFlatMapSignalSingleTest { @@ -34,10 +32,10 @@ public void success() { final int[] counts = { 0, 0 }; Completable.complete() - .as(Completables.flatMapSingle( - new Callable>() { + .to(Completables.flatMapSingle( + new Supplier>() { @Override - public Single call() throws Exception { + public Single get() throws Exception { counts[0]++; return Single.just(1); } @@ -63,10 +61,10 @@ public void error() { final int[] counts = { 0, 0 }; Completable.error(new TestException()) - .as(Completables.flatMapSingle( - new Callable>() { + .to(Completables.flatMapSingle( + new Supplier>() { @Override - public Single call() throws Exception { + public Single get() throws Exception { counts[0]++; return Single.just(1); } @@ -92,10 +90,10 @@ public void normalCrash() { final int[] counts = { 0, 0 }; Completable.complete() - .as(Completables.flatMapSingle( - new Callable>() { + .to(Completables.flatMapSingle( + new Supplier>() { @Override - public Single call() throws Exception { + public Single get() throws Exception { counts[0]++; throw new TestException("onComplete"); } @@ -110,7 +108,8 @@ public Single apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onComplete"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onComplete")); assertEquals(1, counts[0]); assertEquals(0, counts[1]); @@ -121,10 +120,10 @@ public void errorCrash() { final int[] counts = { 0, 0 }; Completable.error(new TestException("main")) - .as(Completables.flatMapSingle( - new Callable>() { + .to(Completables.flatMapSingle( + new Supplier>() { @Override - public Single call() throws Exception { + public Single get() throws Exception { counts[0]++; throw new TestException("onComplete"); } @@ -139,7 +138,8 @@ public Single apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onError"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onError")); assertEquals(0, counts[0]); assertEquals(1, counts[1]); @@ -148,10 +148,10 @@ public Single apply(Throwable e) @Test public void disposed() { TestHelper.checkDisposed(CompletableSubject.create() - .as(Completables.flatMapSingle( - new Callable>() { + .to(Completables.flatMapSingle( + new Supplier>() { @Override - public Single call() throws Exception { + public Single get() throws Exception { return Single.just(1); } }, @@ -171,10 +171,10 @@ public void doubleOnSubscribe() { TestHelper.checkDoubleOnSubscribeCompletableToSingle(new Function>() { @Override public Single apply(Completable c) throws Exception { - return c.as(Completables.flatMapSingle( - new Callable>() { + return c.to(Completables.flatMapSingle( + new Supplier>() { @Override - public Single call() throws Exception { + public Single get() throws Exception { return Single.just(1); } }, diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/CompletableTransformersTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableTransformersTest.java similarity index 90% rename from src/test/java/hu/akarnokd/rxjava2/operators/CompletableTransformersTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/CompletableTransformersTest.java index de0bef2f..779e3f6c 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/CompletableTransformersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableTransformersTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; public class CompletableTransformersTest { diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/CompletablesTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/CompletablesTest.java similarity index 90% rename from src/test/java/hu/akarnokd/rxjava2/operators/CompletablesTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/CompletablesTest.java index d706aa91..55180940 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/CompletablesTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/CompletablesTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; public class CompletablesTest { diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableBufferPredicateTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java similarity index 96% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableBufferPredicateTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java index 7b9846e4..a3948a7f 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableBufferPredicateTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java @@ -14,18 +14,17 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; import java.util.*; -import java.util.concurrent.Callable; import org.junit.Test; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.Flowable; -import io.reactivex.functions.Predicate; +import io.reactivex.functions.*; import io.reactivex.internal.subscriptions.BooleanSubscription; import io.reactivex.plugins.RxJavaPlugins; @@ -310,9 +309,9 @@ public void bufferSupplierCrash0() { public boolean test(Integer v) throws Exception { return v == -1; } - }, new Callable>() { + }, new Supplier>() { @Override - public List call() throws Exception { + public List get() throws Exception { throw new IllegalArgumentException(); } })) @@ -329,10 +328,10 @@ public void bufferSupplierCrash1() { public boolean test(Integer v) throws Exception { return v == -1; } - }, new Callable>() { + }, new Supplier>() { int c; @Override - public List call() throws Exception { + public List get() throws Exception { if (c++ == 1) { throw new IllegalArgumentException(); } @@ -352,10 +351,10 @@ public void bufferSupplierCrash2() { public boolean test(Integer v) throws Exception { return v != -1; } - }, new Callable>() { + }, new Supplier>() { int c; @Override - public List call() throws Exception { + public List get() throws Exception { if (c++ == 1) { throw new IllegalArgumentException(); } @@ -375,10 +374,10 @@ public void bufferSupplierCrash3() { public boolean test(Integer v) throws Exception { return v == -1; } - }, new Callable>() { + }, new Supplier>() { int c; @Override - public List call() throws Exception { + public List get() throws Exception { if (c++ == 1) { throw new IllegalArgumentException(); } diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableCacheLastTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableCacheLastTest.java similarity index 97% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableCacheLastTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableCacheLastTest.java index 389dd70e..4fb36d18 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableCacheLastTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableCacheLastTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertEquals; @@ -23,7 +23,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.Flowable; import io.reactivex.functions.Consumer; import io.reactivex.schedulers.Schedulers; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableCoalesceTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableCoalesceTest.java similarity index 96% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableCoalesceTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableCoalesceTest.java index 171374e7..65b1d989 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableCoalesceTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableCoalesceTest.java @@ -14,17 +14,16 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; import java.util.*; -import java.util.concurrent.Callable; import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.Flowable; -import io.reactivex.functions.BiConsumer; +import io.reactivex.functions.*; import io.reactivex.internal.functions.Functions; import io.reactivex.processors.PublishProcessor; import io.reactivex.schedulers.Schedulers; @@ -32,7 +31,7 @@ public class FlowableCoalesceTest { - Callable> listSupplier = Functions.createArrayList(16); + Supplier> listSupplier = Functions.createArrayList(16); BiConsumer, Integer> listAdd = new BiConsumer, Integer>() { @Override diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableDebounceFirstTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirstTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableDebounceFirstTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirstTest.java index 3696e49a..92bfe409 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableDebounceFirstTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirstTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; import java.util.concurrent.TimeUnit; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableErrorJumpTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableErrorJumpTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableErrorJumpTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableErrorJumpTest.java index f436ddd2..e853efe0 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableErrorJumpTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableErrorJumpTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.*; import org.junit.Test; import org.reactivestreams.Publisher; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; import io.reactivex.exceptions.CompositeException; import io.reactivex.subscribers.TestSubscriber; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableEveryTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableEveryTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableEveryTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableEveryTest.java index 984a56c3..cd1b06f9 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableEveryTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableEveryTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableExpandTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableExpandTest.java similarity index 97% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableExpandTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableExpandTest.java index dd3620b7..632ee581 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableExpandTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableExpandTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; import java.util.*; @@ -24,7 +24,7 @@ import org.junit.*; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.*; import io.reactivex.functions.Function; import io.reactivex.internal.functions.Functions; @@ -107,7 +107,6 @@ public void recursiveCountdown() { .compose(FlowableTransformers.expand(countDown, strategy)) .test() .withTag(tag) - .assertSubscribed() .assertNoErrors() .assertComplete() .assertValueCount(i + 1); @@ -539,7 +538,9 @@ public Publisher apply(Integer v) } }, ExpandStrategy.DEPTH_FIRST)) .test() - .assertFailureAndMessage(IOException.class, "error", 10, 9); + .assertFailure(IOException.class, 10, 9) + .assertError(TestHelper.assertErrorMessage("error")); + ; } @Test @@ -559,7 +560,8 @@ public Publisher apply(Integer v) } }, ExpandStrategy.DEPTH_FIRST)) .test() - .assertFailureAndMessage(IOException.class, "error", 10, 9, 5, 4, 3, 2, 1, 0); + .assertFailure(IOException.class, 10, 9, 5, 4, 3, 2, 1, 0) + .assertError(TestHelper.assertErrorMessage("error")); } @Test @@ -579,7 +581,9 @@ public Publisher apply(Integer v) } }, ExpandStrategy.BREADTH_FIRST)) .test() - .assertFailureAndMessage(IOException.class, "error", 10, 5, 9, 4); + .assertFailure(IOException.class, 10, 5, 9, 4) + .assertError(TestHelper.assertErrorMessage("error")); + ; } @Test @@ -599,6 +603,7 @@ public Publisher apply(Integer v) } }, ExpandStrategy.BREADTH_FIRST)) .test() - .assertFailureAndMessage(IOException.class, "error", 10, 5, 9, 4, 3, 2, 1, 0); + .assertFailure(IOException.class, 10, 5, 9, 4, 3, 2, 1, 0) + .assertError(TestHelper.assertErrorMessage("error")); } } diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableFilterAsyncTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsyncTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableFilterAsyncTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsyncTest.java index ba5e056f..5591f293 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableFilterAsyncTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsyncTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; import java.util.List; @@ -23,8 +23,8 @@ import org.junit.*; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.basetypes.Solo; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.basetypes.Solo; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.Flowable; import io.reactivex.functions.*; import io.reactivex.internal.functions.Functions; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableFlatMapAsyncTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsyncTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableFlatMapAsyncTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsyncTest.java index 3ffd9b8f..29378ee1 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableFlatMapAsyncTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsyncTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.TimeUnit; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableFlatMapSyncTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSyncTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableFlatMapSyncTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSyncTest.java index e153a1ac..dc04ebe8 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableFlatMapSyncTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSyncTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.TimeUnit; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableGenerateAsyncTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsyncTest.java similarity index 83% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableGenerateAsyncTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsyncTest.java index ca2c23b1..acf5fddd 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableGenerateAsyncTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsyncTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.*; @@ -24,8 +24,8 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.operators.FlowableGenerateAsync.AtomicCancellable; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.operators.FlowableGenerateAsync.AtomicCancellable; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; import io.reactivex.disposables.Disposable; import io.reactivex.functions.*; @@ -80,7 +80,7 @@ public Completable nextValue(final Consumer onValue) { index = i + 1; return Completable.fromAction(new Action() { @Override - public void run() throws Exception { + public void run() throws Throwable { onValue.accept(i); } }) @@ -93,37 +93,37 @@ public void run() throws Exception { public void simple() { final AtomicInteger cleanup = new AtomicInteger(); Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public SyncRange call() throws Exception { + public SyncRange get() throws Throwable { return new SyncRange(1, 5); } }, new BiFunction, SyncRange>() { @Override public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { Completable c = state.nextValue(new Consumer() { @Override - public void accept(Integer v) throws Exception { + public void accept(Integer v) throws Throwable { emitter.onNext(v); } }); final Disposable d = c.subscribe(new Action() { @Override - public void run() throws Exception { + public void run() throws Throwable { emitter.onComplete(); } }, new Consumer() { @Override - public void accept(Throwable e) throws Exception { + public void accept(Throwable e) throws Throwable { emitter.onError(e); } }); emitter.replaceCancellable(new Cancellable() { @Override - public void cancel() throws Exception { + public void cancel() throws Throwable { d.dispose(); } }); @@ -133,7 +133,7 @@ public void cancel() throws Exception { }, new Consumer() { @Override - public void accept(SyncRange state) throws Exception { + public void accept(SyncRange state) throws Throwable { cleanup.incrementAndGet(); } } @@ -148,19 +148,19 @@ public void accept(SyncRange state) throws Exception { public void simpleEven() { final AtomicInteger cleanup = new AtomicInteger(); Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public SyncRange call() throws Exception { + public SyncRange get() throws Throwable { return new SyncRange(1, 12); } }, new BiFunction, SyncRange>() { @Override public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { Completable c = state.nextValue(new Consumer() { @Override - public void accept(Integer v) throws Exception { + public void accept(Integer v) throws Throwable { if (v % 2 == 0) { emitter.onNext(v); } else if (v == 11) { @@ -173,18 +173,18 @@ public void accept(Integer v) throws Exception { final Disposable d = c.subscribe(new Action() { @Override - public void run() throws Exception { + public void run() throws Throwable { emitter.onComplete(); } }, new Consumer() { @Override - public void accept(Throwable e) throws Exception { + public void accept(Throwable e) throws Throwable { emitter.onError(e); } }); emitter.replaceCancellable(new Cancellable() { @Override - public void cancel() throws Exception { + public void cancel() throws Throwable { d.dispose(); } }); @@ -194,7 +194,7 @@ public void cancel() throws Exception { }, new Consumer() { @Override - public void accept(SyncRange state) throws Exception { + public void accept(SyncRange state) throws Throwable { cleanup.incrementAndGet(); } } @@ -209,37 +209,37 @@ public void accept(SyncRange state) throws Exception { public void error() { final AtomicInteger cleanup = new AtomicInteger(); Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public SyncRange call() throws Exception { + public SyncRange get() throws Throwable { return new SyncRange(1, 12); } }, new BiFunction, SyncRange>() { @Override public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { Completable c = state.nextValue(new Consumer() { @Override - public void accept(Integer v) throws Exception { + public void accept(Integer v) throws Throwable { emitter.onError(new TestException()); } }); final Disposable d = c.subscribe(new Action() { @Override - public void run() throws Exception { + public void run() throws Throwable { emitter.onComplete(); } }, new Consumer() { @Override - public void accept(Throwable e) throws Exception { + public void accept(Throwable e) throws Throwable { emitter.onError(e); } }); emitter.replaceCancellable(new Cancellable() { @Override - public void cancel() throws Exception { + public void cancel() throws Throwable { d.dispose(); } }); @@ -249,7 +249,7 @@ public void cancel() throws Exception { }, new Consumer() { @Override - public void accept(SyncRange state) throws Exception { + public void accept(SyncRange state) throws Throwable { cleanup.incrementAndGet(); } } @@ -267,39 +267,39 @@ public void take() { final AtomicInteger cleanup = new AtomicInteger(); Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public SyncRange call() throws Exception { + public SyncRange get() throws Throwable { return new SyncRange(1, 5); } }, new BiFunction, SyncRange>() { @Override public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { cancelled1.set(emitter.isCancelled()); emitterRef.set(emitter); Completable c = state.nextValue(new Consumer() { @Override - public void accept(Integer v) throws Exception { + public void accept(Integer v) throws Throwable { emitter.onNext(v); } }); final Disposable d = c.subscribe(new Action() { @Override - public void run() throws Exception { + public void run() throws Throwable { emitter.onComplete(); } }, new Consumer() { @Override - public void accept(Throwable e) throws Exception { + public void accept(Throwable e) throws Throwable { emitter.onError(e); } }); emitter.replaceCancellable(new Cancellable() { @Override - public void cancel() throws Exception { + public void cancel() throws Throwable { d.dispose(); } }); @@ -309,7 +309,7 @@ public void cancel() throws Exception { }, new Consumer() { @Override - public void accept(SyncRange state) throws Exception { + public void accept(SyncRange state) throws Throwable { cleanup.incrementAndGet(); } } @@ -330,23 +330,23 @@ public void initialStateCrash() { final AtomicInteger cleanup = new AtomicInteger(); Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public SyncRange call() throws Exception { + public SyncRange get() throws Throwable { throw new TestException(); } }, new BiFunction, SyncRange>() { @Override public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { generator.incrementAndGet(); return state; } }, new Consumer() { @Override - public void accept(SyncRange state) throws Exception { + public void accept(SyncRange state) throws Throwable { cleanup.incrementAndGet(); } } @@ -359,7 +359,7 @@ public void accept(SyncRange state) throws Exception { } @Test - public void cancelledCancel() throws Exception { + public void cancelledCancel() throws Throwable { FlowableGenerateAsync.AtomicCancellable.CANCELLED.cancel(); } @@ -370,19 +370,19 @@ public void cancellableCrash() { final AtomicInteger cleanup = new AtomicInteger(); Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public SyncRange call() throws Exception { + public SyncRange get() throws Throwable { return null; } }, new BiFunction, SyncRange>() { @Override public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { emitter.setCancellable(new Cancellable() { @Override - public void cancel() throws Exception { + public void cancel() throws Throwable { throw new TestException(); } }); @@ -392,7 +392,7 @@ public void cancel() throws Exception { }, new Consumer() { @Override - public void accept(SyncRange state) throws Exception { + public void accept(SyncRange state) throws Throwable { cleanup.incrementAndGet(); } } @@ -413,23 +413,23 @@ public void cleanupCrash() { List errors = TestHelper.trackPluginErrors(); try { Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public SyncRange call() throws Exception { + public SyncRange get() throws Throwable { return null; } }, new BiFunction, SyncRange>() { @Override public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { emitter.onComplete(); return state; } }, new Consumer() { @Override - public void accept(SyncRange state) throws Exception { + public void accept(SyncRange state) throws Throwable { throw new TestException(); } } @@ -448,22 +448,22 @@ public void generatorCrash() { final AtomicInteger cleanup = new AtomicInteger(); Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public SyncRange call() throws Exception { + public SyncRange get() throws Throwable { return null; } }, new BiFunction, SyncRange>() { @Override public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { throw new TestException(); } }, new Consumer() { @Override - public void accept(SyncRange state) throws Exception { + public void accept(SyncRange state) throws Throwable { cleanup.incrementAndGet(); } } @@ -481,16 +481,16 @@ public void doubleOnError() { final AtomicInteger cleanup = new AtomicInteger(); Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public SyncRange call() throws Exception { + public SyncRange get() throws Throwable { return null; } }, new BiFunction, SyncRange>() { @Override public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { emitter.onError(new TestException("One")); emitter.onError(new TestException("Two")); return state; @@ -498,13 +498,14 @@ public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emit }, new Consumer() { @Override - public void accept(SyncRange state) throws Exception { + public void accept(SyncRange state) throws Throwable { cleanup.incrementAndGet(); } } ) .test() - .assertFailureAndMessage(TestException.class, "One"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("One")); assertEquals(1, cleanup.get()); @@ -519,22 +520,22 @@ public void never() { final AtomicInteger cleanup = new AtomicInteger(); Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public SyncRange call() throws Exception { + public SyncRange get() throws Throwable { return null; } }, new BiFunction, SyncRange>() { @Override public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { return state; } }, new Consumer() { @Override - public void accept(SyncRange state) throws Exception { + public void accept(SyncRange state) throws Throwable { cleanup.incrementAndGet(); } } @@ -550,23 +551,23 @@ public void onNextAlreadyAvailable() { final AtomicInteger cleanup = new AtomicInteger(); Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public SyncRange call() throws Exception { + public SyncRange get() throws Throwable { return null; } }, new BiFunction, SyncRange>() { @Override public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { emitter.onNext(1); return state; } }, new Consumer() { @Override - public void accept(SyncRange state) throws Exception { + public void accept(SyncRange state) throws Throwable { cleanup.incrementAndGet(); } } @@ -587,16 +588,16 @@ public void onNextAlreadyAvailableAndComplete() { final AtomicInteger cleanup = new AtomicInteger(); Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public SyncRange call() throws Exception { + public SyncRange get() throws Throwable { return null; } }, new BiFunction, SyncRange>() { @Override public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { emitter.onNext(1); emitter.onComplete(); return state; @@ -604,7 +605,7 @@ public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emit }, new Consumer() { @Override - public void accept(SyncRange state) throws Exception { + public void accept(SyncRange state) throws Throwable { cleanup.incrementAndGet(); } } @@ -622,16 +623,16 @@ public void onNothingAndComplete() { final AtomicInteger cleanup = new AtomicInteger(); Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public SyncRange call() throws Exception { + public SyncRange get() throws Throwable { return null; } }, new BiFunction, SyncRange>() { @Override public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { // in practice, there could be a request being serviced while // the following emitter.onNothing() is executing // after which the complete tags the state with it's done indicator @@ -642,7 +643,7 @@ public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emit }, new Consumer() { @Override - public void accept(SyncRange state) throws Exception { + public void accept(SyncRange state) throws Throwable { cleanup.incrementAndGet(); } } @@ -658,23 +659,23 @@ public void empty() { final AtomicInteger cleanup = new AtomicInteger(); Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public SyncRange call() throws Exception { + public SyncRange get() throws Throwable { return null; } }, new BiFunction, SyncRange>() { @Override public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { emitter.onComplete(); return state; } }, new Consumer() { @Override - public void accept(SyncRange state) throws Exception { + public void accept(SyncRange state) throws Throwable { cleanup.incrementAndGet(); } } @@ -694,7 +695,7 @@ public void atomicCancellableSetCancelled() { ac.setCancellable(new Cancellable() { @Override - public void cancel() throws Exception { + public void cancel() throws Throwable { calls.incrementAndGet(); } }); @@ -707,12 +708,12 @@ public void setCancelRace() { final AtomicCancellable ac = new AtomicCancellable(); final Cancellable c1 = new Cancellable() { @Override - public void cancel() throws Exception { + public void cancel() throws Throwable { } }; final Cancellable c2 = new Cancellable() { @Override - public void cancel() throws Exception { + public void cancel() throws Throwable { } }; @@ -745,37 +746,37 @@ public void run() { public void backpressured() { final AtomicInteger cleanup = new AtomicInteger(); TestSubscriber ts = Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public SyncRange call() throws Exception { + public SyncRange get() throws Throwable { return new SyncRange(1, 1024); } }, new BiFunction, SyncRange>() { @Override public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { Completable c = state.nextValue(new Consumer() { @Override - public void accept(Integer v) throws Exception { + public void accept(Integer v) throws Throwable { emitter.onNext(v); } }); final Disposable d = c.subscribe(new Action() { @Override - public void run() throws Exception { + public void run() throws Throwable { emitter.onComplete(); } }, new Consumer() { @Override - public void accept(Throwable e) throws Exception { + public void accept(Throwable e) throws Throwable { emitter.onError(e); } }); emitter.replaceCancellable(new Cancellable() { @Override - public void cancel() throws Exception { + public void cancel() throws Throwable { d.dispose(); } }); @@ -785,7 +786,7 @@ public void cancel() throws Exception { }, new Consumer() { @Override - public void accept(SyncRange state) throws Exception { + public void accept(SyncRange state) throws Throwable { cleanup.incrementAndGet(); } } @@ -810,37 +811,37 @@ public void accept(SyncRange state) throws Exception { public void asyncBbackpressured() { final AtomicInteger cleanup = new AtomicInteger(); TestSubscriber ts = Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public AsyncRange call() throws Exception { + public AsyncRange get() throws Throwable { return new AsyncRange(1, 256); } }, new BiFunction, AsyncRange>() { @Override public AsyncRange apply(AsyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { Completable c = state.nextValue(new Consumer() { @Override - public void accept(Integer v) throws Exception { + public void accept(Integer v) throws Throwable { emitter.onNext(v); } }); final Disposable d = c.subscribe(new Action() { @Override - public void run() throws Exception { + public void run() throws Throwable { emitter.onComplete(); } }, new Consumer() { @Override - public void accept(Throwable e) throws Exception { + public void accept(Throwable e) throws Throwable { emitter.onError(e); } }); emitter.replaceCancellable(new Cancellable() { @Override - public void cancel() throws Exception { + public void cancel() throws Throwable { d.dispose(); } }); @@ -850,7 +851,7 @@ public void cancel() throws Exception { }, new Consumer() { @Override - public void accept(AsyncRange state) throws Exception { + public void accept(AsyncRange state) throws Throwable { cleanup.incrementAndGet(); } } @@ -878,23 +879,23 @@ public void nullItem() { final AtomicInteger cleanup = new AtomicInteger(); Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public SyncRange call() throws Exception { + public SyncRange get() throws Throwable { return null; } }, new BiFunction, SyncRange>() { @Override public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { emitter.onNext(null); return state; } }, new Consumer() { @Override - public void accept(SyncRange state) throws Exception { + public void accept(SyncRange state) throws Throwable { cleanup.incrementAndGet(); } } @@ -910,23 +911,23 @@ public void nullThrowable() { final AtomicInteger cleanup = new AtomicInteger(); Flowables.generateAsync( - new Callable() { + new Supplier() { @Override - public SyncRange call() throws Exception { + public SyncRange get() throws Throwable { return null; } }, new BiFunction, SyncRange>() { @Override public SyncRange apply(SyncRange state, final FlowableAsyncEmitter emitter) - throws Exception { + throws Throwable { emitter.onError(null); return state; } }, new Consumer() { @Override - public void accept(SyncRange state) throws Exception { + public void accept(SyncRange state) throws Throwable { cleanup.incrementAndGet(); } } diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableIndexOfTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableIndexOfTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableIndexOfTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableIndexOfTest.java index 3f4c9fdf..2836d29e 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableIndexOfTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableIndexOfTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableIntervalBackpressureTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableIntervalBackpressureTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableIntervalBackpressureTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableIntervalBackpressureTest.java index 422b0511..134efd1f 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableIntervalBackpressureTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableIntervalBackpressureTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.concurrent.TimeUnit; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableMapAsyncTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapAsyncTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableMapAsyncTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapAsyncTest.java index 380740e2..ef099ff9 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableMapAsyncTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapAsyncTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; import java.util.List; @@ -23,8 +23,8 @@ import org.junit.*; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.basetypes.*; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.basetypes.*; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.Flowable; import io.reactivex.functions.*; import io.reactivex.internal.functions.Functions; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableMapFilterConditionalTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapFilterConditionalTest.java similarity index 90% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableMapFilterConditionalTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapFilterConditionalTest.java index a7b3e0a7..96a64f65 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableMapFilterConditionalTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapFilterConditionalTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertFalse; @@ -21,13 +21,12 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.Flowable; import io.reactivex.functions.BiConsumer; import io.reactivex.internal.functions.Functions; import io.reactivex.internal.fuseable.QueueFuseable; import io.reactivex.processors.*; -import io.reactivex.subscribers.TestSubscriber; public class FlowableMapFilterConditionalTest { @@ -234,7 +233,7 @@ public void accept(Integer t, BasicEmitter e) throws Exception { @Test public void mapFused() { - TestSubscriber ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); + TestSubscriberEx ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); Flowable.range(1, 5) .compose(FlowableTransformers.mapFilter(new BiConsumer>() { @@ -246,13 +245,13 @@ public void accept(Integer t, BasicEmitter e) throws Exception { .filter(Functions.alwaysTrue()) .subscribe(ts); - ts.assertOf(TestHelper.assertFusedSubscriber(QueueFuseable.SYNC)) + ts.assertFusionMode(QueueFuseable.SYNC) .assertResult(2, 4, 6, 8, 10); } @Test public void mapAsyncFused() { - TestSubscriber ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); + TestSubscriberEx ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); UnicastProcessor up = UnicastProcessor.create(); TestHelper.emit(up, 1, 2, 3, 4, 5); @@ -267,13 +266,13 @@ public void accept(Integer t, BasicEmitter e) throws Exception { .filter(Functions.alwaysTrue()) .subscribe(ts); - ts.assertOf(TestHelper.assertFusedSubscriber(QueueFuseable.ASYNC)) + ts.assertFusionMode(QueueFuseable.ASYNC) .assertResult(2, 4, 6, 8, 10); } @Test public void filterFused() { - TestSubscriber ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); + TestSubscriberEx ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); Flowable.range(1, 5) .compose(FlowableTransformers.mapFilter(new BiConsumer>() { @@ -287,13 +286,13 @@ public void accept(Integer t, BasicEmitter e) throws Exception { .filter(Functions.alwaysTrue()) .subscribe(ts); - ts.assertOf(TestHelper.assertFusedSubscriber(QueueFuseable.SYNC)) + ts.assertFusionMode(QueueFuseable.SYNC) .assertResult(4, 8); } @Test public void consumerThrowsFused() { - TestSubscriber ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); + TestSubscriberEx ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); Flowable.range(1, 5) .compose(FlowableTransformers.mapFilter(new BiConsumer>() { @@ -305,13 +304,13 @@ public void accept(Integer t, BasicEmitter e) throws Exception { .filter(Functions.alwaysTrue()) .subscribe(ts); - ts.assertOf(TestHelper.assertFusedSubscriber(QueueFuseable.SYNC)) + ts.assertFusionMode(QueueFuseable.SYNC) .assertFailure(IOException.class); } @Test public void consumerSignalsErrorFused() { - TestSubscriber ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); + TestSubscriberEx ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); Flowable.range(1, 5) .compose(FlowableTransformers.mapFilter(new BiConsumer>() { @@ -323,13 +322,13 @@ public void accept(Integer t, BasicEmitter e) throws Exception { .filter(Functions.alwaysTrue()) .subscribe(ts); - ts.assertOf(TestHelper.assertFusedSubscriber(QueueFuseable.SYNC)) + ts.assertFusionMode(QueueFuseable.SYNC) .assertFailure(IOException.class); } @Test public void consumerCompleteFused() { - TestSubscriber ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); + TestSubscriberEx ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); Flowable.range(1, 5) .compose(FlowableTransformers.mapFilter(new BiConsumer>() { @@ -341,7 +340,7 @@ public void accept(Integer t, BasicEmitter e) throws Exception { .filter(Functions.alwaysTrue()) .subscribe(ts); - ts.assertOf(TestHelper.assertFusedSubscriber(QueueFuseable.SYNC)) + ts.assertFusionMode(QueueFuseable.SYNC) .assertResult(); } diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableMapFilterTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapFilterTest.java similarity index 89% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableMapFilterTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapFilterTest.java index ad96f372..f784ab18 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableMapFilterTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapFilterTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertFalse; @@ -21,12 +21,11 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.Flowable; import io.reactivex.functions.BiConsumer; import io.reactivex.internal.fuseable.QueueFuseable; import io.reactivex.processors.*; -import io.reactivex.subscribers.TestSubscriber; public class FlowableMapFilterTest { @@ -220,7 +219,7 @@ public void accept(Integer t, BasicEmitter e) throws Exception { @Test public void mapFused() { - TestSubscriber ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); + TestSubscriberEx ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); Flowable.range(1, 5) .compose(FlowableTransformers.mapFilter(new BiConsumer>() { @@ -231,13 +230,13 @@ public void accept(Integer t, BasicEmitter e) throws Exception { })) .subscribe(ts); - ts.assertOf(TestHelper.assertFusedSubscriber(QueueFuseable.SYNC)) + ts.assertFusionMode(QueueFuseable.SYNC) .assertResult(2, 4, 6, 8, 10); } @Test public void mapAsyncFused() { - TestSubscriber ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); + TestSubscriberEx ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); UnicastProcessor up = UnicastProcessor.create(); TestHelper.emit(up, 1, 2, 3, 4, 5); @@ -251,13 +250,13 @@ public void accept(Integer t, BasicEmitter e) throws Exception { })) .subscribe(ts); - ts.assertOf(TestHelper.assertFusedSubscriber(QueueFuseable.ASYNC)) + ts.assertFusionMode(QueueFuseable.ASYNC) .assertResult(2, 4, 6, 8, 10); } @Test public void filterFused() { - TestSubscriber ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); + TestSubscriberEx ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); Flowable.range(1, 5) .compose(FlowableTransformers.mapFilter(new BiConsumer>() { @@ -270,13 +269,13 @@ public void accept(Integer t, BasicEmitter e) throws Exception { })) .subscribe(ts); - ts.assertOf(TestHelper.assertFusedSubscriber(QueueFuseable.SYNC)) + ts.assertFusionMode(QueueFuseable.SYNC) .assertResult(4, 8); } @Test public void consumerThrowsFused() { - TestSubscriber ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); + TestSubscriberEx ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); Flowable.range(1, 5) .compose(FlowableTransformers.mapFilter(new BiConsumer>() { @@ -287,13 +286,13 @@ public void accept(Integer t, BasicEmitter e) throws Exception { })) .subscribe(ts); - ts.assertOf(TestHelper.assertFusedSubscriber(QueueFuseable.SYNC)) + ts.assertFusionMode(QueueFuseable.SYNC) .assertFailure(IOException.class); } @Test public void consumerSignalsErrorFused() { - TestSubscriber ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); + TestSubscriberEx ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); Flowable.range(1, 5) .compose(FlowableTransformers.mapFilter(new BiConsumer>() { @@ -304,13 +303,13 @@ public void accept(Integer t, BasicEmitter e) throws Exception { })) .subscribe(ts); - ts.assertOf(TestHelper.assertFusedSubscriber(QueueFuseable.SYNC)) + ts.assertFusionMode(QueueFuseable.SYNC) .assertFailure(IOException.class); } @Test public void consumerCompleteFused() { - TestSubscriber ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); + TestSubscriberEx ts = TestHelper.fusedSubscriber(QueueFuseable.ANY); Flowable.range(1, 5) .compose(FlowableTransformers.mapFilter(new BiConsumer>() { @@ -321,7 +320,7 @@ public void accept(Integer t, BasicEmitter e) throws Exception { })) .subscribe(ts); - ts.assertOf(TestHelper.assertFusedSubscriber(QueueFuseable.SYNC)) + ts.assertFusionMode(QueueFuseable.SYNC) .assertResult(); } diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableOnBackpressureTimeoutTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeoutTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableOnBackpressureTimeoutTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeoutTest.java index d8e8a602..d77ddb35 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableOnBackpressureTimeoutTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeoutTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; import java.util.*; @@ -22,7 +22,7 @@ import org.junit.*; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.Flowable; import io.reactivex.functions.Consumer; import io.reactivex.plugins.RxJavaPlugins; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableOrderedMergeTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMergeTest.java similarity index 93% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableOrderedMergeTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMergeTest.java index 932b2621..d955850d 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableOrderedMergeTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMergeTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; import java.util.*; import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.Flowable; import io.reactivex.exceptions.CompositeException; import io.reactivex.functions.*; @@ -195,7 +195,8 @@ public void bothError() { Flowable.error(new IOException("second")) ) .test() - .assertFailureAndMessage(IOException.class, "first"); + .assertFailure(IOException.class) + .assertError(TestHelper.assertErrorMessage("first")); TestHelper.assertUndeliverable(errors, 0, IOException.class, "second"); } finally { @@ -213,13 +214,14 @@ public void bothErrorDelayed() { ) .test() .assertFailure(CompositeException.class) - .assertOf(new Consumer>() { + .assertError(new Predicate() { @Override - public void accept(TestSubscriber ts) throws Exception { - List list = TestHelper.compositeList(ts.errors().get(0)); + public boolean test(Throwable error) throws Throwable { + List list = TestHelper.compositeList(error); TestHelper.assertError(list, 0, IOException.class, "first"); TestHelper.assertError(list, 1, IOException.class, "second"); + return true; } }); } @@ -234,13 +236,14 @@ public void bothErrorDelayedBackpressured() { ) .test(0L) .assertFailure(CompositeException.class) - .assertOf(new Consumer>() { + .assertError(new Predicate() { @Override - public void accept(TestSubscriber ts) throws Exception { - List list = TestHelper.compositeList(ts.errors().get(0)); + public boolean test(Throwable error) throws Throwable { + List list = TestHelper.compositeList(error); TestHelper.assertError(list, 0, IOException.class, "first"); TestHelper.assertError(list, 1, IOException.class, "second"); + return true; } }); } @@ -255,13 +258,14 @@ public void nonEmptyBothErrorDelayed() { ) .test() .assertFailure(CompositeException.class, 1, 2) - .assertOf(new Consumer>() { + .assertError(new Predicate() { @Override - public void accept(TestSubscriber ts) throws Exception { - List list = TestHelper.compositeList(ts.errors().get(0)); + public boolean test(Throwable error) throws Throwable { + List list = TestHelper.compositeList(error); TestHelper.assertError(list, 0, IOException.class, "first"); TestHelper.assertError(list, 1, IOException.class, "second"); + return true; } }); } @@ -277,13 +281,14 @@ public void nonEmptyBothErrorDelayed2() { .rebatchRequests(1) .test() .assertFailure(CompositeException.class, 1, 2) - .assertOf(new Consumer>() { + .assertError(new Predicate() { @Override - public void accept(TestSubscriber ts) throws Exception { - List list = TestHelper.compositeList(ts.errors().get(0)); + public boolean test(Throwable error) throws Throwable { + List list = TestHelper.compositeList(error); TestHelper.assertError(list, 0, IOException.class, "first"); TestHelper.assertError(list, 1, IOException.class, "second"); + return true; } }); } @@ -291,16 +296,12 @@ public void accept(TestSubscriber ts) throws Exception { @SuppressWarnings("unchecked") @Test public void never() { - Flowables.orderedMerge(Functions.naturalComparator(), + TestSubscriber ts = Flowables.orderedMerge(Functions.naturalComparator(), Flowable.never(), Flowable.never()) - .test() - .assertOf(new Consumer>() { - @Override - public void accept(TestSubscriber ts) throws Exception { - ts.cancel(); - } - }) - .assertEmpty(); + .test(); + + ts.cancel(); + ts.assertEmpty(); } @SuppressWarnings("unchecked") diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowablePartialCollectTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollectTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowablePartialCollectTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollectTest.java index 0f888fa1..055edb01 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowablePartialCollectTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollectTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertFalse; @@ -24,7 +24,7 @@ import org.junit.Test; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.Flowable; import io.reactivex.exceptions.MissingBackpressureException; import io.reactivex.functions.*; @@ -184,7 +184,8 @@ public void accept( } }, Functions.emptyConsumer(), 128)) .test() - .assertFailureAndMessage(TestException.class, "first"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("first")); TestHelper.assertUndeliverable(errors, 0, TestException.class, "second"); } finally { diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableRepeatCallableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRepeatCallableTest.java similarity index 75% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableRepeatCallableTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableRepeatCallableTest.java index d3704e7a..74a64a3a 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableRepeatCallableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRepeatCallableTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; -import java.util.concurrent.Callable; import org.junit.Test; import io.reactivex.Flowable; +import io.reactivex.functions.Supplier; import io.reactivex.internal.functions.Functions; import io.reactivex.subscribers.TestSubscriber; @@ -29,9 +29,9 @@ public class FlowableRepeatCallableTest { @Test public void fastPathCrash() { - Flowables.repeatCallable(new Callable() { + Flowables.repeatSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Exception { throw new IOException(); } }) @@ -41,9 +41,9 @@ public Object call() throws Exception { @Test public void slowPathCrash() { - Flowables.repeatCallable(new Callable() { + Flowables.repeatSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Exception { throw new IOException(); } }) @@ -53,9 +53,9 @@ public Object call() throws Exception { @Test public void requestLimited() { - Flowables.repeatCallable(new Callable() { + Flowables.repeatSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Exception { return 1; } }) @@ -76,9 +76,9 @@ public void onNext(Object t) { } }; - Flowables.repeatCallable(new Callable() { + Flowables.repeatSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Exception { return 1; } }) @@ -89,9 +89,9 @@ public Object call() throws Exception { @Test public void fused() { - Flowables.repeatCallable(new Callable() { + Flowables.repeatSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Exception { return 1; } }) @@ -103,9 +103,9 @@ public Object call() throws Exception { @Test public void fastPathCrashConditional() { - Flowables.repeatCallable(new Callable() { + Flowables.repeatSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Exception { throw new IOException(); } }) @@ -116,9 +116,9 @@ public Object call() throws Exception { @Test public void slowPathCrashConditional() { - Flowables.repeatCallable(new Callable() { + Flowables.repeatSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Exception { throw new IOException(); } }) @@ -129,9 +129,9 @@ public Object call() throws Exception { @Test public void requestLimitedConditional() { - Flowables.repeatCallable(new Callable() { + Flowables.repeatSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Exception { return 1; } }) @@ -153,9 +153,9 @@ public void onNext(Object t) { } }; - Flowables.repeatCallable(new Callable() { + Flowables.repeatSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Exception { return 1; } }) @@ -167,9 +167,9 @@ public Object call() throws Exception { @Test public void fusedConditional() { - Flowables.repeatCallable(new Callable() { + Flowables.repeatSupplier(new Supplier() { @Override - public Object call() throws Exception { + public Object get() throws Exception { return 1; } }) diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableRequestObserveOnTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOnTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableRequestObserveOnTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOnTest.java index 39fb5cda..b855df2d 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableRequestObserveOnTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOnTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; import java.util.concurrent.TimeUnit; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableRequestSampleTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTest.java similarity index 96% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableRequestSampleTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTest.java index 48e3056b..f334cb6a 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableRequestSampleTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.*; @@ -25,7 +25,7 @@ import org.junit.Test; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.Flowable; import io.reactivex.exceptions.MissingBackpressureException; import io.reactivex.functions.Function; @@ -39,7 +39,7 @@ public class FlowableRequestSampleTest { @Test public void normal() { - Flowables.repeatCallable(Functions.justCallable(1)) + Flowables.repeatSupplier(Functions.justSupplier(1)) .compose(FlowableTransformers.requestSample(Flowable.interval(1, TimeUnit.MILLISECONDS, Schedulers.single()))) .take(5) .test() @@ -49,7 +49,7 @@ public void normal() { @Test public void normal2() { - Flowables.repeatCallable(Functions.justCallable(1)) + Flowables.repeatSupplier(Functions.justSupplier(1)) .compose(FlowableTransformers.requestSample( Flowable.fromArray(10, 50, 100, 200, 500) .concatMap(new Function>() { diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableRequestSampleTimeTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTimeTest.java similarity index 94% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableRequestSampleTimeTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTimeTest.java index b59aeef6..683f9c1e 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableRequestSampleTimeTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTimeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; import java.util.List; @@ -23,7 +23,7 @@ import org.junit.Test; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.Flowable; import io.reactivex.exceptions.MissingBackpressureException; import io.reactivex.internal.functions.Functions; @@ -35,7 +35,7 @@ public class FlowableRequestSampleTimeTest { @Test public void normal() { - Flowables.repeatCallable(Functions.justCallable(1)) + Flowables.repeatSupplier(Functions.justSupplier(1)) .compose(FlowableTransformers.requestSample(1, TimeUnit.MILLISECONDS, Schedulers.single())) .take(5) .test() diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableSpanoutTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSpanoutTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableSpanoutTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableSpanoutTest.java index 160c9171..5d7926cf 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableSpanoutTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSpanoutTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; import java.util.concurrent.TimeUnit; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableSwitchFlatMapTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMapTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableSwitchFlatMapTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMapTest.java index 11e8de08..c4b3bb61 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableSwitchFlatMapTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMapTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertFalse; @@ -25,7 +25,7 @@ import org.junit.Test; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.Flowable; import io.reactivex.functions.Function; import io.reactivex.internal.functions.Functions; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableSwitchIfEmptyManyArrayTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArrayTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableSwitchIfEmptyManyArrayTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArrayTest.java index 438cd1fb..723c1f43 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableSwitchIfEmptyManyArrayTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArrayTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; import java.util.Arrays; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableSwitchIfEmptyManyTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableSwitchIfEmptyManyTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyTest.java index 93926da0..11365a85 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableSwitchIfEmptyManyTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; import java.util.*; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableSwitchOnFirstTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirstTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableSwitchOnFirstTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirstTest.java index 87aa9a0d..89b90cc3 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableSwitchOnFirstTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirstTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.*; @@ -24,7 +24,7 @@ import org.junit.Test; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.Flowable; import io.reactivex.functions.*; import io.reactivex.internal.subscriptions.BooleanSubscription; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableTimeoutLastTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLastTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableTimeoutLastTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLastTest.java index 8394d340..346814b4 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableTimeoutLastTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLastTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; import java.util.concurrent.TimeUnit; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableTransformersTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableTransformersTest.java similarity index 90% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableTransformersTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableTransformersTest.java index 4817e204..ce82759d 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableTransformersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableTransformersTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; public class FlowableTransformersTest { diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableValveTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableValveTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableValveTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableValveTest.java index 1295c97a..6555bb85 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableValveTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableValveTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertFalse; @@ -24,7 +24,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.Flowable; import io.reactivex.functions.Function; import io.reactivex.plugins.RxJavaPlugins; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableWindowPredicateTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicateTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableWindowPredicateTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicateTest.java index 7d8deec2..b2e1d2c9 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableWindowPredicateTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicateTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; import java.util.*; @@ -23,7 +23,7 @@ import org.junit.Test; import org.reactivestreams.Subscriber; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.Flowable; import io.reactivex.Single; import io.reactivex.functions.Function; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableZipLatestTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableZipLatestTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowableZipLatestTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowableZipLatestTest.java index e078073a..62c0a4ab 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowableZipLatestTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableZipLatestTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; import java.util.*; @@ -23,7 +23,7 @@ import org.junit.*; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.Flowable; import io.reactivex.exceptions.ProtocolViolationException; import io.reactivex.functions.*; @@ -543,8 +543,9 @@ public void terminationRace() { final PublishProcessor pp1 = PublishProcessor.create(); final PublishProcessor pp2 = PublishProcessor.create(); - TestSubscriber ts = Flowables.zipLatest(pp1, pp2, toString2) - .test(); + TestSubscriberEx ts = new TestSubscriberEx(); + + Flowables.zipLatest(pp1, pp2, toString2).subscribe(ts); final Throwable ex = new IOException(); @@ -564,7 +565,7 @@ public void run() { TestHelper.race(r1, r2, Schedulers.single()); - if (ts.errorCount() != 0) { + if (ts.errors().size() != 0) { ts.assertFailure(IOException.class); Assert.assertTrue(errors.toString(), errors.isEmpty()); } else { diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/FlowablesTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowablesTest.java similarity index 87% rename from src/test/java/hu/akarnokd/rxjava2/operators/FlowablesTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/FlowablesTest.java index 5d399fe0..2e7c8ac8 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/FlowablesTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowablesTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.internal.functions.Functions; public class FlowablesTest { @@ -66,7 +66,7 @@ public void repeatScalarSlowPathConditional() { @Test public void repeatCallable() { - Flowables.repeatCallable(Functions.justCallable(1)) + Flowables.repeatSupplier(Functions.justSupplier(1)) .take(5) .test() .assertResult(1, 1, 1, 1, 1); @@ -74,7 +74,7 @@ public void repeatCallable() { @Test public void repeatCallableSlowPath() { - Flowables.repeatCallable(Functions.justCallable(1)) + Flowables.repeatSupplier(Functions.justSupplier(1)) .rebatchRequests(1) .take(5) .test() @@ -83,7 +83,7 @@ public void repeatCallableSlowPath() { @Test public void repeatCallableConditional() { - Flowables.repeatCallable(Functions.justCallable(1)) + Flowables.repeatSupplier(Functions.justSupplier(1)) .filter(Functions.alwaysTrue()) .take(5) .test() @@ -92,7 +92,7 @@ public void repeatCallableConditional() { @Test public void repeatCallableSlowPathConditional() { - Flowables.repeatCallable(Functions.justCallable(1)) + Flowables.repeatSupplier(Functions.justSupplier(1)) .filter(Functions.alwaysTrue()) .rebatchRequests(1) .take(5) diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalCompletableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletableTest.java similarity index 85% rename from src/test/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalCompletableTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletableTest.java index bde4d1bc..ac299b26 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalCompletableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletableTest.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertEquals; -import java.util.concurrent.Callable; - import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.subjects.MaybeSubject; public class MaybeFlatMapSignalCompletableTest { @@ -34,7 +32,7 @@ public void normalEmpty() { final int[] counts = { 0, 0, 0 }; Maybe.empty() - .as(Maybes.flatMapCompletable( + .to(Maybes.flatMapCompletable( new Function() { @Override public Completable apply(Integer e) @@ -51,9 +49,9 @@ public Completable apply(Throwable e) return Completable.error(e); } }, - new Callable() { + new Supplier() { @Override - public Completable call() throws Exception { + public Completable get() throws Exception { counts[2]++; return Completable.complete(); } @@ -72,7 +70,7 @@ public void normalSuccess() { final int[] counts = { 0, 0, 0 }; Maybe.just(0) - .as(Maybes.flatMapCompletable( + .to(Maybes.flatMapCompletable( new Function() { @Override public Completable apply(Integer e) @@ -89,9 +87,9 @@ public Completable apply(Throwable e) return Completable.error(e); } }, - new Callable() { + new Supplier() { @Override - public Completable call() throws Exception { + public Completable get() throws Exception { counts[2]++; return Completable.complete(); } @@ -110,7 +108,7 @@ public void empty() { final int[] counts = { 0, 0, 0 }; Maybe.empty() - .as(Maybes.flatMapCompletable( + .to(Maybes.flatMapCompletable( new Function() { @Override public Completable apply(Integer e) @@ -127,9 +125,9 @@ public Completable apply(Throwable e) return Completable.error(e); } }, - new Callable() { + new Supplier() { @Override - public Completable call() throws Exception { + public Completable get() throws Exception { counts[2]++; return Completable.complete(); } @@ -148,7 +146,7 @@ public void error() { final int[] counts = { 0, 0, 0 }; Maybe.error(new TestException()) - .as(Maybes.flatMapCompletable( + .to(Maybes.flatMapCompletable( new Function() { @Override public Completable apply(Integer e) @@ -165,9 +163,9 @@ public Completable apply(Throwable e) return Completable.error(e); } }, - new Callable() { + new Supplier() { @Override - public Completable call() throws Exception { + public Completable get() throws Exception { counts[2]++; return Completable.complete(); } @@ -186,7 +184,7 @@ public void normalSuccessCrash() { final int[] counts = { 0, 0, 0 }; Maybe.just(1) - .as(Maybes.flatMapCompletable( + .to(Maybes.flatMapCompletable( new Function() { @Override public Completable apply(Integer e) @@ -203,16 +201,17 @@ public Completable apply(Throwable e) throw new TestException("onError"); } }, - new Callable() { + new Supplier() { @Override - public Completable call() throws Exception { + public Completable get() throws Exception { counts[2]++; throw new TestException("onComplete"); } } )) .test() - .assertFailureAndMessage(TestException.class, "onSuccess"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onSuccess")); assertEquals(1, counts[0]); assertEquals(0, counts[1]); @@ -224,7 +223,7 @@ public void normalEmptyCrash() { final int[] counts = { 0, 0, 0 }; Maybe.empty() - .as(Maybes.flatMapCompletable( + .to(Maybes.flatMapCompletable( new Function() { @Override public Completable apply(Integer e) @@ -241,16 +240,17 @@ public Completable apply(Throwable e) throw new TestException("onError"); } }, - new Callable() { + new Supplier() { @Override - public Completable call() throws Exception { + public Completable get() throws Exception { counts[2]++; throw new TestException("onComplete"); } } )) .test() - .assertFailureAndMessage(TestException.class, "onComplete"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onComplete")); assertEquals(0, counts[0]); assertEquals(0, counts[1]); @@ -262,7 +262,7 @@ public void errorCrash() { final int[] counts = { 0, 0, 0 }; Maybe.error(new TestException("main")) - .as(Maybes.flatMapCompletable( + .to(Maybes.flatMapCompletable( new Function() { @Override public Completable apply(Integer e) @@ -279,16 +279,17 @@ public Completable apply(Throwable e) throw new TestException("onError"); } }, - new Callable() { + new Supplier() { @Override - public Completable call() throws Exception { + public Completable get() throws Exception { counts[2]++; throw new TestException("onComplete"); } } )) .test() - .assertFailureAndMessage(TestException.class, "onError"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onError")); assertEquals(0, counts[0]); assertEquals(1, counts[1]); @@ -298,7 +299,7 @@ public Completable call() throws Exception { @Test public void disposed() { TestHelper.checkDisposed(MaybeSubject.create() - .as(Maybes.flatMapCompletable( + .to(Maybes.flatMapCompletable( new Function() { @Override public Completable apply(Integer e) @@ -313,9 +314,9 @@ public Completable apply(Throwable e) return Completable.error(e); } }, - new Callable() { + new Supplier() { @Override - public Completable call() throws Exception { + public Completable get() throws Exception { return Completable.complete(); } } @@ -328,7 +329,7 @@ public void doubleOnSubscribe() { TestHelper.checkDoubleOnSubscribeMaybeToCompletable(new Function, Completable>() { @Override public Completable apply(Maybe c) throws Exception { - return c.as(Maybes.flatMapCompletable( + return c.to(Maybes.flatMapCompletable( new Function() { @Override public Completable apply(Integer e) @@ -343,9 +344,9 @@ public Completable apply(Throwable e) return Completable.error(e); } }, - new Callable() { + new Supplier() { @Override - public Completable call() throws Exception { + public Completable get() throws Exception { return Completable.complete(); } } diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalFlowableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowableTest.java similarity index 85% rename from src/test/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalFlowableTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowableTest.java index de4e81ff..18ebc6bc 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalFlowableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowableTest.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertEquals; -import java.util.concurrent.Callable; - import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.subjects.MaybeSubject; public class MaybeFlatMapSignalFlowableTest { @@ -34,7 +32,7 @@ public void normalEmpty() { final int[] counts = { 0, 0, 0 }; Maybe.empty() - .as(Maybes.flatMapFlowable( + .to(Maybes.flatMapFlowable( new Function>() { @Override public Flowable apply(Integer e) @@ -51,9 +49,9 @@ public Flowable apply(Throwable e) return Flowable.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { counts[2]++; return Flowable.just(1); } @@ -72,7 +70,7 @@ public void normalSuccess() { final int[] counts = { 0, 0, 0 }; Maybe.just(0) - .as(Maybes.flatMapFlowable( + .to(Maybes.flatMapFlowable( new Function>() { @Override public Flowable apply(Integer e) @@ -89,9 +87,9 @@ public Flowable apply(Throwable e) return Flowable.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { counts[2]++; return Flowable.just(1); } @@ -110,7 +108,7 @@ public void backpressure() { final int[] counts = { 0, 0, 0 }; Maybe.just(0) - .as(Maybes.flatMapFlowable( + .to(Maybes.flatMapFlowable( new Function>() { @Override public Flowable apply(Integer e) @@ -127,9 +125,9 @@ public Flowable apply(Throwable e) return Flowable.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { counts[2]++; return Flowable.just(1); } @@ -154,7 +152,7 @@ public void empty() { final int[] counts = { 0, 0, 0 }; Maybe.empty() - .as(Maybes.flatMapFlowable( + .to(Maybes.flatMapFlowable( new Function>() { @Override public Flowable apply(Integer e) @@ -171,9 +169,9 @@ public Flowable apply(Throwable e) return Flowable.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { counts[2]++; return Flowable.empty(); } @@ -192,7 +190,7 @@ public void error() { final int[] counts = { 0, 0, 0 }; Maybe.error(new TestException()) - .as(Maybes.flatMapFlowable( + .to(Maybes.flatMapFlowable( new Function>() { @Override public Flowable apply(Integer e) @@ -209,9 +207,9 @@ public Flowable apply(Throwable e) return Flowable.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { counts[2]++; return Flowable.empty(); } @@ -230,7 +228,7 @@ public void normalSuccessCrash() { final int[] counts = { 0, 0, 0 }; Maybe.just(1) - .as(Maybes.flatMapFlowable( + .to(Maybes.flatMapFlowable( new Function>() { @Override public Flowable apply(Integer e) @@ -247,16 +245,17 @@ public Flowable apply(Throwable e) throw new TestException("onError"); } }, - new Callable>() { + new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { counts[2]++; throw new TestException("onComplete"); } } )) .test() - .assertFailureAndMessage(TestException.class, "onSuccess"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onSuccess")); assertEquals(1, counts[0]); assertEquals(0, counts[1]); @@ -268,7 +267,7 @@ public void normalEmptyCrash() { final int[] counts = { 0, 0, 0 }; Maybe.empty() - .as(Maybes.flatMapFlowable( + .to(Maybes.flatMapFlowable( new Function>() { @Override public Flowable apply(Integer e) @@ -285,16 +284,17 @@ public Flowable apply(Throwable e) throw new TestException("onError"); } }, - new Callable>() { + new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { counts[2]++; throw new TestException("onComplete"); } } )) .test() - .assertFailureAndMessage(TestException.class, "onComplete"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onComplete")); assertEquals(0, counts[0]); assertEquals(0, counts[1]); @@ -306,7 +306,7 @@ public void errorCrash() { final int[] counts = { 0, 0, 0 }; Maybe.error(new TestException("main")) - .as(Maybes.flatMapFlowable( + .to(Maybes.flatMapFlowable( new Function>() { @Override public Flowable apply(Integer e) @@ -323,16 +323,17 @@ public Flowable apply(Throwable e) throw new TestException("onError"); } }, - new Callable>() { + new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { counts[2]++; throw new TestException("onComplete"); } } )) .test() - .assertFailureAndMessage(TestException.class, "onError"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onError")); assertEquals(0, counts[0]); assertEquals(1, counts[1]); @@ -342,7 +343,7 @@ public Flowable call() throws Exception { @Test public void disposed() { TestHelper.checkDisposed(MaybeSubject.create() - .as(Maybes.flatMapFlowable( + .to(Maybes.flatMapFlowable( new Function>() { @Override public Flowable apply(Integer e) @@ -357,9 +358,9 @@ public Flowable apply(Throwable e) return Flowable.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { return Flowable.empty(); } } @@ -372,7 +373,7 @@ public void doubleOnSubscribe() { TestHelper.checkDoubleOnSubscribeMaybeToFlowable(new Function, Flowable>() { @Override public Flowable apply(Maybe c) throws Exception { - return c.as(Maybes.flatMapFlowable( + return c.to(Maybes.flatMapFlowable( new Function>() { @Override public Flowable apply(Integer e) @@ -387,9 +388,9 @@ public Flowable apply(Throwable e) return Flowable.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Flowable call() throws Exception { + public Flowable get() throws Exception { return Flowable.empty(); } } diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalMaybeTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybeTest.java similarity index 87% rename from src/test/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalMaybeTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybeTest.java index 7556d998..8c2da607 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalMaybeTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybeTest.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertEquals; -import java.util.concurrent.Callable; - import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; -import io.reactivex.*; -import io.reactivex.functions.Function; +import hu.akarnokd.rxjava3.test.*; +import io.reactivex.Maybe; +import io.reactivex.functions.*; import io.reactivex.subjects.MaybeSubject; public class MaybeFlatMapSignalMaybeTest { @@ -51,9 +49,9 @@ public Maybe apply(Throwable e) return Maybe.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Maybe call() throws Exception { + public Maybe get() throws Exception { counts[2]++; return Maybe.just(1); } @@ -89,9 +87,9 @@ public Maybe apply(Throwable e) return Maybe.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Maybe call() throws Exception { + public Maybe get() throws Exception { counts[2]++; return Maybe.just(1); } @@ -127,9 +125,9 @@ public Maybe apply(Throwable e) return Maybe.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Maybe call() throws Exception { + public Maybe get() throws Exception { counts[2]++; return Maybe.empty(); } @@ -165,9 +163,9 @@ public Maybe apply(Throwable e) return Maybe.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Maybe call() throws Exception { + public Maybe get() throws Exception { counts[2]++; return Maybe.empty(); } @@ -203,16 +201,17 @@ public Maybe apply(Throwable e) throw new TestException("onError"); } }, - new Callable>() { + new Supplier>() { @Override - public Maybe call() throws Exception { + public Maybe get() throws Exception { counts[2]++; throw new TestException("onComplete"); } } )) .test() - .assertFailureAndMessage(TestException.class, "onSuccess"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onSuccess")); assertEquals(1, counts[0]); assertEquals(0, counts[1]); @@ -241,16 +240,17 @@ public Maybe apply(Throwable e) throw new TestException("onError"); } }, - new Callable>() { + new Supplier>() { @Override - public Maybe call() throws Exception { + public Maybe get() throws Exception { counts[2]++; throw new TestException("onComplete"); } } )) .test() - .assertFailureAndMessage(TestException.class, "onComplete"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onComplete")); assertEquals(0, counts[0]); assertEquals(0, counts[1]); @@ -279,16 +279,17 @@ public Maybe apply(Throwable e) throw new TestException("onError"); } }, - new Callable>() { + new Supplier>() { @Override - public Maybe call() throws Exception { + public Maybe get() throws Exception { counts[2]++; throw new TestException("onComplete"); } } )) .test() - .assertFailureAndMessage(TestException.class, "onError"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onError")); assertEquals(0, counts[0]); assertEquals(1, counts[1]); @@ -313,9 +314,9 @@ public Maybe apply(Throwable e) return Maybe.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Maybe call() throws Exception { + public Maybe get() throws Exception { return Maybe.empty(); } } @@ -343,9 +344,9 @@ public Maybe apply(Throwable e) return Maybe.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Maybe call() throws Exception { + public Maybe get() throws Exception { return Maybe.empty(); } } diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalObservableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservableTest.java similarity index 84% rename from src/test/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalObservableTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservableTest.java index 05a04624..906d94ae 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalObservableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservableTest.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertEquals; -import java.util.concurrent.Callable; - import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.subjects.MaybeSubject; public class MaybeFlatMapSignalObservableTest { @@ -34,7 +32,7 @@ public void normalEmpty() { final int[] counts = { 0, 0, 0 }; Maybe.empty() - .as(Maybes.flatMapObservable( + .to(Maybes.flatMapObservable( new Function>() { @Override public Observable apply(Integer e) @@ -51,9 +49,9 @@ public Observable apply(Throwable e) return Observable.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Observable call() throws Exception { + public Observable get() throws Exception { counts[2]++; return Observable.just(1); } @@ -72,7 +70,7 @@ public void normalSuccess() { final int[] counts = { 0, 0, 0 }; Maybe.just(0) - .as(Maybes.flatMapObservable( + .to(Maybes.flatMapObservable( new Function>() { @Override public Observable apply(Integer e) @@ -89,9 +87,9 @@ public Observable apply(Throwable e) return Observable.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Observable call() throws Exception { + public Observable get() throws Exception { counts[2]++; return Observable.just(1); } @@ -110,7 +108,7 @@ public void empty() { final int[] counts = { 0, 0, 0 }; Maybe.empty() - .as(Maybes.flatMapObservable( + .to(Maybes.flatMapObservable( new Function>() { @Override public Observable apply(Integer e) @@ -127,9 +125,9 @@ public Observable apply(Throwable e) return Observable.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Observable call() throws Exception { + public Observable get() throws Exception { counts[2]++; return Observable.empty(); } @@ -148,7 +146,7 @@ public void error() { final int[] counts = { 0, 0, 0 }; Maybe.error(new TestException()) - .as(Maybes.flatMapObservable( + .to(Maybes.flatMapObservable( new Function>() { @Override public Observable apply(Integer e) @@ -165,9 +163,9 @@ public Observable apply(Throwable e) return Observable.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Observable call() throws Exception { + public Observable get() throws Exception { counts[2]++; return Observable.empty(); } @@ -186,7 +184,7 @@ public void normalSuccessCrash() { final int[] counts = { 0, 0, 0 }; Maybe.just(1) - .as(Maybes.flatMapObservable( + .to(Maybes.flatMapObservable( new Function>() { @Override public Observable apply(Integer e) @@ -203,16 +201,17 @@ public Observable apply(Throwable e) throw new TestException("onError"); } }, - new Callable>() { + new Supplier>() { @Override - public Observable call() throws Exception { + public Observable get() throws Exception { counts[2]++; throw new TestException("onComplete"); } } )) .test() - .assertFailureAndMessage(TestException.class, "onSuccess"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onSuccess")); assertEquals(1, counts[0]); assertEquals(0, counts[1]); @@ -224,7 +223,7 @@ public void normalEmptyCrash() { final int[] counts = { 0, 0, 0 }; Maybe.empty() - .as(Maybes.flatMapObservable( + .to(Maybes.flatMapObservable( new Function>() { @Override public Observable apply(Integer e) @@ -241,16 +240,17 @@ public Observable apply(Throwable e) throw new TestException("onError"); } }, - new Callable>() { + new Supplier>() { @Override - public Observable call() throws Exception { + public Observable get() throws Exception { counts[2]++; throw new TestException("onComplete"); } } )) .test() - .assertFailureAndMessage(TestException.class, "onComplete"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onComplete")); assertEquals(0, counts[0]); assertEquals(0, counts[1]); @@ -262,7 +262,7 @@ public void errorCrash() { final int[] counts = { 0, 0, 0 }; Maybe.error(new TestException("main")) - .as(Maybes.flatMapObservable( + .to(Maybes.flatMapObservable( new Function>() { @Override public Observable apply(Integer e) @@ -279,16 +279,17 @@ public Observable apply(Throwable e) throw new TestException("onError"); } }, - new Callable>() { + new Supplier>() { @Override - public Observable call() throws Exception { + public Observable get() throws Exception { counts[2]++; throw new TestException("onComplete"); } } )) .test() - .assertFailureAndMessage(TestException.class, "onError"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onError")); assertEquals(0, counts[0]); assertEquals(1, counts[1]); @@ -298,7 +299,7 @@ public Observable call() throws Exception { @Test public void disposed() { TestHelper.checkDisposed(MaybeSubject.create() - .as(Maybes.flatMapObservable( + .to(Maybes.flatMapObservable( new Function>() { @Override public Observable apply(Integer e) @@ -313,9 +314,9 @@ public Observable apply(Throwable e) return Observable.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Observable call() throws Exception { + public Observable get() throws Exception { return Observable.empty(); } } @@ -328,7 +329,7 @@ public void doubleOnSubscribe() { TestHelper.checkDoubleOnSubscribeMaybeToObservable(new Function, Observable>() { @Override public Observable apply(Maybe maybe) throws Exception { - return maybe.as(Maybes.flatMapObservable( + return maybe.to(Maybes.flatMapObservable( new Function>() { @Override public Observable apply(Integer e) @@ -343,9 +344,9 @@ public Observable apply(Throwable e) return Observable.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Observable call() throws Exception { + public Observable get() throws Exception { return Observable.empty(); } } diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalSingleTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingleTest.java similarity index 85% rename from src/test/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalSingleTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingleTest.java index 1da6b0a7..54fa5fca 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/MaybeFlatMapSignalSingleTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingleTest.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertEquals; -import java.util.concurrent.Callable; - import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.functions.*; import io.reactivex.subjects.MaybeSubject; public class MaybeFlatMapSignalSingleTest { @@ -34,7 +32,7 @@ public void normalEmpty() { final int[] counts = { 0, 0, 0 }; Maybe.empty() - .as(Maybes.flatMapSingle( + .to(Maybes.flatMapSingle( new Function>() { @Override public Single apply(Integer e) @@ -51,9 +49,9 @@ public Single apply(Throwable e) return Single.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Single call() throws Exception { + public Single get() throws Exception { counts[2]++; return Single.just(1); } @@ -72,7 +70,7 @@ public void normalSuccess() { final int[] counts = { 0, 0, 0 }; Maybe.just(0) - .as(Maybes.flatMapSingle( + .to(Maybes.flatMapSingle( new Function>() { @Override public Single apply(Integer e) @@ -89,9 +87,9 @@ public Single apply(Throwable e) return Single.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Single call() throws Exception { + public Single get() throws Exception { counts[2]++; return Single.just(1); } @@ -110,7 +108,7 @@ public void empty() { final int[] counts = { 0, 0, 0 }; Maybe.empty() - .as(Maybes.flatMapSingle( + .to(Maybes.flatMapSingle( new Function>() { @Override public Single apply(Integer e) @@ -127,9 +125,9 @@ public Single apply(Throwable e) return Single.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Single call() throws Exception { + public Single get() throws Exception { counts[2]++; return Single.just(2); } @@ -148,7 +146,7 @@ public void error() { final int[] counts = { 0, 0, 0 }; Maybe.error(new TestException()) - .as(Maybes.flatMapSingle( + .to(Maybes.flatMapSingle( new Function>() { @Override public Single apply(Integer e) @@ -165,9 +163,9 @@ public Single apply(Throwable e) return Single.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Single call() throws Exception { + public Single get() throws Exception { counts[2]++; return Single.just(3); } @@ -186,7 +184,7 @@ public void normalSuccessCrash() { final int[] counts = { 0, 0, 0 }; Maybe.just(1) - .as(Maybes.flatMapSingle( + .to(Maybes.flatMapSingle( new Function>() { @Override public Single apply(Integer e) @@ -203,16 +201,17 @@ public Single apply(Throwable e) throw new TestException("onError"); } }, - new Callable>() { + new Supplier>() { @Override - public Single call() throws Exception { + public Single get() throws Exception { counts[2]++; throw new TestException("onComplete"); } } )) .test() - .assertFailureAndMessage(TestException.class, "onSuccess"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onSuccess")); assertEquals(1, counts[0]); assertEquals(0, counts[1]); @@ -224,7 +223,7 @@ public void normalEmptyCrash() { final int[] counts = { 0, 0, 0 }; Maybe.empty() - .as(Maybes.flatMapSingle( + .to(Maybes.flatMapSingle( new Function>() { @Override public Single apply(Integer e) @@ -241,16 +240,17 @@ public Single apply(Throwable e) throw new TestException("onError"); } }, - new Callable>() { + new Supplier>() { @Override - public Single call() throws Exception { + public Single get() throws Exception { counts[2]++; throw new TestException("onComplete"); } } )) .test() - .assertFailureAndMessage(TestException.class, "onComplete"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onComplete")); assertEquals(0, counts[0]); assertEquals(0, counts[1]); @@ -262,7 +262,7 @@ public void errorCrash() { final int[] counts = { 0, 0, 0 }; Maybe.error(new TestException("main")) - .as(Maybes.flatMapSingle( + .to(Maybes.flatMapSingle( new Function>() { @Override public Single apply(Integer e) @@ -279,16 +279,17 @@ public Single apply(Throwable e) throw new TestException("onError"); } }, - new Callable>() { + new Supplier>() { @Override - public Single call() throws Exception { + public Single get() throws Exception { counts[2]++; throw new TestException("onComplete"); } } )) .test() - .assertFailureAndMessage(TestException.class, "onError"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onError")); assertEquals(0, counts[0]); assertEquals(1, counts[1]); @@ -298,7 +299,7 @@ public Single call() throws Exception { @Test public void disposed() { TestHelper.checkDisposed(MaybeSubject.create() - .as(Maybes.flatMapSingle( + .to(Maybes.flatMapSingle( new Function>() { @Override public Single apply(Integer e) @@ -313,9 +314,9 @@ public Single apply(Throwable e) return Single.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Single call() throws Exception { + public Single get() throws Exception { return Single.just(3); } } @@ -328,7 +329,7 @@ public void doubleOnSubscribe() { TestHelper.checkDoubleOnSubscribeMaybeToSingle(new Function, Single>() { @Override public Single apply(Maybe c) throws Exception { - return c.as(Maybes.flatMapSingle( + return c.to(Maybes.flatMapSingle( new Function>() { @Override public Single apply(Integer e) @@ -343,9 +344,9 @@ public Single apply(Throwable e) return Single.error(e); } }, - new Callable>() { + new Supplier>() { @Override - public Single call() throws Exception { + public Single get() throws Exception { return Single.just(3); } } diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableErrorJumpTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableErrorJumpTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/operators/ObservableErrorJumpTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/ObservableErrorJumpTest.java index 9ee3b334..1ca35597 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableErrorJumpTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableErrorJumpTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.util.*; import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; import io.reactivex.Observable; import io.reactivex.exceptions.CompositeException; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableFilterAsyncTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsyncTest.java similarity index 97% rename from src/test/java/hu/akarnokd/rxjava2/operators/ObservableFilterAsyncTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsyncTest.java index 1c30c4a7..952e4a9d 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableFilterAsyncTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsyncTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.*; @@ -24,7 +24,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; import io.reactivex.disposables.Disposables; import io.reactivex.functions.*; @@ -302,7 +302,8 @@ public ObservableSource apply(Integer v) } })) .test() - .assertFailureAndMessage(TestException.class, "inner"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("inner")); TestHelper.assertUndeliverable(errors, 0, TestException.class, "outer"); } finally { @@ -341,7 +342,8 @@ protected void subscribeActual( } }, 10)) .test() - .assertFailureAndMessage(TestException.class, "outer"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("outer")); TestHelper.assertUndeliverable(errors, 0, TestException.class, "inner"); } finally { diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableFlatMapDropTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDropTest.java similarity index 96% rename from src/test/java/hu/akarnokd/rxjava2/operators/ObservableFlatMapDropTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDropTest.java index 92b1d88e..aaf27c53 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableFlatMapDropTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDropTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.*; @@ -24,7 +24,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; import io.reactivex.disposables.Disposables; import io.reactivex.functions.*; @@ -218,7 +218,8 @@ public ObservableSource apply(Integer v) } })) .test() - .assertFailureAndMessage(IOException.class, "first"); + .assertFailure(IOException.class) + .assertError(TestHelper.assertErrorMessage("first")); TestHelper.assertUndeliverable(errors, 0, IOException.class, "second"); } finally { @@ -252,7 +253,9 @@ protected void subscribeActual( ref.get().onError(new IOException("first")); ref.get().onError(new IOException("second")); - to.assertFailureAndMessage(IOException.class, "first"); + to + .assertFailure(IOException.class) + .assertError(TestHelper.assertErrorMessage("first")); TestHelper.assertUndeliverable(errors, 0, IOException.class, "second"); } finally { diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableFlatMapLatestTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatestTest.java similarity index 96% rename from src/test/java/hu/akarnokd/rxjava2/operators/ObservableFlatMapLatestTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatestTest.java index a3aedde8..abfec4ca 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableFlatMapLatestTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatestTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.*; @@ -24,7 +24,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; import io.reactivex.disposables.Disposables; import io.reactivex.functions.*; @@ -224,7 +224,8 @@ public ObservableSource apply(Integer v) } })) .test() - .assertFailureAndMessage(IOException.class, "first"); + .assertFailure(IOException.class) + .assertError(TestHelper.assertErrorMessage("first")); TestHelper.assertUndeliverable(errors, 0, IOException.class, "second"); } finally { @@ -258,7 +259,9 @@ protected void subscribeActual( ref.get().onError(new IOException("first")); ref.get().onError(new IOException("second")); - to.assertFailureAndMessage(IOException.class, "first"); + to + .assertFailure(IOException.class) + .assertError(TestHelper.assertErrorMessage("first")); TestHelper.assertUndeliverable(errors, 0, IOException.class, "second"); } finally { diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableIndexOfTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableIndexOfTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/operators/ObservableIndexOfTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/ObservableIndexOfTest.java index ed44e665..96e1de91 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableIndexOfTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableIndexOfTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import java.io.IOException; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableMapAsyncTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableMapAsyncTest.java similarity index 97% rename from src/test/java/hu/akarnokd/rxjava2/operators/ObservableMapAsyncTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/ObservableMapAsyncTest.java index f0c5d3f1..cba9a906 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableMapAsyncTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableMapAsyncTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.*; @@ -24,7 +24,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; import io.reactivex.disposables.Disposables; import io.reactivex.functions.*; @@ -323,7 +323,8 @@ public ObservableSource apply(Integer v) } })) .test() - .assertFailureAndMessage(TestException.class, "inner"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("inner")); TestHelper.assertUndeliverable(errors, 0, TestException.class, "outer"); } finally { @@ -362,7 +363,8 @@ protected void subscribeActual( } }, 10)) .test() - .assertFailureAndMessage(TestException.class, "outer"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("outer")); TestHelper.assertUndeliverable(errors, 0, TestException.class, "inner"); } finally { diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableObserveOnDropTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDropTest.java similarity index 84% rename from src/test/java/hu/akarnokd/rxjava2/operators/ObservableObserveOnDropTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDropTest.java index 624dcc05..c9cb9dd3 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableObserveOnDropTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDropTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertTrue; @@ -23,7 +23,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.*; import io.reactivex.functions.*; import io.reactivex.observers.TestObserver; @@ -33,18 +33,14 @@ public class ObservableObserveOnDropTest { @Test public void normal() { - Observable.range(1, 1000000) + TestObserver to = Observable.range(1, 1000000) .compose(ObservableTransformers.observeOnDrop(Schedulers.computation())) .test() .awaitDone(5, TimeUnit.SECONDS) - .assertComplete() - .assertOf(new Consumer>() { - @Override - public void accept(TestObserver to) throws Exception { - assertTrue("" + to.valueCount(), - to.valueCount() >= 1 && to.valueCount() <= 1000000); - } - }); + .assertComplete(); + + assertTrue("" + to.values().size(), + to.values().size() >= 1 && to.values().size() <= 1000000); } @Test diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableObserveOnLatestTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatestTest.java similarity index 84% rename from src/test/java/hu/akarnokd/rxjava2/operators/ObservableObserveOnLatestTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatestTest.java index d4c99eaf..512754b4 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableObserveOnLatestTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatestTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertTrue; @@ -23,7 +23,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.*; import io.reactivex.functions.*; import io.reactivex.observers.TestObserver; @@ -33,18 +33,14 @@ public class ObservableObserveOnLatestTest { @Test public void normal() { - Observable.range(1, 1000000) + TestObserver to = Observable.range(1, 1000000) .compose(ObservableTransformers.observeOnLatest(Schedulers.computation())) .test() .awaitDone(5, TimeUnit.SECONDS) - .assertComplete() - .assertOf(new Consumer>() { - @Override - public void accept(TestObserver to) throws Exception { - assertTrue("" + to.valueCount(), - to.valueCount() >= 1 && to.valueCount() <= 1000000); - } - }); + .assertComplete(); + + assertTrue("" + to.values().size(), + to.values().size() >= 1 && to.values().size() <= 1000000); } @Test diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableTransformersTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableTransformersTest.java similarity index 90% rename from src/test/java/hu/akarnokd/rxjava2/operators/ObservableTransformersTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/ObservableTransformersTest.java index 83b66405..12cdf4f7 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableTransformersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableTransformersTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; public class ObservableTransformersTest { diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableValveTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableValveTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/operators/ObservableValveTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/ObservableValveTest.java index ee2959f8..c60a1771 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/ObservableValveTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableValveTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertFalse; @@ -24,7 +24,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.Observable; import io.reactivex.functions.Function; import io.reactivex.observers.TestObserver; diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/ObservablesTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservablesTest.java similarity index 90% rename from src/test/java/hu/akarnokd/rxjava2/operators/ObservablesTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/ObservablesTest.java index 05051060..13b07a9e 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/ObservablesTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservablesTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; public class ObservablesTest { diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalCompletableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletableTest.java similarity index 92% rename from src/test/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalCompletableTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletableTest.java index da2ea4da..0ff0e799 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalCompletableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletableTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertEquals; import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; import io.reactivex.functions.Function; import io.reactivex.subjects.SingleSubject; @@ -32,7 +32,7 @@ public void normalSuccess() { final int[] counts = { 0, 0, 0 }; Single.just(0) - .as(Singles.flatMapCompletable( + .to(Singles.flatMapCompletable( new Function() { @Override public Completable apply(Integer e) @@ -63,7 +63,7 @@ public void error() { final int[] counts = { 0, 0, 0 }; Single.error(new TestException()) - .as(Singles.flatMapCompletable( + .to(Singles.flatMapCompletable( new Function() { @Override public Completable apply(Integer e) @@ -94,7 +94,7 @@ public void normalSuccessCrash() { final int[] counts = { 0, 0, 0 }; Single.just(1) - .as(Singles.flatMapCompletable( + .to(Singles.flatMapCompletable( new Function() { @Override public Completable apply(Integer e) @@ -113,7 +113,8 @@ public Completable apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onSuccess"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onSuccess")); assertEquals(1, counts[0]); assertEquals(0, counts[1]); @@ -125,7 +126,7 @@ public void errorCrash() { final int[] counts = { 0, 0, 0 }; Single.error(new TestException("main")) - .as(Singles.flatMapCompletable( + .to(Singles.flatMapCompletable( new Function() { @Override public Completable apply(Integer e) @@ -144,7 +145,8 @@ public Completable apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onError"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onError")); assertEquals(0, counts[0]); assertEquals(1, counts[1]); @@ -154,7 +156,7 @@ public Completable apply(Throwable e) @Test public void disposed() { TestHelper.checkDisposed(SingleSubject.create() - .as(Singles.flatMapCompletable( + .to(Singles.flatMapCompletable( new Function() { @Override public Completable apply(Integer e) @@ -178,7 +180,7 @@ public void doubleOnSubscribe() { TestHelper.checkDoubleOnSubscribeSingleToCompletable(new Function, Completable>() { @Override public Completable apply(Single c) throws Exception { - return c.as(Singles.flatMapCompletable( + return c.to(Singles.flatMapCompletable( new Function() { @Override public Completable apply(Integer e) diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalFlowableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowableTest.java similarity index 92% rename from src/test/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalFlowableTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowableTest.java index 1c1da048..14857937 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalFlowableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowableTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertEquals; import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; import io.reactivex.functions.Function; import io.reactivex.subjects.SingleSubject; @@ -32,7 +32,7 @@ public void normalSuccess() { final int[] counts = { 0, 0, 0 }; Single.just(0) - .as(Singles.flatMapFlowable( + .to(Singles.flatMapFlowable( new Function>() { @Override public Flowable apply(Integer e) @@ -63,7 +63,7 @@ public void backpressure() { final int[] counts = { 0, 0, 0 }; Single.just(0) - .as(Singles.flatMapFlowable( + .to(Singles.flatMapFlowable( new Function>() { @Override public Flowable apply(Integer e) @@ -100,7 +100,7 @@ public void error() { final int[] counts = { 0, 0, 0 }; Single.error(new TestException()) - .as(Singles.flatMapFlowable( + .to(Singles.flatMapFlowable( new Function>() { @Override public Flowable apply(Integer e) @@ -131,7 +131,7 @@ public void normalSuccessCrash() { final int[] counts = { 0, 0, 0 }; Single.just(1) - .as(Singles.flatMapFlowable( + .to(Singles.flatMapFlowable( new Function>() { @Override public Flowable apply(Integer e) @@ -150,7 +150,8 @@ public Flowable apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onSuccess"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onSuccess")); assertEquals(1, counts[0]); assertEquals(0, counts[1]); @@ -162,7 +163,7 @@ public void errorCrash() { final int[] counts = { 0, 0, 0 }; Single.error(new TestException("main")) - .as(Singles.flatMapFlowable( + .to(Singles.flatMapFlowable( new Function>() { @Override public Flowable apply(Integer e) @@ -181,7 +182,8 @@ public Flowable apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onError"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onError")); assertEquals(0, counts[0]); assertEquals(1, counts[1]); @@ -191,7 +193,7 @@ public Flowable apply(Throwable e) @Test public void disposed() { TestHelper.checkDisposed(SingleSubject.create() - .as(Singles.flatMapFlowable( + .to(Singles.flatMapFlowable( new Function>() { @Override public Flowable apply(Integer e) @@ -215,7 +217,7 @@ public void doubleOnSubscribe() { TestHelper.checkDoubleOnSubscribeSingleToFlowable(new Function, Flowable>() { @Override public Flowable apply(Single c) throws Exception { - return c.as(Singles.flatMapFlowable( + return c.to(Singles.flatMapFlowable( new Function>() { @Override public Flowable apply(Integer e) diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalMaybeTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybeTest.java similarity index 92% rename from src/test/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalMaybeTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybeTest.java index 1d8754c5..fb317bc3 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalMaybeTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybeTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertEquals; import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; import io.reactivex.functions.Function; import io.reactivex.subjects.SingleSubject; @@ -32,7 +32,7 @@ public void normalSuccess() { final int[] counts = { 0, 0, 0 }; Single.just(0) - .as(Singles.flatMapMaybe( + .to(Singles.flatMapMaybe( new Function>() { @Override public Maybe apply(Integer e) @@ -63,7 +63,7 @@ public void successEmpty() { final int[] counts = { 0, 0, 0 }; Single.just(0) - .as(Singles.flatMapMaybe( + .to(Singles.flatMapMaybe( new Function>() { @Override public Maybe apply(Integer e) @@ -94,7 +94,7 @@ public void error() { final int[] counts = { 0, 0, 0 }; Single.error(new TestException()) - .as(Singles.flatMapMaybe( + .to(Singles.flatMapMaybe( new Function>() { @Override public Maybe apply(Integer e) @@ -125,7 +125,7 @@ public void normalSuccessCrash() { final int[] counts = { 0, 0, 0 }; Single.just(1) - .as(Singles.flatMapMaybe( + .to(Singles.flatMapMaybe( new Function>() { @Override public Maybe apply(Integer e) @@ -144,7 +144,8 @@ public Maybe apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onSuccess"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onSuccess")); assertEquals(1, counts[0]); assertEquals(0, counts[1]); @@ -156,7 +157,7 @@ public void errorCrash() { final int[] counts = { 0, 0, 0 }; Single.error(new TestException("main")) - .as(Singles.flatMapMaybe( + .to(Singles.flatMapMaybe( new Function>() { @Override public Maybe apply(Integer e) @@ -175,7 +176,8 @@ public Maybe apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onError"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onError")); assertEquals(0, counts[0]); assertEquals(1, counts[1]); @@ -185,7 +187,7 @@ public Maybe apply(Throwable e) @Test public void disposed() { TestHelper.checkDisposed(SingleSubject.create() - .as(Singles.flatMapMaybe( + .to(Singles.flatMapMaybe( new Function>() { @Override public Maybe apply(Integer e) @@ -209,7 +211,7 @@ public void doubleOnSubscribe() { TestHelper.checkDoubleOnSubscribeSingleToMaybe(new Function, Maybe>() { @Override public Maybe apply(Single c) throws Exception { - return c.as(Singles.flatMapMaybe( + return c.to(Singles.flatMapMaybe( new Function>() { @Override public Maybe apply(Integer e) diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalObservableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservableTest.java similarity index 92% rename from src/test/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalObservableTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservableTest.java index ffacc880..51d3d8e1 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalObservableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservableTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertEquals; import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; import io.reactivex.functions.Function; import io.reactivex.subjects.SingleSubject; @@ -32,7 +32,7 @@ public void normalSuccess() { final int[] counts = { 0, 0, 0 }; Single.just(0) - .as(Singles.flatMapObservable( + .to(Singles.flatMapObservable( new Function>() { @Override public Observable apply(Integer e) @@ -63,7 +63,7 @@ public void error() { final int[] counts = { 0, 0, 0 }; Single.error(new TestException()) - .as(Singles.flatMapObservable( + .to(Singles.flatMapObservable( new Function>() { @Override public Observable apply(Integer e) @@ -94,7 +94,7 @@ public void normalSuccessCrash() { final int[] counts = { 0, 0, 0 }; Single.just(1) - .as(Singles.flatMapObservable( + .to(Singles.flatMapObservable( new Function>() { @Override public Observable apply(Integer e) @@ -113,7 +113,8 @@ public Observable apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onSuccess"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onSuccess")); assertEquals(1, counts[0]); assertEquals(0, counts[1]); @@ -125,7 +126,7 @@ public void errorCrash() { final int[] counts = { 0, 0, 0 }; Single.error(new TestException("main")) - .as(Singles.flatMapObservable( + .to(Singles.flatMapObservable( new Function>() { @Override public Observable apply(Integer e) @@ -144,7 +145,8 @@ public Observable apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onError"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onError")); assertEquals(0, counts[0]); assertEquals(1, counts[1]); @@ -154,7 +156,7 @@ public Observable apply(Throwable e) @Test public void disposed() { TestHelper.checkDisposed(SingleSubject.create() - .as(Singles.flatMapObservable( + .to(Singles.flatMapObservable( new Function>() { @Override public Observable apply(Integer e) @@ -178,7 +180,7 @@ public void doubleOnSubscribe() { TestHelper.checkDoubleOnSubscribeSingleToObservable(new Function, Observable>() { @Override public Observable apply(Single single) throws Exception { - return single.as(Singles.flatMapObservable( + return single.to(Singles.flatMapObservable( new Function>() { @Override public Observable apply(Integer e) diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalSingleTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingleTest.java similarity index 95% rename from src/test/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalSingleTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingleTest.java index 3a4eb8db..31f68f94 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/SingleFlatMapSignalSingleTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingleTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import static org.junit.Assert.assertEquals; import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.Single; import io.reactivex.functions.Function; import io.reactivex.subjects.SingleSubject; @@ -113,7 +113,8 @@ public Single apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onSuccess"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onSuccess")); assertEquals(1, counts[0]); assertEquals(0, counts[1]); @@ -144,7 +145,8 @@ public Single apply(Throwable e) } )) .test() - .assertFailureAndMessage(TestException.class, "onError"); + .assertFailure(TestException.class) + .assertError(TestHelper.assertErrorMessage("onError")); assertEquals(0, counts[0]); assertEquals(1, counts[1]); diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/SingleTransformersTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/SingleTransformersTest.java similarity index 90% rename from src/test/java/hu/akarnokd/rxjava2/operators/SingleTransformersTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/SingleTransformersTest.java index e66a8150..e0e24094 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/SingleTransformersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/SingleTransformersTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; public class SingleTransformersTest { diff --git a/src/test/java/hu/akarnokd/rxjava2/operators/SinglesTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/SinglesTest.java similarity index 90% rename from src/test/java/hu/akarnokd/rxjava2/operators/SinglesTest.java rename to src/test/java/hu/akarnokd/rxjava3/operators/SinglesTest.java index 2c5697dd..4a38f3f8 100644 --- a/src/test/java/hu/akarnokd/rxjava2/operators/SinglesTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/SinglesTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.operators; +package hu.akarnokd.rxjava3.operators; import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; public class SinglesTest { diff --git a/src/test/java/hu/akarnokd/rxjava2/parallel/ParallelOrderedMergeTest.java b/src/test/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMergeTest.java similarity index 97% rename from src/test/java/hu/akarnokd/rxjava2/parallel/ParallelOrderedMergeTest.java rename to src/test/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMergeTest.java index fbe162d1..85f1e1c5 100644 --- a/src/test/java/hu/akarnokd/rxjava2/parallel/ParallelOrderedMergeTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMergeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.parallel; +package hu.akarnokd.rxjava3.parallel; import java.util.Random; diff --git a/src/test/java/hu/akarnokd/rxjava2/parallel/ParallelSumTest.java b/src/test/java/hu/akarnokd/rxjava3/parallel/ParallelSumTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/parallel/ParallelSumTest.java rename to src/test/java/hu/akarnokd/rxjava3/parallel/ParallelSumTest.java index 454d9f89..997fa9f0 100644 --- a/src/test/java/hu/akarnokd/rxjava2/parallel/ParallelSumTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/parallel/ParallelSumTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.parallel; +package hu.akarnokd.rxjava3.parallel; import java.io.IOException; import org.junit.*; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.Flowable; import io.reactivex.functions.*; import io.reactivex.schedulers.Schedulers; diff --git a/src/test/java/hu/akarnokd/rxjava2/processors/DispatchWorkProcessorTest.java b/src/test/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessorTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/processors/DispatchWorkProcessorTest.java rename to src/test/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessorTest.java index 2d9cd650..9c53c064 100644 --- a/src/test/java/hu/akarnokd/rxjava2/processors/DispatchWorkProcessorTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.processors; +package hu.akarnokd.rxjava3.processors; import static org.junit.Assert.*; @@ -25,7 +25,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.*; import io.reactivex.functions.*; import io.reactivex.internal.subscriptions.BooleanSubscription; @@ -83,7 +83,7 @@ public void online() { ts1.assertValuesOnly(1, 2); - ts1.dispose(); + ts1.cancel(); assertFalse(dws.hasSubscribers()); diff --git a/src/test/java/hu/akarnokd/rxjava2/processors/FlowableProcessorsTest.java b/src/test/java/hu/akarnokd/rxjava3/processors/FlowableProcessorsTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/processors/FlowableProcessorsTest.java rename to src/test/java/hu/akarnokd/rxjava3/processors/FlowableProcessorsTest.java index 6570c93a..195af45a 100644 --- a/src/test/java/hu/akarnokd/rxjava2/processors/FlowableProcessorsTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/processors/FlowableProcessorsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.processors; +package hu.akarnokd.rxjava3.processors; import static org.junit.Assert.*; @@ -23,7 +23,7 @@ import org.junit.Test; import org.reactivestreams.*; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.internal.subscriptions.BooleanSubscription; import io.reactivex.processors.*; import io.reactivex.subscribers.TestSubscriber; diff --git a/src/test/java/hu/akarnokd/rxjava2/processors/RefCountProcessorTest.java b/src/test/java/hu/akarnokd/rxjava3/processors/RefCountProcessorTest.java similarity index 97% rename from src/test/java/hu/akarnokd/rxjava2/processors/RefCountProcessorTest.java rename to src/test/java/hu/akarnokd/rxjava3/processors/RefCountProcessorTest.java index 7f65740e..a1aeed6f 100644 --- a/src/test/java/hu/akarnokd/rxjava2/processors/RefCountProcessorTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/processors/RefCountProcessorTest.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package hu.akarnokd.rxjava2.processors; +package hu.akarnokd.rxjava3.processors; import static org.junit.Assert.*; @@ -20,7 +20,7 @@ import org.junit.Test; import org.reactivestreams.Subscription; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.FlowableSubscriber; import io.reactivex.internal.subscriptions.BooleanSubscription; import io.reactivex.processors.*; @@ -165,7 +165,9 @@ public void multipleSubscribers() { assertFalse(source.hasSubscribers()); - rcp.test().assertFailureAndMessage(IllegalStateException.class, "RefCountProcessor terminated"); + rcp.test() + .assertFailure(IllegalStateException.class) + .assertError(TestHelper.assertErrorMessage("RefCountProcessor terminated")); } @Test diff --git a/src/test/java/hu/akarnokd/rxjava2/schedulers/BlockingSchedulerTest.java b/src/test/java/hu/akarnokd/rxjava3/schedulers/BlockingSchedulerTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/schedulers/BlockingSchedulerTest.java rename to src/test/java/hu/akarnokd/rxjava3/schedulers/BlockingSchedulerTest.java index c78cdf06..cd9ea4aa 100644 --- a/src/test/java/hu/akarnokd/rxjava2/schedulers/BlockingSchedulerTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/schedulers/BlockingSchedulerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.schedulers; +package hu.akarnokd.rxjava3.schedulers; import static org.junit.Assert.*; @@ -23,7 +23,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.Flowable; import io.reactivex.Scheduler.Worker; import io.reactivex.disposables.Disposable; diff --git a/src/test/java/hu/akarnokd/rxjava2/schedulers/ParallelSchedulerTest.java b/src/test/java/hu/akarnokd/rxjava3/schedulers/ParallelSchedulerTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/schedulers/ParallelSchedulerTest.java rename to src/test/java/hu/akarnokd/rxjava3/schedulers/ParallelSchedulerTest.java index 904fd363..f646ba63 100644 --- a/src/test/java/hu/akarnokd/rxjava2/schedulers/ParallelSchedulerTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/schedulers/ParallelSchedulerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.schedulers; +package hu.akarnokd.rxjava3.schedulers; import static org.junit.Assert.*; @@ -24,8 +24,8 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.schedulers.ParallelScheduler.TrackingParallelWorker.TrackedAction; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.schedulers.ParallelScheduler.TrackingParallelWorker.TrackedAction; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.*; import io.reactivex.Scheduler.Worker; import io.reactivex.disposables.*; diff --git a/src/test/java/hu/akarnokd/rxjava2/schedulers/SharedSchedulerTest.java b/src/test/java/hu/akarnokd/rxjava3/schedulers/SharedSchedulerTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/schedulers/SharedSchedulerTest.java rename to src/test/java/hu/akarnokd/rxjava3/schedulers/SharedSchedulerTest.java index f6d5f70b..1c45e0fe 100644 --- a/src/test/java/hu/akarnokd/rxjava2/schedulers/SharedSchedulerTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/schedulers/SharedSchedulerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.schedulers; +package hu.akarnokd.rxjava3.schedulers; import static org.junit.Assert.*; @@ -24,8 +24,8 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.schedulers.SharedScheduler.SharedWorker.SharedAction; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.schedulers.SharedScheduler.SharedWorker.SharedAction; +import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.Flowable; import io.reactivex.Scheduler.Worker; import io.reactivex.disposables.*; diff --git a/src/test/java/hu/akarnokd/rxjava2/string/FlowableCharSequenceTest.java b/src/test/java/hu/akarnokd/rxjava3/string/FlowableCharSequenceTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/string/FlowableCharSequenceTest.java rename to src/test/java/hu/akarnokd/rxjava3/string/FlowableCharSequenceTest.java index 3d2f5995..ff96eb85 100644 --- a/src/test/java/hu/akarnokd/rxjava2/string/FlowableCharSequenceTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/string/FlowableCharSequenceTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.string; +package hu.akarnokd.rxjava3.string; import org.junit.Test; import org.reactivestreams.Publisher; diff --git a/src/test/java/hu/akarnokd/rxjava2/string/StringFlowableTest.java b/src/test/java/hu/akarnokd/rxjava3/string/StringFlowableTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/string/StringFlowableTest.java rename to src/test/java/hu/akarnokd/rxjava3/string/StringFlowableTest.java index 87c72b8b..ffbcb44f 100644 --- a/src/test/java/hu/akarnokd/rxjava2/string/StringFlowableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/string/StringFlowableTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.string; +package hu.akarnokd.rxjava3.string; import java.io.IOException; import org.junit.Test; -import hu.akarnokd.rxjava2.test.BaseTest; +import hu.akarnokd.rxjava3.test.BaseTest; import io.reactivex.Flowable; public class StringFlowableTest extends BaseTest { diff --git a/src/test/java/hu/akarnokd/rxjava2/string/StringObservableTest.java b/src/test/java/hu/akarnokd/rxjava3/string/StringObservableTest.java similarity index 91% rename from src/test/java/hu/akarnokd/rxjava2/string/StringObservableTest.java rename to src/test/java/hu/akarnokd/rxjava3/string/StringObservableTest.java index 1f02fe48..80df159f 100644 --- a/src/test/java/hu/akarnokd/rxjava2/string/StringObservableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/string/StringObservableTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.string; +package hu.akarnokd.rxjava3.string; import org.junit.Test; -import hu.akarnokd.rxjava2.test.BaseTest; +import hu.akarnokd.rxjava3.test.BaseTest; public class StringObservableTest extends BaseTest { diff --git a/src/test/java/hu/akarnokd/rxjava2/subjects/DispatchWorkSubjectTest.java b/src/test/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubjectTest.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/subjects/DispatchWorkSubjectTest.java rename to src/test/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubjectTest.java index d6aab107..0cfcb0ce 100644 --- a/src/test/java/hu/akarnokd/rxjava2/subjects/DispatchWorkSubjectTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubjectTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.subjects; +package hu.akarnokd.rxjava3.subjects; import static org.junit.Assert.*; @@ -24,7 +24,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.Single; import io.reactivex.disposables.*; import io.reactivex.functions.BiFunction; @@ -205,7 +205,7 @@ public void addRemove() { dws.test(); - to.cancel(); + to.dispose(); dws.test(true); } @@ -242,7 +242,7 @@ public void run() { Runnable r2 = new Runnable() { @Override public void run() { - to.cancel(); + to.dispose(); } }; diff --git a/src/test/java/hu/akarnokd/rxjava2/subjects/RefCountSubjectTest.java b/src/test/java/hu/akarnokd/rxjava3/subjects/RefCountSubjectTest.java similarity index 95% rename from src/test/java/hu/akarnokd/rxjava2/subjects/RefCountSubjectTest.java rename to src/test/java/hu/akarnokd/rxjava3/subjects/RefCountSubjectTest.java index 27732009..301036c5 100644 --- a/src/test/java/hu/akarnokd/rxjava2/subjects/RefCountSubjectTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/subjects/RefCountSubjectTest.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package hu.akarnokd.rxjava2.subjects; +package hu.akarnokd.rxjava3.subjects; import static org.junit.Assert.*; @@ -19,7 +19,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.Observer; import io.reactivex.disposables.*; import io.reactivex.observers.TestObserver; @@ -52,7 +52,7 @@ public void normal() { to.assertValues(1, 2); - to.cancel(); + to.dispose(); assertFalse(source.hasObservers()); @@ -154,15 +154,17 @@ public void multipleSubscribers() { TestObserver to1 = rcp.test(); TestObserver to2 = rcp.test(); - to1.cancel(); + to1.dispose(); assertTrue(source.hasObservers()); - to2.cancel(); + to2.dispose(); assertFalse(source.hasObservers()); - rcp.test().assertFailureAndMessage(IllegalStateException.class, "RefCountSubject terminated"); + rcp.test() + .assertFailure(IllegalStateException.class) + .assertError(TestHelper.assertErrorMessage("RefCountSubject terminated")); } @Test @@ -290,14 +292,14 @@ public void addRemoveRace() { Runnable r1 = new Runnable() { @Override public void run() { - to1.cancel(); + to1.dispose(); } }; Runnable r2 = new Runnable() { @Override public void run() { - rcp.test().cancel(); + rcp.test().dispose(); } }; diff --git a/src/test/java/hu/akarnokd/rxjava2/subjects/SubjectsTest.java b/src/test/java/hu/akarnokd/rxjava3/subjects/SubjectsTest.java similarity index 85% rename from src/test/java/hu/akarnokd/rxjava2/subjects/SubjectsTest.java rename to src/test/java/hu/akarnokd/rxjava3/subjects/SubjectsTest.java index 3cc51135..f758d35f 100644 --- a/src/test/java/hu/akarnokd/rxjava2/subjects/SubjectsTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/subjects/SubjectsTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.subjects; +package hu.akarnokd.rxjava3.subjects; import org.junit.Test; -import hu.akarnokd.rxjava2.subjects.Subjects; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.subjects.Subjects; +import hu.akarnokd.rxjava3.test.TestHelper; public class SubjectsTest { diff --git a/src/test/java/hu/akarnokd/rxjava2/subjects/UnicastWorkSubjectTest.java b/src/test/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubjectTest.java similarity index 97% rename from src/test/java/hu/akarnokd/rxjava2/subjects/UnicastWorkSubjectTest.java rename to src/test/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubjectTest.java index b00c9723..86101d6b 100644 --- a/src/test/java/hu/akarnokd/rxjava2/subjects/UnicastWorkSubjectTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubjectTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.subjects; +package hu.akarnokd.rxjava3.subjects; import static org.junit.Assert.*; @@ -23,7 +23,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.*; +import hu.akarnokd.rxjava3.test.*; import io.reactivex.disposables.*; import io.reactivex.observers.TestObserver; import io.reactivex.plugins.RxJavaPlugins; @@ -272,7 +272,7 @@ public void run() { assertFalse(uws.hasObservers()); - uws.test().assertNotTerminated(); + uws.subscribeWith(new TestObserverEx()).assertNotTerminated(); } } @@ -409,7 +409,7 @@ public void run() { assertFalse(uws.hasObservers()); - uws.test().assertNotTerminated(); + uws.subscribeWith(new TestObserverEx()).assertNotTerminated(); } } } diff --git a/src/test/java/hu/akarnokd/rxjava2/test/BaseTest.java b/src/test/java/hu/akarnokd/rxjava3/test/BaseTest.java similarity index 97% rename from src/test/java/hu/akarnokd/rxjava2/test/BaseTest.java rename to src/test/java/hu/akarnokd/rxjava3/test/BaseTest.java index 9a7e91d9..d34a6aea 100644 --- a/src/test/java/hu/akarnokd/rxjava2/test/BaseTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/test/BaseTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.test; +package hu.akarnokd.rxjava3.test; import org.reactivestreams.Publisher; diff --git a/src/test/java/hu/akarnokd/rxjava3/test/BaseTestConsumerEx.java b/src/test/java/hu/akarnokd/rxjava3/test/BaseTestConsumerEx.java new file mode 100644 index 00000000..5f44ce0a --- /dev/null +++ b/src/test/java/hu/akarnokd/rxjava3/test/BaseTestConsumerEx.java @@ -0,0 +1,290 @@ +package hu.akarnokd.rxjava3.test; + +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; + +/** + * Base class with shared infrastructure to support TestSubscriber and TestObserver. + * @param the value type consumed + * @param the subclass of this BaseTestConsumer + */ +public abstract class BaseTestConsumerEx> +extends BaseTestConsumer { + + protected int initialFusionMode; + + protected int establishedFusionMode; + + /** + * The optional tag associated with this test consumer. + * @since 2.0.7 + */ + protected CharSequence tag; + + /** + * Indicates that one of the awaitX method has timed out. + * @since 2.0.7 + */ + protected boolean timeout; + + public BaseTestConsumerEx() { + super(); + } + + /** + * Returns the last thread which called the onXXX methods of this TestObserver/TestSubscriber. + * @return the last thread which called the onXXX methods + */ + public final Thread lastThread() { + return lastThread; + } + + // assertion methods + + /** + * Assert that this TestObserver/TestSubscriber did not receive an onNext value which is equal to + * the given value with respect to null-safe Object.equals. + * + *

History: 2.0.5 - experimental + * @param value the value to expect not being received + * @return this + * @since 2.1 + */ + @SuppressWarnings("unchecked") + public final U assertNever(T value) { + int s = values.size(); + + for (int i = 0; i < s; i++) { + T v = this.values.get(i); + if (ObjectHelper.equals(v, value)) { + throw fail("Value at position " + i + " is equal to " + valueAndClass(value) + "; Expected them to be different"); + } + } + return (U) this; + } + + /** + * Asserts that this TestObserver/TestSubscriber did not receive any onNext value for which + * the provided predicate returns true. + * + *

History: 2.0.5 - experimental + * @param valuePredicate the predicate that receives the onNext value + * and should return true for the expected value. + * @return this + * @since 2.1 + */ + @SuppressWarnings("unchecked") + public final U assertNever(Predicate valuePredicate) { + int s = values.size(); + + for (int i = 0; i < s; i++) { + T v = this.values.get(i); + try { + if (valuePredicate.test(v)) { + throw fail("Value at position " + i + " matches predicate " + valuePredicate.toString() + ", which was not expected."); + } + } catch (Throwable ex) { + throw ExceptionHelper.wrapOrThrow(ex); + } + } + return (U)this; + } + + /** + * Assert that the TestObserver/TestSubscriber terminated (i.e., the terminal latch reached zero). + * @return this + */ + @SuppressWarnings("unchecked") + public final U assertTerminated() { + if (done.getCount() != 0) { + throw fail("Subscriber still running!"); + } + long c = completions; + if (c > 1) { + throw fail("Terminated with multiple completions: " + c); + } + int s = errors.size(); + if (s > 1) { + throw fail("Terminated with multiple errors: " + s); + } + + if (c != 0 && s != 0) { + throw fail("Terminated with multiple completions and errors: " + c); + } + return (U)this; + } + + /** + * Assert that the TestObserver/TestSubscriber has not terminated (i.e., the terminal latch is still non-zero). + * @return this + */ + @SuppressWarnings("unchecked") + public final U assertNotTerminated() { + if (done.getCount() == 0) { + throw fail("Subscriber terminated!"); + } + return (U)this; + } + + /** + * Assert that there is a single error and it has the given message. + * @param message the message expected + * @return this + */ + @SuppressWarnings("unchecked") + public final U assertErrorMessage(String message) { + int s = errors.size(); + if (s == 0) { + throw fail("No errors"); + } else + if (s == 1) { + Throwable e = errors.get(0); + String errorMessage = e.getMessage(); + if (!ObjectHelper.equals(message, errorMessage)) { + throw fail("Error message differs; exptected: " + message + " but was: " + errorMessage); + } + } else { + throw fail("Multiple errors"); + } + return (U)this; + } + + /** + * Assert that the upstream signalled the specified values in order and then failed + * with a Throwable for which the provided predicate returns true. + * @param errorPredicate + * the predicate that receives the error Throwable + * and should return true for expected errors. + * @param values the expected values, asserted in order + * @return this + */ + public final U assertFailure(Predicate errorPredicate, T... values) { + return assertSubscribed() + .assertValues(values) + .assertError(errorPredicate) + .assertNotComplete(); + } + + /** + * Assert that the upstream signalled the specified values in order, + * then failed with a specific class or subclass of Throwable + * and with the given exact error message. + * @param error the expected exception (parent) class + * @param message the expected failure message + * @param values the expected values, asserted in order + * @return this + */ + public final U assertFailureAndMessage(Class error, + String message, T... values) { + return assertSubscribed() + .assertValues(values) + .assertError(error) + .assertErrorMessage(message) + .assertNotComplete(); + } + + /** + * Returns true if an await timed out. + * @return true if one of the timeout-based await methods has timed out. + *

History: 2.0.7 - experimental + * @see #clearTimeout() + * @see #assertTimeout() + * @see #assertNoTimeout() + * @since 2.1 + */ + public final boolean isTimeout() { + return timeout; + } + + /** + * Clears the timeout flag set by the await methods when they timed out. + *

History: 2.0.7 - experimental + * @return this + * @since 2.1 + * @see #isTimeout() + */ + @SuppressWarnings("unchecked") + public final U clearTimeout() { + timeout = false; + return (U)this; + } + + /** + * Asserts that some awaitX method has timed out. + *

History: 2.0.7 - experimental + * @return this + * @since 2.1 + */ + @SuppressWarnings("unchecked") + public final U assertTimeout() { + if (!timeout) { + throw fail("No timeout?!"); + } + return (U)this; + } + + /** + * Asserts that some awaitX method has not timed out. + *

History: 2.0.7 - experimental + * @return this + * @since 2.1 + */ + @SuppressWarnings("unchecked") + public final U assertNoTimeout() { + if (timeout) { + throw fail("Timeout?!"); + } + return (U)this; + } + + /** + * Returns the internal shared list of errors. + * @return Returns the internal shared list of errors. + */ + public final List errors() { + return errors; + } + + /** + * Returns true if this test consumer has terminated in any fashion. + * @return true if this test consumer has terminated in any fashion + */ + public final boolean isTerminated() { + return done.getCount() == 0; + } + + /** + * Returns the number of times onComplete() was called. + * @return the number of times onComplete() was called + */ + public final long completions() { + return completions; + } + + /** + * Fail with the given message and add the sequence of errors as suppressed ones. + *

Note this is deliberately the only fail method. Most of the times an assertion + * would fail but it is possible it was due to an exception somewhere. This construct + * will capture those potential errors and report it along with the original failure. + * + * @param message the message to use + * @return AssertionError the prepared AssertionError instance + */ + public final AssertionError failWith(String message) { + return fail(message); + } + + static String fusionModeToString(int mode) { + switch (mode) { + case QueueFuseable.NONE : return "NONE"; + case QueueFuseable.SYNC : return "SYNC"; + case QueueFuseable.ASYNC : return "ASYNC"; + default: return "Unknown(" + mode + ")"; + } + } +} \ No newline at end of file diff --git a/src/test/java/hu/akarnokd/rxjava2/test/TestException.java b/src/test/java/hu/akarnokd/rxjava3/test/TestException.java similarity index 97% rename from src/test/java/hu/akarnokd/rxjava2/test/TestException.java rename to src/test/java/hu/akarnokd/rxjava3/test/TestException.java index 0b80b6b3..c71edea1 100644 --- a/src/test/java/hu/akarnokd/rxjava2/test/TestException.java +++ b/src/test/java/hu/akarnokd/rxjava3/test/TestException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.test; +package hu.akarnokd.rxjava3.test; /** * Exception for testing if unchecked expections propagate as-is without confusing with diff --git a/src/test/java/hu/akarnokd/rxjava2/test/TestHelper.java b/src/test/java/hu/akarnokd/rxjava3/test/TestHelper.java similarity index 95% rename from src/test/java/hu/akarnokd/rxjava2/test/TestHelper.java rename to src/test/java/hu/akarnokd/rxjava3/test/TestHelper.java index e6ad5547..a9155482 100644 --- a/src/test/java/hu/akarnokd/rxjava2/test/TestHelper.java +++ b/src/test/java/hu/akarnokd/rxjava3/test/TestHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.test; +package hu.akarnokd.rxjava3.test; import static org.junit.Assert.*; import static org.mockito.ArgumentMatchers.any; @@ -226,7 +226,7 @@ public static void assertUndeliverable(List list, int index, Class to, int index, Class clazz) { - Throwable ex = to.errors().get(0); + Throwable ex = TestHelper.errors(to).get(0); try { if (ex instanceof CompositeException) { CompositeException ce = (CompositeException) ex; @@ -242,7 +242,7 @@ public static void assertError(TestObserver to, int index, Class ts, int index, Class clazz) { - Throwable ex = ts.errors().get(0); + Throwable ex = TestHelper.errors(ts).get(0); if (ex instanceof CompositeException) { CompositeException ce = (CompositeException) ex; List cel = ce.getExceptions(); @@ -253,7 +253,7 @@ public static void assertError(TestSubscriber ts, int index, Class to, int index, Class clazz, String message) { - Throwable ex = to.errors().get(0); + Throwable ex = TestHelper.errors(to).get(0); if (ex instanceof CompositeException) { CompositeException ce = (CompositeException) ex; List cel = ce.getExceptions(); @@ -265,7 +265,7 @@ public static void assertError(TestObserver to, int index, Class ts, int index, Class clazz, String message) { - Throwable ex = ts.errors().get(0); + Throwable ex = TestHelper.errors(ts).get(0); if (ex instanceof CompositeException) { CompositeException ce = (CompositeException) ex; List cel = ce.getExceptions(); @@ -501,7 +501,6 @@ public static Consumer> subscriberSingleNot(final T value) @Override public void accept(TestSubscriber ts) throws Exception { ts - .assertSubscribed() .assertValueCount(1) .assertNoErrors() .assertComplete(); @@ -524,7 +523,6 @@ public static Consumer> observerSingleNot(final T value) { @Override public void accept(TestObserver to) throws Exception { to - .assertSubscribed() .assertValueCount(1) .assertNoErrors() .assertComplete(); @@ -2291,19 +2289,23 @@ public static void checkDisposedMaybeToSingle(Function, ? extend * @param ts the TestSubscriber instance * @param classes the array of expected Throwables inside the Composite */ - public static void assertCompositeExceptions(TestSubscriber ts, Class... classes) { + public static void assertCompositeExceptions(TestSubscriber ts, final Class... classes) { ts - .assertSubscribed() .assertError(CompositeException.class) - .assertNotComplete(); - - List list = compositeList(ts.errors().get(0)); + .assertNotComplete() + .assertError(new Predicate() { + @Override + public boolean test(Throwable error) throws Throwable { + List list = compositeList(error); - assertEquals(classes.length, list.size()); + assertEquals(classes.length, list.size()); - for (int i = 0; i < classes.length; i++) { - assertError(list, i, classes[i]); - } + for (int i = 0; i < classes.length; i++) { + assertError(list, i, classes[i]); + } + return true; + } + }); } /** @@ -2316,11 +2318,10 @@ public static void assertCompositeExceptions(TestSubscriber ts, Class ts, Object... classes) { ts - .assertSubscribed() .assertError(CompositeException.class) .assertNotComplete(); - List list = compositeList(ts.errors().get(0)); + List list = compositeList(TestHelper.errors(ts).get(0)); assertEquals(classes.length, list.size() * 2); @@ -2337,11 +2338,10 @@ public static void assertCompositeExceptions(TestSubscriber ts, Object... cla */ public static void assertCompositeExceptions(TestObserver to, Class... classes) { to - .assertSubscribed() .assertError(CompositeException.class) .assertNotComplete(); - List list = compositeList(to.errors().get(0)); + List list = compositeList(TestHelper.errors(to).get(0)); assertEquals(classes.length, list.size()); @@ -2360,11 +2360,10 @@ public static void assertCompositeExceptions(TestObserver to, Class to, Object... classes) { to - .assertSubscribed() .assertError(CompositeException.class) .assertNotComplete(); - List list = compositeList(to.errors().get(0)); + List list = compositeList(TestHelper.errors(to).get(0)); assertEquals(classes.length, list.size() * 2); @@ -2537,7 +2536,7 @@ public void onComplete() { * @return the list */ public static List errorList(TestObserver to) { - return compositeList(to.errors().get(0)); + return compositeList(TestHelper.errors(to).get(0)); } /** @@ -2546,7 +2545,7 @@ public static List errorList(TestObserver to) { * @return the list */ public static List errorList(TestSubscriber ts) { - return compositeList(ts.errors().get(0)); + return compositeList(TestHelper.errors(ts).get(0)); } /** @@ -2602,14 +2601,17 @@ protected void subscribeActual(Observer observer) { to.awaitDone(5, TimeUnit.SECONDS); - to.assertSubscribed(); - if (expected != null) { to.assertValues(expected); } if (error) { to.assertError(TestException.class) - .assertErrorMessage("error") + .assertError(new Predicate() { + @Override + public boolean test(Throwable error) throws Throwable { + return error.getMessage().equals("error"); + } + }) .assertNotComplete(); } else { to.assertNoErrors().assertComplete(); @@ -2624,14 +2626,17 @@ protected void subscribeActual(Observer observer) { ts.awaitDone(5, TimeUnit.SECONDS); - ts.assertSubscribed(); - if (expected != null) { ts.assertValues(expected); } if (error) { ts.assertError(TestException.class) - .assertErrorMessage("error") + .assertError(new Predicate() { + @Override + public boolean test(Throwable error) throws Throwable { + return error.getMessage().equals("error"); + } + }) .assertNotComplete(); } else { ts.assertNoErrors().assertComplete(); @@ -2646,14 +2651,17 @@ protected void subscribeActual(Observer observer) { to.awaitDone(5, TimeUnit.SECONDS); - to.assertSubscribed(); - if (expected != null) { to.assertValues(expected); } if (error) { to.assertError(TestException.class) - .assertErrorMessage("error") + .assertError(new Predicate() { + @Override + public boolean test(Throwable error) throws Throwable { + return error.getMessage().equals("error"); + } + }) .assertNotComplete(); } else { to.assertNoErrors().assertComplete(); @@ -2668,14 +2676,17 @@ protected void subscribeActual(Observer observer) { to.awaitDone(5, TimeUnit.SECONDS); - to.assertSubscribed(); - if (expected != null) { to.assertValues(expected); } if (error) { to.assertError(TestException.class) - .assertErrorMessage("error") + .assertError(new Predicate() { + @Override + public boolean test(Throwable error) throws Throwable { + return error.getMessage().equals("error"); + } + }) .assertNotComplete(); } else { to.assertNoErrors().assertComplete(); @@ -2690,14 +2701,17 @@ protected void subscribeActual(Observer observer) { to.awaitDone(5, TimeUnit.SECONDS); - to.assertSubscribed(); - if (expected != null) { to.assertValues(expected); } if (error) { to.assertError(TestException.class) - .assertErrorMessage("error") + .assertError(new Predicate() { + @Override + public boolean test(Throwable error) throws Throwable { + return error.getMessage().equals("error"); + } + }) .assertNotComplete(); } else { to.assertNoErrors().assertComplete(); @@ -2761,14 +2775,17 @@ protected void subscribeActual(Subscriber subscriber) { to.awaitDone(5, TimeUnit.SECONDS); - to.assertSubscribed(); - if (expected != null) { to.assertValues(expected); } if (error) { to.assertError(TestException.class) - .assertErrorMessage("error") + .assertError(new Predicate() { + @Override + public boolean test(Throwable error) throws Throwable { + return error.getMessage().equals("error"); + } + }) .assertNotComplete(); } else { to.assertNoErrors().assertComplete(); @@ -2783,14 +2800,17 @@ protected void subscribeActual(Subscriber subscriber) { ts.awaitDone(5, TimeUnit.SECONDS); - ts.assertSubscribed(); - if (expected != null) { ts.assertValues(expected); } if (error) { ts.assertError(TestException.class) - .assertErrorMessage("error") + .assertError(new Predicate() { + @Override + public boolean test(Throwable error) throws Throwable { + return error.getMessage().equals("error"); + } + }) .assertNotComplete(); } else { ts.assertNoErrors().assertComplete(); @@ -2805,14 +2825,17 @@ protected void subscribeActual(Subscriber subscriber) { to.awaitDone(5, TimeUnit.SECONDS); - to.assertSubscribed(); - if (expected != null) { to.assertValues(expected); } if (error) { to.assertError(TestException.class) - .assertErrorMessage("error") + .assertError(new Predicate() { + @Override + public boolean test(Throwable error) throws Throwable { + return error.getMessage().equals("error"); + } + }) .assertNotComplete(); } else { to.assertNoErrors().assertComplete(); @@ -2827,14 +2850,17 @@ protected void subscribeActual(Subscriber subscriber) { to.awaitDone(5, TimeUnit.SECONDS); - to.assertSubscribed(); - if (expected != null) { to.assertValues(expected); } if (error) { to.assertError(TestException.class) - .assertErrorMessage("error") + .assertError(new Predicate() { + @Override + public boolean test(Throwable error) throws Throwable { + return error.getMessage().equals("error"); + } + }) .assertNotComplete(); } else { to.assertNoErrors().assertComplete(); @@ -2849,14 +2875,17 @@ protected void subscribeActual(Subscriber subscriber) { to.awaitDone(5, TimeUnit.SECONDS); - to.assertSubscribed(); - if (expected != null) { to.assertValues(expected); } if (error) { to.assertError(TestException.class) - .assertErrorMessage("error") + .assertError(new Predicate() { + @Override + public boolean test(Throwable error) throws Throwable { + return error.getMessage().equals("error"); + } + }) .assertNotComplete(); } else { to.assertNoErrors().assertComplete(); @@ -2889,27 +2918,21 @@ public static void checkInvalidParallelSubscribers(ParallelFlowable sourc } } - public static TestSubscriber fusedSubscriber(int mode) { - TestSubscriber ts = new TestSubscriber(); + public static TestSubscriberEx fusedSubscriber(int mode) { + TestSubscriberEx ts = new TestSubscriberEx(); + ts.setInitialFusionMode(mode); + return ts; + } + + @SuppressWarnings("unchecked") + public static List errors(BaseTestConsumer testConsumer) { try { - Field f = BaseTestConsumer.class.getDeclaredField("initialFusionMode"); + Field f = BaseTestConsumer.class.getDeclaredField("errors"); f.setAccessible(true); - f.set(ts, mode); + return (List)f.get(testConsumer); } catch (Throwable ex) { throw Exceptions.propagate(ex); } - return ts; - } - - public static Consumer> assertFusedSubscriber(final int mode) { - return new Consumer>() { - @Override - public void accept(TestSubscriber ts) throws Exception { - Field f = BaseTestConsumer.class.getDeclaredField("establishedFusionMode"); - f.setAccessible(true); - assertEquals(mode, f.get(ts)); - } - }; } /** @@ -2933,7 +2956,7 @@ public static File findSourceDir() 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/hu/akarnokd/rxjava2"; + String p = path.substring(0, j + 1) + "src/main/java/hu/akarnokd/rxjava3"; File f = new File(p); @@ -2945,4 +2968,12 @@ public static File findSourceDir() throws Exception { return f; } + public static Predicate assertErrorMessage(final String message) { + return new Predicate() { + @Override + public boolean test(Throwable error) throws Throwable { + return error.getMessage().equals(message); + } + }; + } } \ No newline at end of file diff --git a/src/test/java/hu/akarnokd/rxjava3/test/TestObserverEx.java b/src/test/java/hu/akarnokd/rxjava3/test/TestObserverEx.java new file mode 100644 index 00000000..4d6e613d --- /dev/null +++ b/src/test/java/hu/akarnokd/rxjava3/test/TestObserverEx.java @@ -0,0 +1,306 @@ +package hu.akarnokd.rxjava3.test; + +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.*; + +/** + * An extended test Observer that records events and allows making assertions about them. + * + *

You can override the onSubscribe, onNext, onError, onComplete, onSuccess and + * cancel methods but not the others (this is by design). + * + *

The TestObserver implements Disposable for convenience where dispose calls cancel. + * + * @param the value type + */ +public class TestObserverEx +extends BaseTestConsumerEx> +implements Observer, Disposable, MaybeObserver, SingleObserver, CompletableObserver { + /** The actual observer to forward events to. */ + private final Observer downstream; + + /** Holds the current subscription if any. */ + private final AtomicReference upstream = new AtomicReference(); + + private QueueDisposable qd; + + /** + * Constructs a non-forwarding TestObserver. + */ + public TestObserverEx() { + this(EmptyObserver.INSTANCE); + } + + /** + * Constructs a forwarding TestObserver. + * @param downstream the actual Observer to forward events to + */ + public TestObserverEx(Observer downstream) { + this.downstream = downstream; + } + + /** + * Constructs a TestObserverEx with the given initial fusion mode. + * @param fusionMode the fusion mode, see {@link QueueFuseable} + */ + public TestObserverEx(int fusionMode) { + this(); + setInitialFusionMode(fusionMode); + } + + @SuppressWarnings("unchecked") + @Override + public void onSubscribe(Disposable d) { + lastThread = Thread.currentThread(); + + if (d == null) { + errors.add(new NullPointerException("onSubscribe received a null Subscription")); + return; + } + if (!upstream.compareAndSet(null, d)) { + d.dispose(); + if (upstream.get() != DisposableHelper.DISPOSED) { + errors.add(new IllegalStateException("onSubscribe received multiple subscriptions: " + d)); + } + return; + } + + if (initialFusionMode != 0) { + if (d instanceof QueueDisposable) { + qd = (QueueDisposable)d; + + int m = qd.requestFusion(initialFusionMode); + establishedFusionMode = m; + + if (m == QueueFuseable.SYNC) { + checkSubscriptionOnce = true; + lastThread = Thread.currentThread(); + try { + T t; + while ((t = qd.poll()) != null) { + values.add(t); + } + completions++; + + upstream.lazySet(DisposableHelper.DISPOSED); + } catch (Throwable ex) { + errors.add(ex); + } + return; + } + } + } + + downstream.onSubscribe(d); + } + + @Override + public void onNext(T t) { + if (!checkSubscriptionOnce) { + checkSubscriptionOnce = true; + if (upstream.get() == null) { + errors.add(new IllegalStateException("onSubscribe not called in proper order")); + } + } + + lastThread = Thread.currentThread(); + + if (establishedFusionMode == QueueFuseable.ASYNC) { + try { + while ((t = qd.poll()) != null) { + values.add(t); + } + } catch (Throwable ex) { + errors.add(ex); + qd.dispose(); + } + return; + } + + values.add(t); + + if (t == null) { + errors.add(new NullPointerException("onNext received a null value")); + } + + downstream.onNext(t); + } + + @Override + public void onError(Throwable t) { + if (!checkSubscriptionOnce) { + checkSubscriptionOnce = true; + if (upstream.get() == null) { + errors.add(new IllegalStateException("onSubscribe not called in proper order")); + } + } + + try { + lastThread = Thread.currentThread(); + if (t == null) { + errors.add(new NullPointerException("onError received a null Throwable")); + } else { + errors.add(t); + } + + downstream.onError(t); + } finally { + done.countDown(); + } + } + + @Override + public void onComplete() { + if (!checkSubscriptionOnce) { + checkSubscriptionOnce = true; + if (upstream.get() == null) { + errors.add(new IllegalStateException("onSubscribe not called in proper order")); + } + } + + try { + lastThread = Thread.currentThread(); + completions++; + + downstream.onComplete(); + } finally { + done.countDown(); + } + } + + @Override + public final void dispose() { + DisposableHelper.dispose(upstream); + } + + @Override + public final boolean isDisposed() { + return DisposableHelper.isDisposed(upstream.get()); + } + + // state retrieval methods + /** + * Returns true if this TestObserver received a subscription. + * @return true if this TestObserver received a subscription + */ + public final boolean hasSubscription() { + return upstream.get() != null; + } + + /** + * Assert that the onSubscribe method was called exactly once. + * @return this; + */ + @Override + public final TestObserverEx assertSubscribed() { + if (upstream.get() == null) { + throw fail("Not subscribed!"); + } + return this; + } + + /** + * Assert that the onSubscribe method hasn't been called at all. + * @return this; + */ + public final TestObserverEx assertNotSubscribed() { + if (upstream.get() != null) { + throw fail("Subscribed!"); + } else + if (!errors.isEmpty()) { + throw fail("Not subscribed but errors found"); + } + return this; + } + + /** + * Sets the initial fusion mode if the upstream supports fusion. + *

Package-private: avoid leaking the now internal fusion properties into the public API. + * Use ObserverFusion to work with such tests. + * @param mode the mode to establish, see the {@link QueueDisposable} constants + * @return this + */ + public final TestObserverEx setInitialFusionMode(int mode) { + this.initialFusionMode = mode; + return this; + } + + /** + * Asserts that the given fusion mode has been established + *

Package-private: avoid leaking the now internal fusion properties into the public API. + * Use ObserverFusion to work with such tests. + * @param mode the expected mode + * @return this + */ + public final TestObserverEx assertFusionMode(int mode) { + int m = establishedFusionMode; + if (m != mode) { + if (qd != null) { + throw new AssertionError("Fusion mode different. Expected: " + fusionModeToString(mode) + + ", actual: " + fusionModeToString(m)); + } else { + throw fail("Upstream is not fuseable"); + } + } + return this; + } + + /** + * Assert that the upstream is a fuseable source. + *

Package-private: avoid leaking the now internal fusion properties into the public API. + * Use ObserverFusion to work with such tests. + * @return this + */ + public final TestObserverEx assertFuseable() { + if (qd == null) { + throw new AssertionError("Upstream is not fuseable."); + } + return this; + } + + /** + * Assert that the upstream is not a fuseable source. + *

Package-private: avoid leaking the now internal fusion properties into the public API. + * Use ObserverFusion to work with such tests. + * @return this + */ + public final TestObserverEx assertNotFuseable() { + if (qd != null) { + throw new AssertionError("Upstream is fuseable."); + } + return this; + } + + @Override + public void onSuccess(T value) { + onNext(value); + onComplete(); + } + + /** + * An observer that ignores all events and does not report errors. + */ + enum EmptyObserver implements Observer { + INSTANCE; + + @Override + public void onSubscribe(Disposable d) { + } + + @Override + public void onNext(Object t) { + } + + @Override + public void onError(Throwable t) { + } + + @Override + public void onComplete() { + } + } +} \ No newline at end of file diff --git a/src/test/java/hu/akarnokd/rxjava3/test/TestSubscriberEx.java b/src/test/java/hu/akarnokd/rxjava3/test/TestSubscriberEx.java new file mode 100644 index 00000000..9ee7881b --- /dev/null +++ b/src/test/java/hu/akarnokd/rxjava3/test/TestSubscriberEx.java @@ -0,0 +1,375 @@ +package hu.akarnokd.rxjava3.test; + +import java.util.concurrent.atomic.*; + +import org.reactivestreams.*; + +import io.reactivex.FlowableSubscriber; +import io.reactivex.internal.fuseable.*; +import io.reactivex.internal.subscriptions.SubscriptionHelper; + +/** + * An extended test subscriber that records events and allows making assertions about them. + * + *

You can override the onSubscribe, onNext, onError, onComplete, request and + * cancel methods but not the others (this is by design). + * + *

The TestSubscriber implements Disposable for convenience where dispose calls cancel. + * + *

When calling the default request method, you are requesting on behalf of the + * wrapped actual subscriber. + * + * @param the value type + */ +public class TestSubscriberEx +extends BaseTestConsumerEx> +implements FlowableSubscriber, Subscription { + /** The actual subscriber to forward events to. */ + private final Subscriber downstream; + + /** Makes sure the incoming Subscriptions get cancelled immediately. */ + private volatile boolean cancelled; + + /** Holds the current subscription if any. */ + private final AtomicReference upstream; + + /** Holds the requested amount until a subscription arrives. */ + private final AtomicLong missedRequested; + + private QueueSubscription qs; + + /** + * Constructs a non-forwarding TestSubscriber with an initial request value of Long.MAX_VALUE. + */ + public TestSubscriberEx() { + this(EmptySubscriber.INSTANCE, Long.MAX_VALUE); + } + + /** + * Constructs a non-forwarding TestSubscriber with the specified initial request value. + *

The TestSubscriber doesn't validate the initialRequest value so one can + * test sources with invalid values as well. + * @param initialRequest the initial request value + */ + public TestSubscriberEx(long initialRequest) { + this(EmptySubscriber.INSTANCE, initialRequest); + } + + /** + * Constructs a forwarding TestSubscriber but leaves the requesting to the wrapped subscriber. + * @param downstream the actual Subscriber to forward events to + */ + public TestSubscriberEx(Subscriber downstream) { + this(downstream, Long.MAX_VALUE); + } + + /** + * Constructs a forwarding TestSubscriber with the specified initial request value. + *

The TestSubscriber doesn't validate the initialRequest value so one can + * test sources with invalid values as well. + * @param downstream the actual Subscriber to forward events to + * @param initialRequest the initial request value + */ + public TestSubscriberEx(Subscriber downstream, long initialRequest) { + super(); + if (initialRequest < 0) { + throw new IllegalArgumentException("Negative initial request not allowed"); + } + this.downstream = downstream; + this.upstream = new AtomicReference(); + this.missedRequested = new AtomicLong(initialRequest); + } + + @SuppressWarnings("unchecked") + @Override + public void onSubscribe(Subscription s) { + lastThread = Thread.currentThread(); + + if (s == null) { + errors.add(new NullPointerException("onSubscribe received a null Subscription")); + return; + } + if (!upstream.compareAndSet(null, s)) { + s.cancel(); + if (upstream.get() != SubscriptionHelper.CANCELLED) { + errors.add(new IllegalStateException("onSubscribe received multiple subscriptions: " + s)); + } + return; + } + + if (initialFusionMode != 0) { + if (s instanceof QueueSubscription) { + qs = (QueueSubscription)s; + + int m = qs.requestFusion(initialFusionMode); + establishedFusionMode = m; + + if (m == QueueFuseable.SYNC) { + checkSubscriptionOnce = true; + lastThread = Thread.currentThread(); + try { + T t; + while ((t = qs.poll()) != null) { + values.add(t); + } + completions++; + } catch (Throwable ex) { + // Exceptions.throwIfFatal(e); TODO add fatal exceptions? + errors.add(ex); + } + return; + } + } + } + + downstream.onSubscribe(s); + + long mr = missedRequested.getAndSet(0L); + if (mr != 0L) { + s.request(mr); + } + + onStart(); + } + + /** + * Called after the onSubscribe is called and handled. + */ + protected void onStart() { + + } + + @Override + public void onNext(T t) { + if (!checkSubscriptionOnce) { + checkSubscriptionOnce = true; + if (upstream.get() == null) { + errors.add(new IllegalStateException("onSubscribe not called in proper order")); + } + } + lastThread = Thread.currentThread(); + + if (establishedFusionMode == QueueFuseable.ASYNC) { + try { + while ((t = qs.poll()) != null) { + values.add(t); + } + } catch (Throwable ex) { + // Exceptions.throwIfFatal(e); TODO add fatal exceptions? + errors.add(ex); + qs.cancel(); + } + return; + } + + values.add(t); + + if (t == null) { + errors.add(new NullPointerException("onNext received a null value")); + } + + downstream.onNext(t); + } + + @Override + public void onError(Throwable t) { + if (!checkSubscriptionOnce) { + checkSubscriptionOnce = true; + if (upstream.get() == null) { + errors.add(new NullPointerException("onSubscribe not called in proper order")); + } + } + try { + lastThread = Thread.currentThread(); + errors.add(t); + + if (t == null) { + errors.add(new IllegalStateException("onError received a null Throwable")); + } + + downstream.onError(t); + } finally { + done.countDown(); + } + } + + @Override + public void onComplete() { + if (!checkSubscriptionOnce) { + checkSubscriptionOnce = true; + if (upstream.get() == null) { + errors.add(new IllegalStateException("onSubscribe not called in proper order")); + } + } + try { + lastThread = Thread.currentThread(); + completions++; + + downstream.onComplete(); + } finally { + done.countDown(); + } + } + + @Override + public final void request(long n) { + SubscriptionHelper.deferredRequest(upstream, missedRequested, n); + } + + @Override + public final void cancel() { + if (!cancelled) { + cancelled = true; + SubscriptionHelper.cancel(upstream); + } + } + + /** + * Returns true if this TestSubscriber has been cancelled. + * @return true if this TestSubscriber has been cancelled + */ + public final boolean isCancelled() { + return cancelled; + } + + @Override + protected final void dispose() { + cancel(); + } + + @Override + protected final boolean isDisposed() { + return cancelled; + } + + // state retrieval methods + + /** + * Returns true if this TestSubscriber received a subscription. + * @return true if this TestSubscriber received a subscription + */ + public final boolean hasSubscription() { + return upstream.get() != null; + } + + // assertion methods + + /** + * Assert that the onSubscribe method was called exactly once. + * @return this + */ + @Override + public final TestSubscriberEx assertSubscribed() { + if (upstream.get() == null) { + throw fail("Not subscribed!"); + } + return this; + } + + /** + * Assert that the onSubscribe method hasn't been called at all. + * @return this + */ + public final TestSubscriberEx assertNotSubscribed() { + if (upstream.get() != null) { + throw fail("Subscribed!"); + } else + if (!errors.isEmpty()) { + throw fail("Not subscribed but errors found"); + } + return this; + } + + /** + * Sets the initial fusion mode if the upstream supports fusion. + *

Package-private: avoid leaking the now internal fusion properties into the public API. + * Use SubscriberFusion to work with such tests. + * @param mode the mode to establish, see the {@link QueueSubscription} constants + * @return this + */ + public final TestSubscriberEx setInitialFusionMode(int mode) { + this.initialFusionMode = mode; + return this; + } + + /** + * Asserts that the given fusion mode has been established + *

Package-private: avoid leaking the now internal fusion properties into the public API. + * Use SubscriberFusion to work with such tests. + * @param mode the expected mode + * @return this + */ + public final TestSubscriberEx assertFusionMode(int mode) { + int m = establishedFusionMode; + if (m != mode) { + if (qs != null) { + throw new AssertionError("Fusion mode different. Expected: " + fusionModeToString(mode) + + ", actual: " + fusionModeToString(m)); + } else { + throw fail("Upstream is not fuseable"); + } + } + return this; + } + + /** + * Assert that the upstream is a fuseable source. + *

Package-private: avoid leaking the now internal fusion properties into the public API. + * Use SubscriberFusion to work with such tests. + * @return this + */ + public final TestSubscriberEx assertFuseable() { + if (qs == null) { + throw new AssertionError("Upstream is not fuseable."); + } + return this; + } + + /** + * Assert that the upstream is not a fuseable source. + *

Package-private: avoid leaking the now internal fusion properties into the public API. + * Use SubscriberFusion to work with such tests. + * @return this + */ + public final TestSubscriberEx assertNotFuseable() { + if (qs != null) { + throw new AssertionError("Upstream is fuseable."); + } + return this; + } + + /** + * Calls {@link #request(long)} and returns this. + *

History: 2.0.1 - experimental + * @param n the request amount + * @return this + * @since 2.1 + */ + public final TestSubscriberEx requestMore(long n) { + request(n); + return this; + } + + /** + * A subscriber that ignores all events and does not report errors. + */ + enum EmptySubscriber implements FlowableSubscriber { + INSTANCE; + + @Override + public void onSubscribe(Subscription s) { + } + + @Override + public void onNext(Object t) { + } + + @Override + public void onError(Throwable t) { + } + + @Override + public void onComplete() { + } + } +} \ No newline at end of file diff --git a/src/test/java/hu/akarnokd/rxjava2/util/SpmcLinkedArrayQueueTest.java b/src/test/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueueTest.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/util/SpmcLinkedArrayQueueTest.java rename to src/test/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueueTest.java index 4f6e5150..f376b66a 100644 --- a/src/test/java/hu/akarnokd/rxjava2/util/SpmcLinkedArrayQueueTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueueTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.util; +package hu.akarnokd.rxjava3.util; import static org.junit.Assert.*; @@ -22,7 +22,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; public class SpmcLinkedArrayQueueTest { diff --git a/src/test/java/hu/akarnokd/rxjava2/validation/CheckLocalVariablesInTests.java b/src/test/java/hu/akarnokd/rxjava3/validation/CheckLocalVariablesInTests.java similarity index 99% rename from src/test/java/hu/akarnokd/rxjava2/validation/CheckLocalVariablesInTests.java rename to src/test/java/hu/akarnokd/rxjava3/validation/CheckLocalVariablesInTests.java index 8c2b8c97..0b8651c2 100644 --- a/src/test/java/hu/akarnokd/rxjava2/validation/CheckLocalVariablesInTests.java +++ b/src/test/java/hu/akarnokd/rxjava3/validation/CheckLocalVariablesInTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.validation; +package hu.akarnokd.rxjava3.validation; import java.io.*; import java.util.*; @@ -22,7 +22,7 @@ import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; /** * Checks for commonly copy-pasted but not-renamed local variables in unit tests. diff --git a/src/test/java/hu/akarnokd/rxjava2/validation/NewLinesBeforeAnnotation.java b/src/test/java/hu/akarnokd/rxjava3/validation/NewLinesBeforeAnnotation.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/validation/NewLinesBeforeAnnotation.java rename to src/test/java/hu/akarnokd/rxjava3/validation/NewLinesBeforeAnnotation.java index 230a7008..a0f10768 100644 --- a/src/test/java/hu/akarnokd/rxjava2/validation/NewLinesBeforeAnnotation.java +++ b/src/test/java/hu/akarnokd/rxjava3/validation/NewLinesBeforeAnnotation.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.validation; +package hu.akarnokd.rxjava3.validation; import java.io.*; import java.util.*; import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; /** * These tests verify the code style that a typical closing curly brace diff --git a/src/test/java/hu/akarnokd/rxjava2/validation/TooManyEmptyNewLines.java b/src/test/java/hu/akarnokd/rxjava3/validation/TooManyEmptyNewLines.java similarity index 98% rename from src/test/java/hu/akarnokd/rxjava2/validation/TooManyEmptyNewLines.java rename to src/test/java/hu/akarnokd/rxjava3/validation/TooManyEmptyNewLines.java index cb6293df..18984881 100644 --- a/src/test/java/hu/akarnokd/rxjava2/validation/TooManyEmptyNewLines.java +++ b/src/test/java/hu/akarnokd/rxjava3/validation/TooManyEmptyNewLines.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package hu.akarnokd.rxjava2.validation; +package hu.akarnokd.rxjava3.validation; import java.io.*; import java.util.*; import org.junit.Test; -import hu.akarnokd.rxjava2.test.TestHelper; +import hu.akarnokd.rxjava3.test.TestHelper; /** * Test verifying there are no 2..5 empty newlines in the code. From abb6e7ae81e0a2e54069be654d7c691af6e10056 Mon Sep 17 00:00:00 2001 From: akarnokd Date: Tue, 25 Jun 2019 13:49:57 +0200 Subject: [PATCH 002/203] Fix CI link to branch 3.x --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a65cf5a6..ff30af33 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # RxJavaExtensions - + [![codecov.io](http://codecov.io/github/akarnokd/RxJavaExtensions/coverage.svg?branch=3.x)](http://codecov.io/github/akarnokd/RxJavaExtensions?branch=3.x) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.akarnokd/rxjava3-extensions/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.akarnokd/rxjava3-extensions) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava) From 16d835040a46fbb8d0936d91a6ae825cc4b1c6dd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2019 07:51:19 +0200 Subject: [PATCH 003/203] Bump mockito-core from 2.28.2 to 3.0.0 (#38) Bumps [mockito-core](https://github.com/mockito/mockito) from 2.28.2 to 3.0.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v2.28.2...v3.0.0) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6fbf7595..89ce18af 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' - testCompile 'org.mockito:mockito-core:2.28.2' + testCompile 'org.mockito:mockito-core:3.0.0' } task sourcesJar(type: Jar, dependsOn: classes) { From f7b14fb7d4ed7a44646729c1c5d4c41c34a0a691 Mon Sep 17 00:00:00 2001 From: akarnokd Date: Wed, 17 Jul 2019 13:37:12 +0200 Subject: [PATCH 004/203] Upgrade to RxJava 3.0.0-RC1 --- README.md | 2 +- build.gradle | 2 +- gradle.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ff30af33..639a84a5 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ RxJava 3.x implementation of extra sources, operators and components and ports o ``` dependencies { - compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC0" + compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC1" } ``` diff --git a/build.gradle b/build.gradle index 6fbf7595..33fd9c08 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java16:1.1@signature' compile "org.reactivestreams:reactive-streams:1.0.2" - compile "io.reactivex.rxjava3:rxjava:3.0.0-RC0" + compile "io.reactivex.rxjava3:rxjava:3.0.0-RC1" testCompile group: 'junit', name: 'junit', version: '4.12' diff --git a/gradle.properties b/gradle.properties index ec4c4198..99858131 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=3.0.0-RC0 +version=3.0.0-RC1 From 98dbcf9deabd185ab1a602936371b2579b66b296 Mon Sep 17 00:00:00 2001 From: akarnokd Date: Tue, 20 Aug 2019 10:21:36 +0200 Subject: [PATCH 005/203] Upgrade to RxJava 3.0.0-RC2 --- README.md | 2 +- build.gradle | 4 +- gradle.properties | 2 +- .../hu/akarnokd/rxjava3/FlatMapExPerf.java | 6 +-- .../akarnokd/rxjava3/PerfAsyncConsumer.java | 4 +- .../hu/akarnokd/rxjava3/PerfConsumer.java | 4 +- .../akarnokd/rxjava3/async/AsyncFlowable.java | 20 +++++----- .../rxjava3/async/AsyncObservable.java | 20 +++++----- .../rxjava3/async/DisposableFlowable.java | 4 +- .../rxjava3/async/DisposableObservable.java | 4 +- .../async/FlowableFromCallableNull.java | 8 ++-- .../rxjava3/async/FutureCompletable.java | 6 +-- .../async/ObservableFromSupplierNull.java | 8 ++-- .../BasicEmptyQueueSubscription.java | 2 +- .../BasicNonoIntQueueSubscription.java | 2 +- .../basetypes/BasicNonoSubscriber.java | 2 +- .../basetypes/BasicRefNonoSubscriber.java | 2 +- .../basetypes/BasicRefQueueSubscription.java | 2 +- .../basetypes/BasicSoloQueueSubscription.java | 2 +- .../basetypes/BlockingGetSubscriber.java | 10 ++--- .../basetypes/FuturePerhapsSubscriber.java | 4 +- .../hu/akarnokd/rxjava3/basetypes/Nono.java | 20 +++++----- .../rxjava3/basetypes/NonoAmbArray.java | 2 +- .../rxjava3/basetypes/NonoAmbIterable.java | 6 +-- .../rxjava3/basetypes/NonoAndThen.java | 2 +- .../basetypes/NonoAndThenPublisher.java | 4 +- .../NonoBlockingAwaitSubscriber.java | 2 +- .../rxjava3/basetypes/NonoComplete.java | 4 +- .../rxjava3/basetypes/NonoConcat.java | 12 +++--- .../rxjava3/basetypes/NonoConcatArray.java | 4 +- .../rxjava3/basetypes/NonoConcatIterable.java | 8 ++-- .../rxjava3/basetypes/NonoCreate.java | 12 +++--- .../akarnokd/rxjava3/basetypes/NonoDefer.java | 8 ++-- .../akarnokd/rxjava3/basetypes/NonoDelay.java | 6 +-- .../basetypes/NonoDelaySubscription.java | 4 +- .../rxjava3/basetypes/NonoDoFinally.java | 8 ++-- .../rxjava3/basetypes/NonoDoOnLifecycle.java | 8 ++-- .../akarnokd/rxjava3/basetypes/NonoError.java | 4 +- .../rxjava3/basetypes/NonoErrorSupplier.java | 8 ++-- .../rxjava3/basetypes/NonoFlatMapSignal.java | 10 ++--- .../rxjava3/basetypes/NonoFromAction.java | 6 +-- .../basetypes/NonoFromCompletable.java | 6 +-- .../rxjava3/basetypes/NonoFromFuture.java | 6 +-- .../rxjava3/basetypes/NonoFromMaybe.java | 6 +-- .../rxjava3/basetypes/NonoFromObservable.java | 6 +-- .../rxjava3/basetypes/NonoFromPublisher.java | 2 +- .../rxjava3/basetypes/NonoFromSingle.java | 6 +-- .../basetypes/NonoLambdaSubscriber.java | 10 ++--- .../akarnokd/rxjava3/basetypes/NonoLift.java | 8 ++-- .../rxjava3/basetypes/NonoMapError.java | 6 +-- .../akarnokd/rxjava3/basetypes/NonoMerge.java | 8 ++-- .../rxjava3/basetypes/NonoMergeArray.java | 6 +-- .../rxjava3/basetypes/NonoMergeIterable.java | 10 ++--- .../akarnokd/rxjava3/basetypes/NonoNever.java | 2 +- .../rxjava3/basetypes/NonoObserveOn.java | 6 +-- .../rxjava3/basetypes/NonoOnErrorResume.java | 6 +-- .../rxjava3/basetypes/NonoProcessor.java | 2 +- .../rxjava3/basetypes/NonoRepeat.java | 2 +- .../rxjava3/basetypes/NonoRepeatUntil.java | 6 +-- .../rxjava3/basetypes/NonoRepeatWhen.java | 12 +++--- .../rxjava3/basetypes/NonoRetryWhen.java | 12 +++--- .../rxjava3/basetypes/NonoRetryWhile.java | 6 +-- .../rxjava3/basetypes/NonoSubscribeOn.java | 8 ++-- .../rxjava3/basetypes/NonoTakeUntil.java | 4 +- .../rxjava3/basetypes/NonoTimeout.java | 4 +- .../akarnokd/rxjava3/basetypes/NonoTimer.java | 6 +-- .../rxjava3/basetypes/NonoToMaybe.java | 6 +-- .../rxjava3/basetypes/NonoToPerhaps.java | 2 +- .../rxjava3/basetypes/NonoUnsubscribeOn.java | 2 +- .../akarnokd/rxjava3/basetypes/NonoUsing.java | 10 ++--- .../akarnokd/rxjava3/basetypes/Perhaps.java | 20 +++++----- .../rxjava3/basetypes/PerhapsAmbArray.java | 4 +- .../rxjava3/basetypes/PerhapsAmbIterable.java | 4 +- .../rxjava3/basetypes/PerhapsAndThenNono.java | 2 +- .../rxjava3/basetypes/PerhapsCache.java | 2 +- .../rxjava3/basetypes/PerhapsCreate.java | 14 +++---- .../basetypes/PerhapsDefaultIfEmpty.java | 2 +- .../rxjava3/basetypes/PerhapsDefer.java | 8 ++-- .../rxjava3/basetypes/PerhapsDelay.java | 6 +-- .../basetypes/PerhapsDelayPublisher.java | 6 +-- .../basetypes/PerhapsDelaySubscription.java | 4 +- .../rxjava3/basetypes/PerhapsDoFinally.java | 2 +- .../basetypes/PerhapsDoOnLifecycle.java | 10 ++--- .../rxjava3/basetypes/PerhapsEmpty.java | 4 +- .../rxjava3/basetypes/PerhapsError.java | 4 +- .../basetypes/PerhapsErrorSupplier.java | 8 ++-- .../rxjava3/basetypes/PerhapsFilter.java | 4 +- .../rxjava3/basetypes/PerhapsFlatMap.java | 8 ++-- .../basetypes/PerhapsFlatMapPublisher.java | 10 ++--- .../basetypes/PerhapsFlatMapSignal.java | 8 ++-- .../rxjava3/basetypes/PerhapsFromAction.java | 6 +-- .../basetypes/PerhapsFromCallable.java | 6 +-- .../basetypes/PerhapsFromCompletable.java | 8 ++-- .../rxjava3/basetypes/PerhapsFromFuture.java | 2 +- .../rxjava3/basetypes/PerhapsFromMaybe.java | 8 ++-- .../basetypes/PerhapsFromPublisher.java | 4 +- .../rxjava3/basetypes/PerhapsFromSingle.java | 2 +- .../rxjava3/basetypes/PerhapsJust.java | 4 +- .../rxjava3/basetypes/PerhapsLift.java | 8 ++-- .../rxjava3/basetypes/PerhapsMap.java | 2 +- .../rxjava3/basetypes/PerhapsMapError.java | 2 +- .../rxjava3/basetypes/PerhapsNever.java | 2 +- .../rxjava3/basetypes/PerhapsObserveOn.java | 2 +- .../basetypes/PerhapsOnErrorResumeNext.java | 10 ++--- .../basetypes/PerhapsOnErrorResumeWith.java | 4 +- .../basetypes/PerhapsOnErrorReturnItem.java | 2 +- .../rxjava3/basetypes/PerhapsProcessor.java | 4 +- .../rxjava3/basetypes/PerhapsRetry.java | 2 +- .../rxjava3/basetypes/PerhapsRetryWhen.java | 14 +++---- .../rxjava3/basetypes/PerhapsRetryWhile.java | 6 +-- .../rxjava3/basetypes/PerhapsSubscribeOn.java | 6 +-- .../basetypes/PerhapsSwitchIfEmpty.java | 4 +- .../rxjava3/basetypes/PerhapsTakeUntil.java | 4 +- .../rxjava3/basetypes/PerhapsTimeout.java | 4 +- .../rxjava3/basetypes/PerhapsTimer.java | 6 +-- .../rxjava3/basetypes/PerhapsToFlowable.java | 4 +- .../rxjava3/basetypes/PerhapsToMaybe.java | 6 +-- .../basetypes/PerhapsToObservable.java | 6 +-- .../basetypes/PerhapsUnsubscribeOn.java | 2 +- .../rxjava3/basetypes/PerhapsUsing.java | 10 ++--- .../rxjava3/basetypes/PerhapsZipArray.java | 8 ++-- .../rxjava3/basetypes/PerhapsZipIterable.java | 6 +-- .../hu/akarnokd/rxjava3/basetypes/Solo.java | 20 +++++----- .../rxjava3/basetypes/SoloAmbArray.java | 4 +- .../rxjava3/basetypes/SoloAmbIterable.java | 4 +- .../rxjava3/basetypes/SoloAndThen.java | 2 +- .../akarnokd/rxjava3/basetypes/SoloCache.java | 2 +- .../rxjava3/basetypes/SoloCreate.java | 16 ++++---- .../akarnokd/rxjava3/basetypes/SoloDefer.java | 8 ++-- .../akarnokd/rxjava3/basetypes/SoloDelay.java | 10 ++--- .../rxjava3/basetypes/SoloDelayPublisher.java | 8 ++-- .../basetypes/SoloDelaySubscription.java | 2 +- .../rxjava3/basetypes/SoloDoFinally.java | 10 ++--- .../rxjava3/basetypes/SoloDoOnLifecycle.java | 10 ++--- .../akarnokd/rxjava3/basetypes/SoloError.java | 4 +- .../rxjava3/basetypes/SoloErrorSupplier.java | 8 ++-- .../rxjava3/basetypes/SoloFilter.java | 4 +- .../rxjava3/basetypes/SoloFlatMap.java | 8 ++-- .../basetypes/SoloFlatMapPublisher.java | 10 ++--- .../rxjava3/basetypes/SoloFlatMapSignal.java | 8 ++-- .../rxjava3/basetypes/SoloFromCallable.java | 6 +-- .../rxjava3/basetypes/SoloFromFuture.java | 2 +- .../rxjava3/basetypes/SoloFromPublisher.java | 4 +- .../rxjava3/basetypes/SoloFromSingle.java | 8 ++-- .../akarnokd/rxjava3/basetypes/SoloHide.java | 2 +- .../akarnokd/rxjava3/basetypes/SoloJust.java | 4 +- .../akarnokd/rxjava3/basetypes/SoloLift.java | 8 ++-- .../akarnokd/rxjava3/basetypes/SoloMap.java | 6 +-- .../rxjava3/basetypes/SoloMapError.java | 10 ++--- .../akarnokd/rxjava3/basetypes/SoloNever.java | 2 +- .../rxjava3/basetypes/SoloObserveOn.java | 10 ++--- .../basetypes/SoloOnErrorResumeNext.java | 8 ++-- .../basetypes/SoloOnErrorResumeWith.java | 2 +- .../basetypes/SoloOnErrorReturnItem.java | 2 +- .../rxjava3/basetypes/SoloProcessor.java | 4 +- .../akarnokd/rxjava3/basetypes/SoloRetry.java | 2 +- .../rxjava3/basetypes/SoloRetryWhen.java | 14 +++---- .../rxjava3/basetypes/SoloRetryWhile.java | 6 +-- .../rxjava3/basetypes/SoloSubscribeOn.java | 10 ++--- .../rxjava3/basetypes/SoloTakeUntil.java | 4 +- .../rxjava3/basetypes/SoloTimeout.java | 4 +- .../akarnokd/rxjava3/basetypes/SoloTimer.java | 8 ++-- .../rxjava3/basetypes/SoloToFlowable.java | 2 +- .../rxjava3/basetypes/SoloToObservable.java | 6 +-- .../rxjava3/basetypes/SoloToSingle.java | 6 +-- .../rxjava3/basetypes/SoloUnsubscribeOn.java | 6 +-- .../akarnokd/rxjava3/basetypes/SoloUsing.java | 10 ++--- .../rxjava3/basetypes/SoloZipArray.java | 10 ++--- .../rxjava3/basetypes/SoloZipIterable.java | 8 ++-- .../AbstractDisposableAutoRelease.java | 12 +++--- .../consumers/CompletableConsumers.java | 8 ++-- .../DisposableAutoReleaseMultiObserver.java | 12 +++--- .../DisposableAutoReleaseObserver.java | 10 ++--- .../DisposableAutoReleaseSubscriber.java | 14 +++---- .../rxjava3/consumers/FlowableConsumers.java | 8 ++-- .../rxjava3/consumers/MaybeConsumers.java | 8 ++-- .../consumers/ObservableConsumers.java | 8 ++-- .../rxjava3/consumers/SingleConsumers.java | 8 ++-- .../rxjava3/debug/CompletableOnAssembly.java | 6 +-- .../CompletableOnAssemblyScalarSupplier.java | 4 +- .../debug/CompletableOnAssemblySupplier.java | 6 +-- .../rxjava3/debug/FlowableOnAssembly.java | 6 +-- .../debug/FlowableOnAssemblyConnectable.java | 8 ++-- .../FlowableOnAssemblyScalarSupplier.java | 4 +- .../debug/FlowableOnAssemblySupplier.java | 8 ++-- .../rxjava3/debug/MaybeOnAssembly.java | 6 +-- .../debug/MaybeOnAssemblyScalarSupplier.java | 4 +- .../debug/MaybeOnAssemblySupplier.java | 6 +-- .../rxjava3/debug/ObservableOnAssembly.java | 6 +-- .../ObservableOnAssemblyConnectable.java | 8 ++-- .../ObservableOnAssemblyScalarSupplier.java | 4 +- .../debug/ObservableOnAssemblySupplier.java | 6 +-- .../debug/ParallelFlowableOnAssembly.java | 4 +- .../rxjava3/debug/RxJavaAssemblyTracking.java | 14 +++---- .../rxjava3/debug/SingleOnAssembly.java | 6 +-- .../debug/SingleOnAssemblyScalarSupplier.java | 4 +- .../debug/SingleOnAssemblySupplier.java | 6 +-- .../debug/multihook/MultiHandlerManager.java | 8 ++-- .../OnScheduleMultiHandlerManager.java | 4 +- .../debug/validator/CompletableValidator.java | 4 +- .../ConnectableFlowableValidator.java | 6 +-- .../ConnectableObservableValidator.java | 8 ++-- .../debug/validator/FlowableValidator.java | 2 +- .../debug/validator/MaybeValidator.java | 4 +- .../debug/validator/ObservableValidator.java | 4 +- .../validator/ParallelFlowableValidator.java | 2 +- .../validator/RxJavaProtocolValidator.java | 16 ++++---- .../debug/validator/SingleValidator.java | 4 +- .../rxjava3/expr/CompletableIfThen.java | 10 ++--- .../rxjava3/expr/CompletableSwitchCase.java | 8 ++-- .../akarnokd/rxjava3/expr/FlowableIfThen.java | 8 ++-- .../rxjava3/expr/FlowableSwitchCase.java | 8 ++-- .../rxjava3/expr/FlowableWhileDoWhile.java | 8 ++-- .../hu/akarnokd/rxjava3/expr/MaybeIfThen.java | 10 ++--- .../rxjava3/expr/MaybeSwitchCase.java | 8 ++-- .../rxjava3/expr/ObservableIfThen.java | 8 ++-- .../rxjava3/expr/ObservableSwitchCase.java | 8 ++-- .../rxjava3/expr/ObservableWhileDoWhile.java | 10 ++--- .../akarnokd/rxjava3/expr/SingleIfThen.java | 10 ++--- .../rxjava3/expr/SingleSwitchCase.java | 8 ++-- .../rxjava3/expr/StatementCompletable.java | 8 ++-- .../rxjava3/expr/StatementFlowable.java | 8 ++-- .../akarnokd/rxjava3/expr/StatementMaybe.java | 8 ++-- .../rxjava3/expr/StatementObservable.java | 8 ++-- .../rxjava3/expr/StatementSingle.java | 8 ++-- .../rxjava3/functions/FunctionTagging.java | 8 ++-- .../rxjava3/functions/FunctionsEx.java | 2 +- .../rxjava3/functions/PlainBiConsumer.java | 2 +- .../rxjava3/functions/PlainBiFunction.java | 2 +- .../rxjava3/functions/PlainConsumer.java | 2 +- .../rxjava3/functions/PlainFunction.java | 2 +- .../rxjava3/functions/PlainFunction3.java | 2 +- .../rxjava3/functions/PlainFunction4.java | 2 +- .../rxjava3/functions/PlainFunction5.java | 2 +- .../rxjava3/functions/PlainFunction6.java | 2 +- .../rxjava3/functions/PlainFunction7.java | 2 +- .../rxjava3/functions/PlainFunction8.java | 2 +- .../rxjava3/functions/PlainFunction9.java | 2 +- .../akarnokd/rxjava3/joins/ActivePlan0.java | 3 +- .../akarnokd/rxjava3/joins/ActivePlan1.java | 4 +- .../akarnokd/rxjava3/joins/ActivePlan2.java | 4 +- .../akarnokd/rxjava3/joins/ActivePlan3.java | 4 +- .../akarnokd/rxjava3/joins/ActivePlan4.java | 4 +- .../akarnokd/rxjava3/joins/ActivePlan5.java | 4 +- .../akarnokd/rxjava3/joins/ActivePlan6.java | 4 +- .../akarnokd/rxjava3/joins/ActivePlan7.java | 4 +- .../akarnokd/rxjava3/joins/ActivePlan8.java | 4 +- .../akarnokd/rxjava3/joins/ActivePlan9.java | 4 +- .../akarnokd/rxjava3/joins/ActivePlanN.java | 4 +- .../rxjava3/joins/JoinObservable.java | 6 +-- .../akarnokd/rxjava3/joins/JoinObserver.java | 2 +- .../akarnokd/rxjava3/joins/JoinObserver1.java | 16 ++++---- .../akarnokd/rxjava3/joins/JoinPatterns.java | 10 ++--- .../hu/akarnokd/rxjava3/joins/Pattern1.java | 4 +- .../hu/akarnokd/rxjava3/joins/Pattern2.java | 4 +- .../hu/akarnokd/rxjava3/joins/Pattern3.java | 4 +- .../hu/akarnokd/rxjava3/joins/Pattern4.java | 4 +- .../hu/akarnokd/rxjava3/joins/Pattern5.java | 4 +- .../hu/akarnokd/rxjava3/joins/Pattern6.java | 4 +- .../hu/akarnokd/rxjava3/joins/Pattern7.java | 4 +- .../hu/akarnokd/rxjava3/joins/Pattern8.java | 4 +- .../hu/akarnokd/rxjava3/joins/Pattern9.java | 6 +-- .../hu/akarnokd/rxjava3/joins/PatternN.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan1.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan2.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan3.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan4.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan5.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan6.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan7.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan8.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan9.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/PlanN.java | 4 +- .../rxjava3/math/FlowableAverageDouble.java | 2 +- .../rxjava3/math/FlowableAverageFloat.java | 2 +- .../akarnokd/rxjava3/math/FlowableMinMax.java | 4 +- .../akarnokd/rxjava3/math/FlowableSource.java | 2 +- .../rxjava3/math/FlowableSumDouble.java | 2 +- .../rxjava3/math/FlowableSumFloat.java | 2 +- .../akarnokd/rxjava3/math/FlowableSumInt.java | 2 +- .../rxjava3/math/FlowableSumLong.java | 2 +- .../akarnokd/rxjava3/math/MathFlowable.java | 4 +- .../akarnokd/rxjava3/math/MathObservable.java | 4 +- .../rxjava3/math/ObservableAverageDouble.java | 4 +- .../rxjava3/math/ObservableAverageFloat.java | 4 +- .../rxjava3/math/ObservableMinMax.java | 6 +-- .../rxjava3/math/ObservableSource.java | 2 +- .../rxjava3/math/ObservableSumDouble.java | 4 +- .../rxjava3/math/ObservableSumFloat.java | 4 +- .../rxjava3/math/ObservableSumInt.java | 4 +- .../rxjava3/math/ObservableSumLong.java | 4 +- .../operators/BasicMergeSubscription.java | 31 ++++++-------- .../CompletableFlatMapSignalCompletable.java | 12 +++--- .../CompletableFlatMapSignalFlowable.java | 14 +++---- .../CompletableFlatMapSignalMaybe.java | 12 +++--- .../CompletableFlatMapSignalObservable.java | 12 +++--- .../CompletableFlatMapSignalSingle.java | 12 +++--- .../operators/CompletableTransformers.java | 6 +-- .../rxjava3/operators/Completables.java | 6 +-- .../operators/FlowableAsyncEmitter.java | 6 +-- .../operators/FlowableBufferPredicate.java | 14 +++---- .../rxjava3/operators/FlowableCacheLast.java | 4 +- .../rxjava3/operators/FlowableCoalesce.java | 14 +++---- .../operators/FlowableDebounceFirst.java | 6 +-- .../rxjava3/operators/FlowableErrorJump.java | 8 ++-- .../rxjava3/operators/FlowableEvery.java | 6 +-- .../rxjava3/operators/FlowableExpand.java | 16 ++++---- .../operators/FlowableFilterAsync.java | 12 +++--- .../operators/FlowableFlatMapAsync.java | 8 ++-- .../operators/FlowableFlatMapSync.java | 18 ++++----- .../operators/FlowableGenerateAsync.java | 12 +++--- .../rxjava3/operators/FlowableIndexOf.java | 8 ++-- .../FlowableIntervalBackpressure.java | 8 ++-- .../rxjava3/operators/FlowableMapAsync.java | 14 +++---- .../rxjava3/operators/FlowableMapFilter.java | 12 +++--- .../FlowableOnBackpressureTimeout.java | 14 +++---- .../operators/FlowableOrderedMerge.java | 14 +++---- .../operators/FlowablePartialCollect.java | 12 +++--- .../operators/FlowableRepeatScalar.java | 8 ++-- .../operators/FlowableRepeatSupplier.java | 14 +++---- .../operators/FlowableRequestObserveOn.java | 6 +-- .../operators/FlowableRequestSample.java | 10 ++--- .../operators/FlowableRequestSampleTime.java | 14 +++---- .../rxjava3/operators/FlowableSpanout.java | 10 ++--- .../operators/FlowableSwitchFlatMap.java | 18 ++++----- .../operators/FlowableSwitchIfEmptyMany.java | 8 ++-- .../FlowableSwitchIfEmptyManyArray.java | 6 +-- .../operators/FlowableSwitchOnFirst.java | 10 ++--- .../operators/FlowableTimeoutLast.java | 12 +++--- .../operators/FlowableTransformers.java | 12 +++--- .../rxjava3/operators/FlowableValve.java | 12 +++--- .../operators/FlowableWindowPredicate.java | 14 +++---- .../rxjava3/operators/FlowableZipLatest.java | 16 ++++---- .../akarnokd/rxjava3/operators/Flowables.java | 16 ++++---- .../MaybeFlatMapSignalCompletable.java | 12 +++--- .../operators/MaybeFlatMapSignalFlowable.java | 14 +++---- .../operators/MaybeFlatMapSignalMaybe.java | 12 +++--- .../MaybeFlatMapSignalObservable.java | 12 +++--- .../operators/MaybeFlatMapSignalSingle.java | 12 +++--- .../rxjava3/operators/MaybeTransformers.java | 6 +-- .../hu/akarnokd/rxjava3/operators/Maybes.java | 6 +-- .../operators/ObservableErrorJump.java | 10 ++--- .../operators/ObservableFilterAsync.java | 18 ++++----- .../operators/ObservableFlatMapDrop.java | 16 ++++---- .../operators/ObservableFlatMapLatest.java | 16 ++++---- .../rxjava3/operators/ObservableIndexOf.java | 8 ++-- .../rxjava3/operators/ObservableMapAsync.java | 18 ++++----- .../operators/ObservableObserveOnDrop.java | 8 ++-- .../operators/ObservableObserveOnLatest.java | 8 ++-- .../operators/ObservableTransformers.java | 8 ++-- .../rxjava3/operators/ObservableValve.java | 14 +++---- .../SingleFlatMapSignalCompletable.java | 12 +++--- .../SingleFlatMapSignalFlowable.java | 14 +++---- .../operators/SingleFlatMapSignalMaybe.java | 12 +++--- .../SingleFlatMapSignalObservable.java | 12 +++--- .../operators/SingleFlatMapSignalSingle.java | 12 +++--- .../rxjava3/operators/SingleTransformers.java | 6 +-- .../akarnokd/rxjava3/operators/Singles.java | 6 +-- .../parallel/ParallelOrderedMerge.java | 4 +- .../rxjava3/parallel/ParallelSumDouble.java | 7 ++-- .../rxjava3/parallel/ParallelSumInteger.java | 7 ++-- .../rxjava3/parallel/ParallelSumLong.java | 7 ++-- .../parallel/ParallelTransformers.java | 10 ++--- .../processors/DispatchWorkProcessor.java | 18 ++++----- .../processors/FlowableProcessorWrap.java | 6 +-- .../processors/FlowableProcessors.java | 8 ++-- .../rxjava3/processors/RefCountProcessor.java | 6 +-- .../rxjava3/schedulers/BlockingScheduler.java | 14 +++---- .../rxjava3/schedulers/ParallelScheduler.java | 14 +++---- .../rxjava3/schedulers/SharedScheduler.java | 6 +-- .../rxjava3/string/FlowableCharSequence.java | 8 ++-- .../rxjava3/string/FlowableSplit.java | 14 +++---- .../string/ObservableCharSequence.java | 4 +- .../rxjava3/string/StringFlowable.java | 6 +-- .../rxjava3/string/StringObservable.java | 4 +- .../rxjava3/subjects/DispatchWorkSubject.java | 18 ++++----- .../rxjava3/subjects/RefCountSubject.java | 8 ++-- .../akarnokd/rxjava3/subjects/Subjects.java | 6 +-- .../rxjava3/subjects/UnicastWorkSubject.java | 18 ++++----- .../util/AlwaysFalseBooleanSupplier.java | 2 +- .../util/AlwaysTrueBooleanSupplier.java | 2 +- .../util/BiFunctionSecondIdentity.java | 2 +- .../rxjava3/util/CompositeSubscription.java | 2 +- .../rxjava3/util/SpmcLinkedArrayQueue.java | 4 +- .../akarnokd/rxjava3/util/SpscOneQueue.java | 4 +- .../rxjava3/async/AsyncFlowableTest.java | 12 +++--- .../rxjava3/async/AsyncObservableTest.java | 14 +++---- .../rxjava3/basetypes/NonoProcessorTest.java | 8 ++-- .../akarnokd/rxjava3/basetypes/NonoTest.java | 24 +++++------ .../rxjava3/basetypes/PerhapsTest.java | 18 ++++----- .../akarnokd/rxjava3/basetypes/SoloTest.java | 18 ++++----- .../consumers/CompletableConsumersTest.java | 14 +++---- .../consumers/FlowableConsumersTest.java | 16 ++++---- .../rxjava3/consumers/MaybeConsumersTest.java | 14 +++---- .../consumers/ObservableConsumersTest.java | 16 ++++---- .../consumers/SingleConsumersTest.java | 14 +++---- .../debug/RxJava3AssemblyTrackingTest.java | 16 ++++---- .../OnScheduleMultiHandlerManagerTest.java | 10 ++--- .../RxJavaProtocolValidatorTest.java | 20 +++++----- .../expr/StatementCompletableTest.java | 6 +-- .../rxjava3/expr/StatementFlowableTest.java | 6 +-- .../rxjava3/expr/StatementMaybeTest.java | 6 +-- .../rxjava3/expr/StatementObservableTest.java | 6 +-- .../rxjava3/expr/StatementSingleTest.java | 6 +-- .../functions/FunctionTaggingTest.java | 6 +-- .../rxjava3/joins/OperatorJoinsTest.java | 10 ++--- .../rxjava3/math/MathFlowableTest.java | 2 +- .../rxjava3/math/MathObservableTest.java | 2 +- ...mpletableFlatMapSignalCompletableTest.java | 6 +-- .../CompletableFlatMapSignalFlowableTest.java | 8 ++-- .../CompletableFlatMapSignalMaybeTest.java | 6 +-- ...ompletableFlatMapSignalObservableTest.java | 6 +-- .../CompletableFlatMapSignalSingleTest.java | 6 +-- .../FlowableBufferPredicateTest.java | 8 ++-- .../operators/FlowableCacheLastTest.java | 6 +-- .../operators/FlowableCoalesceTest.java | 12 +++--- .../operators/FlowableDebounceFirstTest.java | 6 +-- .../operators/FlowableErrorJumpTest.java | 6 +-- .../rxjava3/operators/FlowableEveryTest.java | 2 +- .../rxjava3/operators/FlowableExpandTest.java | 12 +++--- .../operators/FlowableFilterAsyncTest.java | 14 +++---- .../operators/FlowableFlatMapAsyncTest.java | 6 +-- .../operators/FlowableFlatMapSyncTest.java | 6 +-- .../operators/FlowableGenerateAsyncTest.java | 14 +++---- .../operators/FlowableIndexOfTest.java | 6 +-- .../FlowableIntervalBackpressureTest.java | 4 +- .../operators/FlowableMapAsyncTest.java | 16 ++++---- .../FlowableMapFilterConditionalTest.java | 10 ++--- .../operators/FlowableMapFilterTest.java | 8 ++-- .../FlowableOnBackpressureTimeoutTest.java | 12 +++--- .../operators/FlowableOrderedMergeTest.java | 14 +++---- .../operators/FlowablePartialCollectTest.java | 18 ++++----- .../operators/FlowableRepeatCallableTest.java | 8 ++-- .../FlowableRequestObserveOnTest.java | 8 ++-- .../operators/FlowableRequestSampleTest.java | 18 ++++----- .../FlowableRequestSampleTimeTest.java | 12 +++--- .../operators/FlowableSpanoutTest.java | 8 ++-- .../operators/FlowableSwitchFlatMapTest.java | 16 ++++---- .../FlowableSwitchIfEmptyManyArrayTest.java | 4 +- .../FlowableSwitchIfEmptyManyTest.java | 4 +- .../operators/FlowableSwitchOnFirstTest.java | 12 +++--- .../operators/FlowableTimeoutLastTest.java | 6 +-- .../rxjava3/operators/FlowableValveTest.java | 12 +++--- .../FlowableWindowPredicateTest.java | 10 ++--- .../operators/FlowableZipLatestTest.java | 16 ++++---- .../rxjava3/operators/FlowablesTest.java | 2 +- .../MaybeFlatMapSignalCompletableTest.java | 6 +-- .../MaybeFlatMapSignalFlowableTest.java | 6 +-- .../MaybeFlatMapSignalMaybeTest.java | 6 +-- .../MaybeFlatMapSignalObservableTest.java | 6 +-- .../MaybeFlatMapSignalSingleTest.java | 6 +-- .../operators/ObservableErrorJumpTest.java | 8 ++-- .../operators/ObservableFilterAsyncTest.java | 14 +++---- .../operators/ObservableFlatMapDropTest.java | 14 +++---- .../ObservableFlatMapLatestTest.java | 14 +++---- .../operators/ObservableIndexOfTest.java | 6 +-- .../operators/ObservableMapAsyncTest.java | 14 +++---- .../ObservableObserveOnDropTest.java | 8 ++-- .../ObservableObserveOnLatestTest.java | 8 ++-- .../operators/ObservableValveTest.java | 12 +++--- .../SingleFlatMapSignalCompletableTest.java | 6 +-- .../SingleFlatMapSignalFlowableTest.java | 6 +-- .../SingleFlatMapSignalMaybeTest.java | 6 +-- .../SingleFlatMapSignalObservableTest.java | 6 +-- .../SingleFlatMapSignalSingleTest.java | 6 +-- .../parallel/ParallelOrderedMergeTest.java | 6 +-- .../rxjava3/parallel/ParallelSumTest.java | 6 +-- .../processors/DispatchWorkProcessorTest.java | 14 +++---- .../processors/FlowableProcessorsTest.java | 6 +-- .../processors/RefCountProcessorTest.java | 12 +++--- .../schedulers/BlockingSchedulerTest.java | 18 ++++----- .../schedulers/ParallelSchedulerTest.java | 12 +++--- .../schedulers/SharedSchedulerTest.java | 12 +++--- .../string/FlowableCharSequenceTest.java | 6 +-- .../rxjava3/string/StringFlowableTest.java | 2 +- .../subjects/DispatchWorkSubjectTest.java | 12 +++--- .../rxjava3/subjects/RefCountSubjectTest.java | 12 +++--- .../rxjava3/subjects/SubjectsTest.java | 1 - .../subjects/UnicastWorkSubjectTest.java | 6 +-- .../hu/akarnokd/rxjava3/test/BaseTest.java | 6 +-- .../rxjava3/test/BaseTestConsumerEx.java | 10 ++--- .../hu/akarnokd/rxjava3/test/TestHelper.java | 40 +++++++++---------- .../akarnokd/rxjava3/test/TestObserverEx.java | 8 ++-- .../rxjava3/test/TestSubscriberEx.java | 6 +-- 485 files changed, 1810 insertions(+), 1834 deletions(-) diff --git a/README.md b/README.md index 639a84a5..bdf8291b 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ RxJava 3.x implementation of extra sources, operators and components and ports o ``` dependencies { - compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC1" + compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC2" } ``` diff --git a/build.gradle b/build.gradle index d5534eda..33cc332a 100644 --- a/build.gradle +++ b/build.gradle @@ -48,8 +48,8 @@ apply plugin: 'osgi' dependencies { signature 'org.codehaus.mojo.signature:java16:1.1@signature' - compile "org.reactivestreams:reactive-streams:1.0.2" - compile "io.reactivex.rxjava3:rxjava:3.0.0-RC1" + compile "org.reactivestreams:reactive-streams:1.0.3-RC1" + compile "io.reactivex.rxjava3:rxjava:3.0.0-RC2" testCompile group: 'junit', name: 'junit', version: '4.12' diff --git a/gradle.properties b/gradle.properties index 99858131..98cbddc6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=3.0.0-RC1 +version=3.0.0-RC2 diff --git a/src/jmh/java/hu/akarnokd/rxjava3/FlatMapExPerf.java b/src/jmh/java/hu/akarnokd/rxjava3/FlatMapExPerf.java index 418f8f1e..a36c4bb6 100644 --- a/src/jmh/java/hu/akarnokd/rxjava3/FlatMapExPerf.java +++ b/src/jmh/java/hu/akarnokd/rxjava3/FlatMapExPerf.java @@ -24,9 +24,9 @@ import org.reactivestreams.Publisher; import hu.akarnokd.rxjava3.operators.FlowableTransformers; -import io.reactivex.Flowable; -import io.reactivex.functions.Function; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * Example benchmark. Run from command line as diff --git a/src/jmh/java/hu/akarnokd/rxjava3/PerfAsyncConsumer.java b/src/jmh/java/hu/akarnokd/rxjava3/PerfAsyncConsumer.java index 96a740dc..1e988f80 100644 --- a/src/jmh/java/hu/akarnokd/rxjava3/PerfAsyncConsumer.java +++ b/src/jmh/java/hu/akarnokd/rxjava3/PerfAsyncConsumer.java @@ -21,8 +21,8 @@ import org.openjdk.jmh.infra.Blackhole; 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 PerfAsyncConsumer extends CountDownLatch diff --git a/src/jmh/java/hu/akarnokd/rxjava3/PerfConsumer.java b/src/jmh/java/hu/akarnokd/rxjava3/PerfConsumer.java index 4a00ac77..c1a1e25f 100644 --- a/src/jmh/java/hu/akarnokd/rxjava3/PerfConsumer.java +++ b/src/jmh/java/hu/akarnokd/rxjava3/PerfConsumer.java @@ -19,8 +19,8 @@ import org.openjdk.jmh.infra.Blackhole; 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 PerfConsumer implements Subscriber, Observer, SingleObserver, MaybeObserver, CompletableObserver { diff --git a/src/main/java/hu/akarnokd/rxjava3/async/AsyncFlowable.java b/src/main/java/hu/akarnokd/rxjava3/async/AsyncFlowable.java index c8b83aec..b20b45e0 100644 --- a/src/main/java/hu/akarnokd/rxjava3/async/AsyncFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/AsyncFlowable.java @@ -21,16 +21,16 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.functions.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.SequentialDisposable; -import io.reactivex.internal.functions.Functions; -import io.reactivex.internal.subscribers.LambdaSubscriber; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.processors.*; -import io.reactivex.schedulers.Schedulers; +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.SequentialDisposable; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.internal.subscribers.LambdaSubscriber; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.processors.*; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * Utility methods to convert functions and actions into asynchronous operations through the Publisher/Subscriber diff --git a/src/main/java/hu/akarnokd/rxjava3/async/AsyncObservable.java b/src/main/java/hu/akarnokd/rxjava3/async/AsyncObservable.java index 1b0eb338..fc567777 100644 --- a/src/main/java/hu/akarnokd/rxjava3/async/AsyncObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/AsyncObservable.java @@ -19,16 +19,16 @@ import java.util.concurrent.*; import hu.akarnokd.rxjava3.functions.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.SequentialDisposable; -import io.reactivex.internal.functions.Functions; -import io.reactivex.internal.observers.LambdaObserver; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subjects.*; +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.SequentialDisposable; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.internal.observers.LambdaObserver; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; +import io.reactivex.rxjava3.subjects.*; /** * Utility methods to convert functions and actions into asynchronous operations through the Observable/Observer diff --git a/src/main/java/hu/akarnokd/rxjava3/async/DisposableFlowable.java b/src/main/java/hu/akarnokd/rxjava3/async/DisposableFlowable.java index 8912f99b..2daec515 100644 --- a/src/main/java/hu/akarnokd/rxjava3/async/DisposableFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/DisposableFlowable.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.async; -import io.reactivex.Flowable; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.disposables.Disposable; /** * A {@link Flowable} that also offers a means to dispose it, cancelling/disposing diff --git a/src/main/java/hu/akarnokd/rxjava3/async/DisposableObservable.java b/src/main/java/hu/akarnokd/rxjava3/async/DisposableObservable.java index 3e8bedfa..3fb39236 100644 --- a/src/main/java/hu/akarnokd/rxjava3/async/DisposableObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/DisposableObservable.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.async; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.disposables.Disposable; /** * A {@link Observable} that also offers a means to dispose it, cancelling/disposing diff --git a/src/main/java/hu/akarnokd/rxjava3/async/FlowableFromCallableNull.java b/src/main/java/hu/akarnokd/rxjava3/async/FlowableFromCallableNull.java index 0980e87b..4ead8ab9 100644 --- a/src/main/java/hu/akarnokd/rxjava3/async/FlowableFromCallableNull.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/FlowableFromCallableNull.java @@ -18,10 +18,10 @@ import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; /** * Runs a Supplier and treats a null result as completion. diff --git a/src/main/java/hu/akarnokd/rxjava3/async/FutureCompletable.java b/src/main/java/hu/akarnokd/rxjava3/async/FutureCompletable.java index 4caf1623..e274e9c3 100644 --- a/src/main/java/hu/akarnokd/rxjava3/async/FutureCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/FutureCompletable.java @@ -19,9 +19,9 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * A Future implementation that can be terminated externally. diff --git a/src/main/java/hu/akarnokd/rxjava3/async/ObservableFromSupplierNull.java b/src/main/java/hu/akarnokd/rxjava3/async/ObservableFromSupplierNull.java index b46b4245..c047da82 100644 --- a/src/main/java/hu/akarnokd/rxjava3/async/ObservableFromSupplierNull.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/ObservableFromSupplierNull.java @@ -16,10 +16,10 @@ package hu.akarnokd.rxjava3.async; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.observers.DeferredScalarDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.observers.DeferredScalarDisposable; /** * Runs a supplier and treats a null result as completion. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicEmptyQueueSubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicEmptyQueueSubscription.java index 69ada78a..f156d26f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicEmptyQueueSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicEmptyQueueSubscription.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.basetypes; -import io.reactivex.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; /** * Base class for empty, async-fuseable intermediate operators. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoIntQueueSubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoIntQueueSubscription.java index e8b1d963..d04e46a8 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoIntQueueSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoIntQueueSubscription.java @@ -18,7 +18,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; /** * Base class for atomic integer, async-fuseable intermediate operators. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoSubscriber.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoSubscriber.java index e0e1c6ce..9b302cc6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoSubscriber.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoSubscriber.java @@ -18,7 +18,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Basic subscriber that supports queue fusion and defaults onSubscribe, onNext and cancel. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefNonoSubscriber.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefNonoSubscriber.java index d1889eac..1f4de6d0 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefNonoSubscriber.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefNonoSubscriber.java @@ -18,7 +18,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Basic subscriber that supports queue fusion, has an atomic reference and defaults onSubscribe, onNext and cancel. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefQueueSubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefQueueSubscription.java index a9398d4f..4eba379a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefQueueSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefQueueSubscription.java @@ -18,7 +18,7 @@ import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; /** * Base class extending AtomicReference (resource tracking) and QueueSubscription (fusion). diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicSoloQueueSubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicSoloQueueSubscription.java index 9976f026..3b935b6c 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicSoloQueueSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicSoloQueueSubscription.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.basetypes; -import io.reactivex.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; /** * Base class that defaults the offer() methods of QueueSubscription. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/BlockingGetSubscriber.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BlockingGetSubscriber.java index 1f4c06dd..86fb07ee 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/BlockingGetSubscriber.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BlockingGetSubscriber.java @@ -20,11 +20,11 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.ExceptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.ExceptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Blocks until the source terminates and returns the (last) value it produced if any. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/FuturePerhapsSubscriber.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/FuturePerhapsSubscriber.java index c4b13efe..f002d6bf 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/FuturePerhapsSubscriber.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/FuturePerhapsSubscriber.java @@ -21,8 +21,8 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * A Subscriber + Future that expects exactly one upstream value and provides it diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/Nono.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/Nono.java index bf609cf7..9d2b437e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/Nono.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/Nono.java @@ -20,16 +20,16 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.annotations.SchedulerSupport; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.annotations.SchedulerSupport; +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.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; +import io.reactivex.rxjava3.subscribers.TestSubscriber; /** * Represents the base reactive class with fluent API for Publisher-based, diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAmbArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAmbArray.java index 9bec3c08..b46e3aeb 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAmbArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAmbArray.java @@ -19,7 +19,7 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.basetypes.NonoAmbIterable.AmbSubscriber; -import io.reactivex.exceptions.Exceptions; +import io.reactivex.rxjava3.exceptions.Exceptions; /** * Terminate as soon as one of the Mono sources terminates. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAmbIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAmbIterable.java index e8aad12c..b74ea13d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAmbIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAmbIterable.java @@ -19,9 +19,9 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.util.CompositeSubscription; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.subscriptions.BasicIntQueueSubscription; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.subscriptions.BasicIntQueueSubscription; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Terminate as soon as one of the Mono sources terminates. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAndThen.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAndThen.java index c2b919dc..73722023 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAndThen.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAndThen.java @@ -18,7 +18,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Run a Nono after another Nono. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAndThenPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAndThenPublisher.java index 19093c80..a5817231 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAndThenPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoAndThenPublisher.java @@ -20,8 +20,8 @@ import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Run the Nono before switching to the Publisher and relaying its values. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoBlockingAwaitSubscriber.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoBlockingAwaitSubscriber.java index 002c13a3..8476e3e6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoBlockingAwaitSubscriber.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoBlockingAwaitSubscriber.java @@ -20,7 +20,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Block until the upstream terminates. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoComplete.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoComplete.java index 29c55456..bc775e3e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoComplete.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoComplete.java @@ -18,8 +18,8 @@ import org.reactivestreams.Subscriber; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Completes the subscriber immediately. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java index 05180710..c8c9e50b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java @@ -20,12 +20,12 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.*; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.*; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Concatenate sources emitted by a Publisher one after another and complete after each complete. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatArray.java index 0a7616c6..b2a71fda 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatArray.java @@ -20,8 +20,8 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; /** * Subscribe to the Nono sources one at a time and complete if all of them complete. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatIterable.java index 5cd69651..47818b25 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatIterable.java @@ -21,10 +21,10 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; /** * Subscribe to the Nono sources one at a time and complete if all of them complete. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoCreate.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoCreate.java index 27fa713e..0eef3278 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoCreate.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoCreate.java @@ -18,12 +18,12 @@ import org.reactivestreams.Subscriber; -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; /** * Call a create action with an abstraction of the incoming subscriber to allow diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDefer.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDefer.java index 501246c6..a7a1e5e7 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDefer.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDefer.java @@ -18,10 +18,10 @@ import org.reactivestreams.Subscriber; -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.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; final class NonoDefer extends Nono { diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDelay.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDelay.java index 77ec01d0..ef04881d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDelay.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDelay.java @@ -20,9 +20,9 @@ import org.reactivestreams.Subscriber; -import io.reactivex.Scheduler; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Emit the terminal events on the specified Scheduler. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDelaySubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDelaySubscription.java index 577145c7..1683b2b3 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDelaySubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDelaySubscription.java @@ -18,8 +18,8 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Delay subscribing to the main Nono until the other Publisher signals diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDoFinally.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDoFinally.java index 14f488ff..764a2cbb 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDoFinally.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDoFinally.java @@ -18,10 +18,10 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Action; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Execute an action exactly once after the upstream terminates or the diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDoOnLifecycle.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDoOnLifecycle.java index 9774b824..0be5f9f8 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDoOnLifecycle.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDoOnLifecycle.java @@ -18,10 +18,10 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Execute callbacks at various points in the lifecycle. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoError.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoError.java index 83cc2788..e63e12ad 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoError.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoError.java @@ -18,8 +18,8 @@ import org.reactivestreams.Subscriber; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Signals a constant Throwable to the subscriber. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoErrorSupplier.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoErrorSupplier.java index a65159fa..35f7b802 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoErrorSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoErrorSupplier.java @@ -18,10 +18,10 @@ import org.reactivestreams.Subscriber; -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.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Signals a constant Throwable to the subscriber. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFlatMapSignal.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFlatMapSignal.java index fb359915..ca3ca176 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFlatMapSignal.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFlatMapSignal.java @@ -20,11 +20,11 @@ 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.SubscriptionHelper; +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.SubscriptionHelper; /** * Map the terminal events of a Nono into Publisher and stream its events. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromAction.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromAction.java index d066bb88..a8a87c21 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromAction.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromAction.java @@ -18,9 +18,9 @@ import org.reactivestreams.Subscriber; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Execute an action and complete the sequence or relay it error. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromCompletable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromCompletable.java index 232e6cc3..7e1f6b8e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromCompletable.java @@ -18,9 +18,9 @@ import org.reactivestreams.Subscriber; -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; /** * Convert a CompletableSource into a Nono. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromFuture.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromFuture.java index 4d4e269c..929fd286 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromFuture.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromFuture.java @@ -20,9 +20,9 @@ import org.reactivestreams.Subscriber; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Block until the Future completes or times out. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromMaybe.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromMaybe.java index 824556b5..5134cb1c 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromMaybe.java @@ -18,9 +18,9 @@ import org.reactivestreams.Subscriber; -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; /** * Convert a MaybeSource into a Nono. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromObservable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromObservable.java index c1a75cbe..bc0fee73 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromObservable.java @@ -18,9 +18,9 @@ import org.reactivestreams.Subscriber; -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; /** * Convert a ObservableSource into a Nono. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromPublisher.java index 305870c0..a1b94ab6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromPublisher.java @@ -18,7 +18,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Convert a Publisher into a Nono. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromSingle.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromSingle.java index 5c067726..250cf7ba 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFromSingle.java @@ -18,9 +18,9 @@ import org.reactivestreams.Subscriber; -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; /** * Convert a SingleSource into a Nono. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLambdaSubscriber.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLambdaSubscriber.java index ecf2c7ff..9ecead7e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLambdaSubscriber.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLambdaSubscriber.java @@ -20,11 +20,11 @@ import org.reactivestreams.*; -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.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; /** * Calls the appropriate function when this Subscriber terminates. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLift.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLift.java index f8cf9a79..8a40e06e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLift.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLift.java @@ -18,10 +18,10 @@ import org.reactivestreams.Subscriber; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.EmptySubscription; +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.EmptySubscription; /** * Transform the downstream Subscriber into an upstream Subscriber. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMapError.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMapError.java index 3252697a..7a9db599 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMapError.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMapError.java @@ -18,9 +18,9 @@ import org.reactivestreams.Subscriber; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Map an upstream error into another Throwable. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMerge.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMerge.java index 7f9164d0..c6dd57e2 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMerge.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMerge.java @@ -20,10 +20,10 @@ import org.reactivestreams.*; -import io.reactivex.disposables.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Run Nonos at the same time and terminate when one or all terminate. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeArray.java index 3f8d21fc..19ccfb96 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeArray.java @@ -21,9 +21,9 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.util.CompositeSubscription; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Run Nono sources in parallel and complete when all complete. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeIterable.java index 1afc1816..24b1d6b4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeIterable.java @@ -23,11 +23,11 @@ import hu.akarnokd.rxjava3.basetypes.NonoMergeArray.*; import hu.akarnokd.rxjava3.util.CompositeSubscription; -import io.reactivex.exceptions.Exceptions; -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.exceptions.Exceptions; +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; /** * Run Nono sources in parallel and complete when all complete. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoNever.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoNever.java index 6c0cdd94..374084a1 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoNever.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoNever.java @@ -18,7 +18,7 @@ import org.reactivestreams.Subscriber; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Completes the subscriber immediately. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoObserveOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoObserveOn.java index fa41f1c7..159697e5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoObserveOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoObserveOn.java @@ -18,9 +18,9 @@ import org.reactivestreams.Subscriber; -import io.reactivex.Scheduler; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Emit the terminal events on the specified Scheduler. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoOnErrorResume.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoOnErrorResume.java index 99a809dd..5e3e5b9d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoOnErrorResume.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoOnErrorResume.java @@ -18,9 +18,9 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * If the main source fails, resume with another Nono returned from diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoProcessor.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoProcessor.java index 98f19726..2b582f15 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoProcessor.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoProcessor.java @@ -20,7 +20,7 @@ import org.reactivestreams.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * A hot Nono that signals the terminal event to Subscribers. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeat.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeat.java index 52f4eb81..2eadfeda 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeat.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeat.java @@ -20,7 +20,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Repeatedly re-subscribe to the source Nono. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatUntil.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatUntil.java index c84e2527..5d0dfea2 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatUntil.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatUntil.java @@ -20,9 +20,9 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BooleanSupplier; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BooleanSupplier; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Repeat until the supplier returns true. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatWhen.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatWhen.java index e6b78ec0..c9ebc5f2 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatWhen.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatWhen.java @@ -20,12 +20,12 @@ import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.processors.*; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.processors.*; /** * Repeat when the Publisher signals an item. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhen.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhen.java index ba21392d..3133cbfe 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhen.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhen.java @@ -21,12 +21,12 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.basetypes.NonoRepeatWhen.*; -import io.reactivex.Flowable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.processors.*; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.processors.*; /** * Retry when the Publisher signals an item. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhile.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhile.java index 583b662e..b33b0b73 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhile.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhile.java @@ -20,9 +20,9 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Retry while the predicate returns true. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoSubscribeOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoSubscribeOn.java index 43f479c6..9db0880a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoSubscribeOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoSubscribeOn.java @@ -18,10 +18,10 @@ import org.reactivestreams.*; -import io.reactivex.Scheduler; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.SequentialDisposable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Subscribe to the source Nono on a specified scheduler. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTakeUntil.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTakeUntil.java index ed1ca717..a4fba3c5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTakeUntil.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTakeUntil.java @@ -20,8 +20,8 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Run the main Nono until a Publisher signals an item or completes. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTimeout.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTimeout.java index 661059bd..e6ea6f53 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTimeout.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTimeout.java @@ -21,8 +21,8 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Signal a TimeoutException or switch to a fallback Mono if the diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTimer.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTimer.java index da76dffb..d28b490b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTimer.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoTimer.java @@ -20,9 +20,9 @@ import org.reactivestreams.Subscriber; -import io.reactivex.Scheduler; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Signal onComplete after the specified delay on the given scheduler. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoToMaybe.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoToMaybe.java index 3d943f36..262c37ef 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoToMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoToMaybe.java @@ -18,9 +18,9 @@ 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; /** * Convert to an empty Maybe. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoToPerhaps.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoToPerhaps.java index 05c3b3b6..dc364ff7 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoToPerhaps.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoToPerhaps.java @@ -18,7 +18,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Convert a Nono into an empty Perhaps. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUnsubscribeOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUnsubscribeOn.java index c7c0571a..b4c543c0 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUnsubscribeOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUnsubscribeOn.java @@ -18,7 +18,7 @@ import org.reactivestreams.Subscriber; -import io.reactivex.Scheduler; +import io.reactivex.rxjava3.core.Scheduler; /** * Execute the downstream cancel call on the specified scheduler. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUsing.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUsing.java index 009c0570..22cd5723 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUsing.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUsing.java @@ -18,11 +18,11 @@ import org.reactivestreams.*; -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.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; /** * Use a resource while the actual Nono is running. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/Perhaps.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/Perhaps.java index 412db8c0..f2b2e3b1 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/Perhaps.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/Perhaps.java @@ -20,16 +20,16 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; -import io.reactivex.internal.subscribers.LambdaSubscriber; -import io.reactivex.internal.util.ExceptionHelper; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subscribers.TestSubscriber; +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.functions.*; +import io.reactivex.rxjava3.internal.subscribers.LambdaSubscriber; +import io.reactivex.rxjava3.internal.util.ExceptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; +import io.reactivex.rxjava3.subscribers.TestSubscriber; /** * A 0-1-error base reactive type, similar to Maybe, implementing the Reactive-Streams Publisher diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbArray.java index 6ab6478e..fc3b62e0 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbArray.java @@ -21,8 +21,8 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.util.CompositeSubscription; -import io.reactivex.internal.subscriptions.DeferredScalarSubscription; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Signal the events of the first source that signals. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbIterable.java index 5fdd6030..693a45a1 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbIterable.java @@ -19,8 +19,8 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.basetypes.SoloAmbArray.AmbSubscriber; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Signal the events of the first source that signals. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAndThenNono.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAndThenNono.java index 5808a9f1..247db05a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAndThenNono.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAndThenNono.java @@ -20,7 +20,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.subscriptions.*; /** * Execute a Nono after the source Perhaps. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCache.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCache.java index bceaeeae..023fe2f6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCache.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCache.java @@ -20,7 +20,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; /** * Cache the success value or error from upstream and relay/replay diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCreate.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCreate.java index 8dbe4d0b..05ea4106 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCreate.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCreate.java @@ -20,13 +20,13 @@ import org.reactivestreams.Subscriber; -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.subscriptions.DeferredScalarSubscription; -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.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Create a Perhaps that for each incoming Subscriber calls a callback to diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefaultIfEmpty.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefaultIfEmpty.java index 5f041b17..23807efb 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefaultIfEmpty.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefaultIfEmpty.java @@ -18,7 +18,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.subscriptions.*; /** * Return an item if the upstream is empty. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefer.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefer.java index 924abeed..7c708fdd 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefer.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefer.java @@ -18,10 +18,10 @@ import org.reactivestreams.Subscriber; -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.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Defers the creation of the actual Perhaps until subscription time. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelay.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelay.java index 1af415d2..c88d6eea 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelay.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelay.java @@ -20,9 +20,9 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.CompositeException; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Delay the emission of signals from the upstream until the diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelayPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelayPublisher.java index 0afee3f6..12ae6f67 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelayPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelayPublisher.java @@ -20,9 +20,9 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.CompositeException; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Delay events until another Publisher signals an item or completes. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelaySubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelaySubscription.java index 3c2ac2dd..52910603 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelaySubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelaySubscription.java @@ -20,8 +20,8 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Delay events until another Publisher signals an item or completes. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoFinally.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoFinally.java index 324045dd..d7543b79 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoFinally.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoFinally.java @@ -19,7 +19,7 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.basetypes.SoloDoFinally.DoFinallySubscriber; -import io.reactivex.functions.Action; +import io.reactivex.rxjava3.functions.Action; /** * Execute an action exactly once after the upstream terminates or the diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoOnLifecycle.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoOnLifecycle.java index b71052e6..ed209b85 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoOnLifecycle.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoOnLifecycle.java @@ -18,11 +18,11 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.fuseable.QueueSubscription; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Execute callbacks at various points in the lifecycle. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsEmpty.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsEmpty.java index 7d51ebbf..fc624243 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsEmpty.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsEmpty.java @@ -18,8 +18,8 @@ import org.reactivestreams.Subscriber; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Completes the subscriber immediately. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsError.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsError.java index 28984177..32e8f02f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsError.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsError.java @@ -18,8 +18,8 @@ import org.reactivestreams.Subscriber; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Signals a Throwable. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsErrorSupplier.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsErrorSupplier.java index 7881b746..756a74b4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsErrorSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsErrorSupplier.java @@ -18,10 +18,10 @@ import org.reactivestreams.Subscriber; -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.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Signals a Throwable returned by a Supplier. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFilter.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFilter.java index 90671839..97fc3144 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFilter.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFilter.java @@ -18,8 +18,8 @@ import org.reactivestreams.Subscriber; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.subscribers.BasicFuseableSubscriber; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.subscribers.BasicFuseableSubscriber; /** * Filter the upstream value with a predicate. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMap.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMap.java index f2b2f62b..f1fa620d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMap.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMap.java @@ -20,10 +20,10 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; +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.*; /** * Map the success value of the upstream into a Perhaps and emit diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapPublisher.java index f9dd21b1..9bdec409 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapPublisher.java @@ -20,11 +20,11 @@ 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.subscriptions.SubscriptionHelper; +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.subscriptions.SubscriptionHelper; /** * Map the success value of the upstream into a Publisher and emit diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapSignal.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapSignal.java index 3a12b37b..3b3111ca 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapSignal.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapSignal.java @@ -20,10 +20,10 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.*; /** * Map the signals of the upstream into a Perhaps and emit diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromAction.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromAction.java index cd58a7f8..2566a34b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromAction.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromAction.java @@ -18,9 +18,9 @@ import org.reactivestreams.Subscriber; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Executes an Action and terminates. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCallable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCallable.java index cfc1756f..2cf08c6b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCallable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCallable.java @@ -20,9 +20,9 @@ import org.reactivestreams.Subscriber; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; /** * Executes a callable and signals its resulting value. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCompletable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCompletable.java index 3647e3d5..e13ba354 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCompletable.java @@ -18,10 +18,10 @@ 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; /** * Wrap a Completable into a Perhaps. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromFuture.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromFuture.java index e37770b5..688c2483 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromFuture.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromFuture.java @@ -20,7 +20,7 @@ import org.reactivestreams.Subscriber; -import io.reactivex.internal.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; /** * Await a Future's result. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromMaybe.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromMaybe.java index 7ca0f42d..085a1df4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromMaybe.java @@ -18,10 +18,10 @@ 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; /** * Wrap a Maybe into a Perhaps. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromPublisher.java index 5c152e95..0203058f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromPublisher.java @@ -18,8 +18,8 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscribers.DeferredScalarSubscriber; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscribers.DeferredScalarSubscriber; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Signals the 0 or 1 value of the source Publisher. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromSingle.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromSingle.java index f6946cf7..fecf0222 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromSingle.java @@ -19,7 +19,7 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.basetypes.SoloFromSingle.FromSingleObserver; -import io.reactivex.SingleSource; +import io.reactivex.rxjava3.core.SingleSource; /** * Wrap a Single into a Perhaps. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsJust.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsJust.java index 6005ac2b..6ed06691 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsJust.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsJust.java @@ -18,8 +18,8 @@ import org.reactivestreams.Subscriber; -import io.reactivex.internal.fuseable.ScalarSupplier; -import io.reactivex.internal.subscriptions.ScalarSubscription; +import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.internal.subscriptions.ScalarSubscription; /** * Signals exactly one value. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsLift.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsLift.java index 950047fb..f65931da 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsLift.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsLift.java @@ -18,10 +18,10 @@ import org.reactivestreams.Subscriber; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.EmptySubscription; +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.EmptySubscription; /** * Map the downstream Subscriber into an upstream Subscriber. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsMap.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsMap.java index 7bef5a51..8aed7f9c 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsMap.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsMap.java @@ -19,7 +19,7 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.basetypes.SoloMap.MapSubscriber; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; /** * Map the value of upstream via a function. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsMapError.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsMapError.java index 74806af2..e16843c2 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsMapError.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsMapError.java @@ -19,7 +19,7 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.basetypes.SoloMapError.MapErrorSubscriber; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; /** * Map the error of upstream to another Throwable. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsNever.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsNever.java index 8d385945..93632461 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsNever.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsNever.java @@ -18,7 +18,7 @@ import org.reactivestreams.Subscriber; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Never signals an event other than onSubscribe. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsObserveOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsObserveOn.java index 41739b76..9b5e68e6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsObserveOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsObserveOn.java @@ -19,7 +19,7 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.basetypes.SoloObserveOn.ObserveOnSubscriber; -import io.reactivex.Scheduler; +import io.reactivex.rxjava3.core.Scheduler; /** * Delivers the upstream's onNext, onError and onComplete on the specified diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeNext.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeNext.java index 20f1622e..9a60d342 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeNext.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeNext.java @@ -20,11 +20,11 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * If the upstream fails, use the Throwable to get a fallback Perhaps and resume with it. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeWith.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeWith.java index 74903d11..09fd5b44 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeWith.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeWith.java @@ -20,8 +20,8 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Resume with another Perhaps if the upstream fails. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorReturnItem.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorReturnItem.java index 1ff347f9..8a3e9b15 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorReturnItem.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorReturnItem.java @@ -18,7 +18,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.subscriptions.*; /** * Return an item if the upstream fails. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsProcessor.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsProcessor.java index c2d2f681..7184e3a3 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsProcessor.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsProcessor.java @@ -20,8 +20,8 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.DeferredScalarSubscription; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * A Processor based on the Perhaps type that emits an onNext+onComplete, only onComplete or an onError. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetry.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetry.java index c47f3643..6d6bfdf0 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetry.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetry.java @@ -20,7 +20,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.subscriptions.*; /** * Retries the source Perhaps at most the given number of times. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhen.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhen.java index 416bb04d..bbe51aa5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhen.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhen.java @@ -21,13 +21,13 @@ 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.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.processors.*; +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.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.processors.*; /** * Retry this solo if the Publisher returned by the handler signals an item diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhile.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhile.java index 4f86cd4b..c18a322e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhile.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhile.java @@ -20,9 +20,9 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.subscriptions.*; /** * Retries the source Perhaps if the predicate returns true. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSubscribeOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSubscribeOn.java index f205939b..c54faa5b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSubscribeOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSubscribeOn.java @@ -19,9 +19,9 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.basetypes.SoloSubscribeOn.SubscribeOnSubscriber; -import io.reactivex.Scheduler; -import io.reactivex.Scheduler.Worker; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Subscribe to the upstream on the specified scheduler. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSwitchIfEmpty.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSwitchIfEmpty.java index 8fc4306a..f8c2a653 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSwitchIfEmpty.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSwitchIfEmpty.java @@ -20,8 +20,8 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Switch to another Perhaps if the main is empty. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTakeUntil.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTakeUntil.java index a5ac4312..911c806d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTakeUntil.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTakeUntil.java @@ -20,8 +20,8 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Take until the other Publisher signals an item or completes, completing this Perhaps. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimeout.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimeout.java index a9c65569..d3775e97 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimeout.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimeout.java @@ -21,8 +21,8 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Switch to another Perhaps if this doesn't signal events before the other diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimer.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimer.java index 0522693d..86547140 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimer.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimer.java @@ -21,9 +21,9 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.basetypes.SoloTimer.TimerSubscriber; -import io.reactivex.Scheduler; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Signal a 0L after the specified time delay. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToFlowable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToFlowable.java index 3f88d3d9..27cd6d59 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToFlowable.java @@ -18,8 +18,8 @@ import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.subscriptions.*; /** * Convert the Perhaps into a Flowable. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToMaybe.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToMaybe.java index 85cc641b..f3ae5183 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToMaybe.java @@ -18,9 +18,9 @@ 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; /** * Convert the Perhaps into an Maybe. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToObservable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToObservable.java index 7b3b812c..e09d2913 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsToObservable.java @@ -18,9 +18,9 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.observers.DeferredScalarDisposable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.observers.DeferredScalarDisposable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Convert the Perhaps into an Observable. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUnsubscribeOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUnsubscribeOn.java index d4d9ca68..63c56afc 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUnsubscribeOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUnsubscribeOn.java @@ -19,7 +19,7 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.basetypes.SoloUnsubscribeOn.UnsubscribeOnSubscriber; -import io.reactivex.Scheduler; +import io.reactivex.rxjava3.core.Scheduler; /** * Call cancel from downstream on the specified Scheduler. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUsing.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUsing.java index 25efc315..3b53fba3 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUsing.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUsing.java @@ -19,11 +19,11 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.basetypes.SoloUsing.UsingSubscriber; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.EmptySubscription; -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.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Use a resource while the actual Perhaps is running. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipArray.java index d8a855b5..6e6508a2 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipArray.java @@ -21,10 +21,10 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Waits till all sources produce a value and calls a function diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipIterable.java index 830bf67c..5f55cf32 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipIterable.java @@ -21,9 +21,9 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.basetypes.PerhapsZipArray.ZipCoordinator; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Waits till all sources produce a value and calls a function diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/Solo.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/Solo.java index 80af67bb..2eaab780 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/Solo.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/Solo.java @@ -20,16 +20,16 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; -import io.reactivex.internal.subscribers.LambdaSubscriber; -import io.reactivex.internal.util.ExceptionHelper; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subscribers.TestSubscriber; +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.functions.*; +import io.reactivex.rxjava3.internal.subscribers.LambdaSubscriber; +import io.reactivex.rxjava3.internal.util.ExceptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; +import io.reactivex.rxjava3.subscribers.TestSubscriber; /** * Base class with fluent API for supporting a Publisher with diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbArray.java index 1ad274bf..8c815c77 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbArray.java @@ -21,8 +21,8 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.util.CompositeSubscription; -import io.reactivex.internal.subscriptions.DeferredScalarSubscription; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Signal the events of the first source that signals. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbIterable.java index f820ef43..7fc428e6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbIterable.java @@ -19,8 +19,8 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.basetypes.SoloAmbArray.AmbSubscriber; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Signal the events of the first source that signals. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAndThen.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAndThen.java index 525dafae..15e4dd50 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAndThen.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAndThen.java @@ -20,7 +20,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.subscriptions.*; /** * Run the given Nono after this Solo completes successfully and diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCache.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCache.java index 70939513..f80d1c20 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCache.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCache.java @@ -20,7 +20,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; /** * Cache the success value or error from upstream and relay/replay diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCreate.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCreate.java index 3d60a4c1..b6a756fc 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCreate.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCreate.java @@ -16,17 +16,17 @@ package hu.akarnokd.rxjava3.basetypes; -import java.util.concurrent.atomic.*; +import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.Subscriber; -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.subscriptions.DeferredScalarSubscription; -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.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Create a Solo that for each incoming Subscriber calls a callback to diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDefer.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDefer.java index 8fa3666c..e82e1f39 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDefer.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDefer.java @@ -18,10 +18,10 @@ import org.reactivestreams.Subscriber; -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.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Defers the creation of the actual Solo until subscription time. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelay.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelay.java index 93a2e118..30288e9b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelay.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelay.java @@ -21,11 +21,11 @@ import org.reactivestreams.*; -import io.reactivex.Scheduler; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.QueueSubscription; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Delay signals by the given time amount. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelayPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelayPublisher.java index 4e0d8509..5ab074c5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelayPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelayPublisher.java @@ -20,10 +20,10 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.internal.fuseable.QueueSubscription; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.CompositeException; +import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Delay signals till the other signals an item or completes. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelaySubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelaySubscription.java index bb2a2f2c..a2c89761 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelaySubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelaySubscription.java @@ -20,7 +20,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.subscriptions.*; /** * Delay the subscription to this Solo until the other Publisher diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoFinally.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoFinally.java index 07e7ace4..90e4717d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoFinally.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoFinally.java @@ -18,11 +18,11 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Action; -import io.reactivex.internal.fuseable.QueueSubscription; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Execute an action exactly once after the upstream terminates or the diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoOnLifecycle.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoOnLifecycle.java index 921d1c7e..40503f5c 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoOnLifecycle.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoOnLifecycle.java @@ -18,11 +18,11 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.fuseable.QueueSubscription; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Execute callbacks at various points in the lifecycle. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloError.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloError.java index d26ad00e..75cfc0e4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloError.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloError.java @@ -18,8 +18,8 @@ import org.reactivestreams.Subscriber; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Signals a Throwable. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloErrorSupplier.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloErrorSupplier.java index 0dcce14b..d142f279 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloErrorSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloErrorSupplier.java @@ -18,10 +18,10 @@ import org.reactivestreams.Subscriber; -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.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Signals a Throwable returned by a supplier. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFilter.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFilter.java index 7ea8f0fb..482bef93 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFilter.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFilter.java @@ -18,8 +18,8 @@ import org.reactivestreams.Subscriber; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.subscribers.BasicFuseableSubscriber; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.subscribers.BasicFuseableSubscriber; /** * Tests the single value from upstream and emits it or completes. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMap.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMap.java index 328ee662..02731ed4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMap.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMap.java @@ -20,10 +20,10 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; +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.*; /** * Maps the success value of this Solo into another Solo and diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapPublisher.java index 5cafc13d..25195929 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapPublisher.java @@ -20,11 +20,11 @@ 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.subscriptions.SubscriptionHelper; +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.subscriptions.SubscriptionHelper; /** * Maps the success value of this Solo into a Publisher and diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapSignal.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapSignal.java index 92cca2e2..6d89fc63 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapSignal.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapSignal.java @@ -20,10 +20,10 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; +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.*; /** * Maps the success value or the failure of this Solo into another diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromCallable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromCallable.java index 34f81168..9c96a98a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromCallable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromCallable.java @@ -21,9 +21,9 @@ import org.reactivestreams.Subscriber; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; /** * Executes a callable and signals its resulting value. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromFuture.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromFuture.java index 83400600..b4e18b77 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromFuture.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromFuture.java @@ -21,7 +21,7 @@ import org.reactivestreams.Subscriber; -import io.reactivex.internal.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; /** * Await a Future's result. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromPublisher.java index 7f2e21a2..1cb91029 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromPublisher.java @@ -20,8 +20,8 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscribers.DeferredScalarSubscriber; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscribers.DeferredScalarSubscriber; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Signals the solo value of the source Publisher. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromSingle.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromSingle.java index 6d39ec1c..4f145cd6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromSingle.java @@ -18,10 +18,10 @@ 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; /** * Wrap a Single into a Solo. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloHide.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloHide.java index 5ab97e00..0f5ec478 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloHide.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloHide.java @@ -18,7 +18,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Hides the identity of the upstream Solo and its Subscription. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloJust.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloJust.java index 1e174726..29e4a72b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloJust.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloJust.java @@ -18,8 +18,8 @@ import org.reactivestreams.Subscriber; -import io.reactivex.internal.fuseable.ScalarSupplier; -import io.reactivex.internal.subscriptions.ScalarSubscription; +import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.internal.subscriptions.ScalarSubscription; /** * Signals exactly one value. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloLift.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloLift.java index 9ef5b2e4..438b2e9f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloLift.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloLift.java @@ -18,10 +18,10 @@ import org.reactivestreams.Subscriber; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.EmptySubscription; +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.EmptySubscription; /** * Map the downstream Subscriber into an upstream Subscriber. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMap.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMap.java index c68dc0a4..5d194562 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMap.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMap.java @@ -18,9 +18,9 @@ import org.reactivestreams.Subscriber; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscribers.BasicFuseableSubscriber; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscribers.BasicFuseableSubscriber; /** * Map the success value to another value. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMapError.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMapError.java index 766a62a1..dd53993e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMapError.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMapError.java @@ -18,11 +18,11 @@ import org.reactivestreams.Subscriber; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.QueueSubscription; -import io.reactivex.internal.subscribers.BasicFuseableSubscriber; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.internal.subscribers.BasicFuseableSubscriber; /** * Maps the error from upstream into another Throwable. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloNever.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloNever.java index 2a83ebb0..414773cd 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloNever.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloNever.java @@ -18,7 +18,7 @@ import org.reactivestreams.Subscriber; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Never signals an event other than onSubscribe. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloObserveOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloObserveOn.java index b07d3aa6..b26e5e2d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloObserveOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloObserveOn.java @@ -19,11 +19,11 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.util.SpscOneQueue; -import io.reactivex.Scheduler; -import io.reactivex.Scheduler.Worker; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.subscriptions.*; /** * Delivers the upstream's onNext, onError and onComplete on the specified diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeNext.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeNext.java index 58dcdefd..ce4f050b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeNext.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeNext.java @@ -20,10 +20,10 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.*; /** * If the upstream signals an error, switch over to the next Solo diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeWith.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeWith.java index fd74cc0a..4a6bf741 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeWith.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeWith.java @@ -20,7 +20,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.subscriptions.*; /** * If the upstream signals an error, switch over to the next Solo diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorReturnItem.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorReturnItem.java index 4c2cf41c..11915f59 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorReturnItem.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorReturnItem.java @@ -18,7 +18,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.subscriptions.*; /** * If the upstream signals an error, signal an item instead. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloProcessor.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloProcessor.java index a49979c1..fbf4f365 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloProcessor.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloProcessor.java @@ -21,8 +21,8 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.DeferredScalarSubscription; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * A Processor based on the Solo type that emits an onNext+onComplete or an onError. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetry.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetry.java index ec85386b..2091cc63 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetry.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetry.java @@ -20,7 +20,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.subscriptions.*; /** * Retries the source Solo at most the given number of times. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhen.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhen.java index 094133c5..f4b5e2e2 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhen.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhen.java @@ -21,13 +21,13 @@ 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.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.processors.*; +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.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.processors.*; /** * Retry this solo if the Publisher returned by the handler signals an item diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhile.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhile.java index 834669cd..217f0127 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhile.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhile.java @@ -20,9 +20,9 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.subscriptions.*; /** * Retries the source Solo at most the given number of times. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloSubscribeOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloSubscribeOn.java index adcd26ea..e51392f1 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloSubscribeOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloSubscribeOn.java @@ -20,11 +20,11 @@ import org.reactivestreams.*; -import io.reactivex.Scheduler; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +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.DisposableHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Subscribe to the upstream on the specified scheduler. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTakeUntil.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTakeUntil.java index 22fcb7a7..566987c4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTakeUntil.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTakeUntil.java @@ -21,8 +21,8 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Signal a NoSuchElementException if the other signals before this diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimeout.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimeout.java index c73291e1..81ee9e4f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimeout.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimeout.java @@ -21,8 +21,8 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; final class SoloTimeout extends Solo { diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimer.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimer.java index 8e51eab8..86b66ff7 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimer.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimer.java @@ -21,10 +21,10 @@ import org.reactivestreams.Subscriber; -import io.reactivex.Scheduler; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; /** * Signal a 0L after the specified time delay. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToFlowable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToFlowable.java index b07ac4fa..a6e4e8df 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToFlowable.java @@ -18,7 +18,7 @@ import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; +import io.reactivex.rxjava3.core.Flowable; /** * Converts a Solo into a Flowable. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToObservable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToObservable.java index c74c4731..f2849c0a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToObservable.java @@ -18,9 +18,9 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.observers.DeferredScalarDisposable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.observers.DeferredScalarDisposable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Converts a Solo into an Observable. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToSingle.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToSingle.java index 1a97c5a0..8aa89200 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloToSingle.java @@ -18,9 +18,9 @@ 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; /** * Convert a Solo into a Single. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUnsubscribeOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUnsubscribeOn.java index 9abda4d0..954e65a6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUnsubscribeOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUnsubscribeOn.java @@ -18,9 +18,9 @@ import org.reactivestreams.Subscriber; -import io.reactivex.Scheduler; -import io.reactivex.internal.fuseable.QueueSubscription; -import io.reactivex.internal.subscribers.BasicFuseableSubscriber; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.internal.subscribers.BasicFuseableSubscriber; /** * Call cancel from downstream on the specified Scheduler. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUsing.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUsing.java index 6b04f041..2c2d9176 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUsing.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUsing.java @@ -20,11 +20,11 @@ import org.reactivestreams.*; -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.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; /** * Use a resource while the actual Solo is running. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipArray.java index eb093ddf..83f5d8f5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipArray.java @@ -21,11 +21,11 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +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.plugins.RxJavaPlugins; /** * Combines the solo values of all the sources via a zipper function into a diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipIterable.java index 322c903f..c26b7a0b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipIterable.java @@ -22,10 +22,10 @@ import hu.akarnokd.rxjava3.basetypes.SoloMap.MapSubscriber; import hu.akarnokd.rxjava3.basetypes.SoloZipArray.ZipCoordinator; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.EmptySubscription; +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.EmptySubscription; /** * Combines the solo values of all the sources via a zipper function into a diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/AbstractDisposableAutoRelease.java b/src/main/java/hu/akarnokd/rxjava3/consumers/AbstractDisposableAutoRelease.java index 9f544012..a90d22ff 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/AbstractDisposableAutoRelease.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/AbstractDisposableAutoRelease.java @@ -18,12 +18,12 @@ import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.disposables.*; -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.disposables.*; +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; /** * Wraps lambda callbacks and when the upstream terminates or the observer gets disposed, diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/CompletableConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/CompletableConsumers.java index aad5d05f..4453c494 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/CompletableConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/CompletableConsumers.java @@ -16,10 +16,10 @@ package hu.akarnokd.rxjava3.consumers; -import io.reactivex.Completable; -import io.reactivex.disposables.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.*; /** * Utility methods for creating and using consumers {@link io.reactivex.Completable}s. diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseMultiObserver.java b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseMultiObserver.java index 28ce8aa6..2cb96f74 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseMultiObserver.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseMultiObserver.java @@ -16,12 +16,12 @@ package hu.akarnokd.rxjava3.consumers; -import io.reactivex.*; -import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.CompositeDisposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Wraps lambda callbacks and when the upstream terminates or this (Single | Maybe | Completable) diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseObserver.java b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseObserver.java index d01ae462..62c9adf1 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseObserver.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseObserver.java @@ -16,11 +16,11 @@ package hu.akarnokd.rxjava3.consumers; -import io.reactivex.Observer; -import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.CompositeDisposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Wraps lambda callbacks and when the upstream terminates or this observer gets disposed, diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseSubscriber.java b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseSubscriber.java index f4bf47d9..968185fb 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseSubscriber.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseSubscriber.java @@ -20,13 +20,13 @@ import org.reactivestreams.Subscription; -import io.reactivex.FlowableSubscriber; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.observers.LambdaConsumerIntrospection; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Wraps lambda callbacks and when the upstream terminates or this subscriber gets disposed, diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/FlowableConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/FlowableConsumers.java index 15a12be7..a030d971 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/FlowableConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/FlowableConsumers.java @@ -16,10 +16,10 @@ package hu.akarnokd.rxjava3.consumers; -import io.reactivex.Flowable; -import io.reactivex.disposables.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.*; /** * Utility methods for creating and using consumers {@link io.reactivex.Flowable}s. diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/MaybeConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/MaybeConsumers.java index 75cbe29f..118c8b11 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/MaybeConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/MaybeConsumers.java @@ -16,10 +16,10 @@ package hu.akarnokd.rxjava3.consumers; -import io.reactivex.Maybe; -import io.reactivex.disposables.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.*; /** * Utility methods for creating and using consumers {@link io.reactivex.Maybe}s. diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/ObservableConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/ObservableConsumers.java index 46ee2a9c..76525b16 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/ObservableConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/ObservableConsumers.java @@ -16,10 +16,10 @@ package hu.akarnokd.rxjava3.consumers; -import io.reactivex.Observable; -import io.reactivex.disposables.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.*; /** * Utility methods for creating and using consumers {@link io.reactivex.Observable}s. diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/SingleConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/SingleConsumers.java index 1826a6d0..2516eaa7 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/SingleConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/SingleConsumers.java @@ -16,10 +16,10 @@ package hu.akarnokd.rxjava3.consumers; -import io.reactivex.Single; -import io.reactivex.disposables.*; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.functions.*; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.internal.functions.*; /** * Utility methods for creating and using consumers {@link io.reactivex.SingleObserver}s. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssembly.java b/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssembly.java index 2d9411b0..b182df0a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssembly.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssembly.java @@ -16,9 +16,9 @@ package hu.akarnokd.rxjava3.debug; -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; /** * Wraps a CompletableSource and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblyScalarSupplier.java b/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblyScalarSupplier.java index 55dacefe..d6bce2de 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblyScalarSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblyScalarSupplier.java @@ -17,8 +17,8 @@ package hu.akarnokd.rxjava3.debug; import hu.akarnokd.rxjava3.debug.CompletableOnAssembly.OnAssemblyCompletableObserver; -import io.reactivex.*; -import io.reactivex.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; /** * Wraps a CompletableSource and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblySupplier.java b/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblySupplier.java index 780194e2..ecb95648 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblySupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblySupplier.java @@ -17,9 +17,9 @@ package hu.akarnokd.rxjava3.debug; import hu.akarnokd.rxjava3.debug.CompletableOnAssembly.OnAssemblyCompletableObserver; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; /** * Wraps a CompletableSource and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssembly.java b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssembly.java index ac99baaa..f0fffe38 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssembly.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssembly.java @@ -18,9 +18,9 @@ import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.subscribers.*; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.subscribers.*; /** * Wraps a Publisher and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyConnectable.java b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyConnectable.java index 715e5614..20364a0e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyConnectable.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyConnectable.java @@ -19,10 +19,10 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.debug.FlowableOnAssembly.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.flowables.ConnectableFlowable; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.flowables.ConnectableFlowable; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; /** * Wraps a Publisher and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyScalarSupplier.java b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyScalarSupplier.java index 3bf0e96a..486e75bc 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyScalarSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyScalarSupplier.java @@ -19,8 +19,8 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.debug.FlowableOnAssembly.*; -import io.reactivex.Flowable; -import io.reactivex.internal.fuseable.*; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.fuseable.*; /** * Wraps a Publisher and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblySupplier.java b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblySupplier.java index 0d44fa55..1442eff1 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblySupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblySupplier.java @@ -19,10 +19,10 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.debug.FlowableOnAssembly.*; -import io.reactivex.Flowable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; /** * Wraps a Publisher and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssembly.java b/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssembly.java index e77a2fe7..4e13dae7 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssembly.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssembly.java @@ -16,9 +16,9 @@ package hu.akarnokd.rxjava3.debug; -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; /** * Wraps a MaybeSource and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblyScalarSupplier.java b/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblyScalarSupplier.java index bb425500..4921b81a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblyScalarSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblyScalarSupplier.java @@ -17,8 +17,8 @@ package hu.akarnokd.rxjava3.debug; import hu.akarnokd.rxjava3.debug.MaybeOnAssembly.OnAssemblyMaybeObserver; -import io.reactivex.*; -import io.reactivex.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; /** * Wraps a MaybeSource and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblySupplier.java b/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblySupplier.java index 1de415a1..614ea809 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblySupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblySupplier.java @@ -17,9 +17,9 @@ package hu.akarnokd.rxjava3.debug; import hu.akarnokd.rxjava3.debug.MaybeOnAssembly.OnAssemblyMaybeObserver; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; /** * Wraps a MaybeSource and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssembly.java b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssembly.java index c72748a5..91cfa860 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssembly.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssembly.java @@ -16,9 +16,9 @@ package hu.akarnokd.rxjava3.debug; -import io.reactivex.*; -import io.reactivex.internal.fuseable.QueueDisposable; -import io.reactivex.internal.observers.BasicFuseableObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.fuseable.QueueDisposable; +import io.reactivex.rxjava3.internal.observers.BasicFuseableObserver; /** * Wraps a ObservableSource and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyConnectable.java b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyConnectable.java index b65dbf03..2f6e305a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyConnectable.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyConnectable.java @@ -17,10 +17,10 @@ package hu.akarnokd.rxjava3.debug; import hu.akarnokd.rxjava3.debug.ObservableOnAssembly.OnAssemblyObserver; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Consumer; -import io.reactivex.observables.ConnectableObservable; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.observables.ConnectableObservable; /** * Wraps a ObservableSource and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyScalarSupplier.java b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyScalarSupplier.java index 5f0c93d3..124c62ce 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyScalarSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyScalarSupplier.java @@ -17,8 +17,8 @@ package hu.akarnokd.rxjava3.debug; import hu.akarnokd.rxjava3.debug.ObservableOnAssembly.OnAssemblyObserver; -import io.reactivex.*; -import io.reactivex.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; /** * Wraps a ObservableSource and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblySupplier.java b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblySupplier.java index 589e5b53..936e8daa 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblySupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblySupplier.java @@ -17,9 +17,9 @@ package hu.akarnokd.rxjava3.debug; import hu.akarnokd.rxjava3.debug.ObservableOnAssembly.OnAssemblyObserver; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; /** * Wraps a ObservableSource and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/ParallelFlowableOnAssembly.java b/src/main/java/hu/akarnokd/rxjava3/debug/ParallelFlowableOnAssembly.java index 813c9067..9e7ad569 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/ParallelFlowableOnAssembly.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/ParallelFlowableOnAssembly.java @@ -19,8 +19,8 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.debug.FlowableOnAssembly.*; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.parallel.ParallelFlowable; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.parallel.ParallelFlowable; /** * Wrap a Parallel Flowable and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyTracking.java b/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyTracking.java index 8a44e567..45ad4d48 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyTracking.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyTracking.java @@ -18,13 +18,13 @@ import java.util.concurrent.atomic.AtomicBoolean; -import io.reactivex.*; -import io.reactivex.flowables.ConnectableFlowable; -import io.reactivex.functions.*; -import io.reactivex.internal.fuseable.ScalarSupplier; -import io.reactivex.observables.ConnectableObservable; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.flowables.ConnectableFlowable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.observables.ConnectableObservable; +import io.reactivex.rxjava3.parallel.ParallelFlowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Utility class to enable and disable tracking of operator application ({@code source.map().filter()}) diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssembly.java b/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssembly.java index 3ac5c7bd..c1cfe755 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssembly.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssembly.java @@ -16,9 +16,9 @@ package hu.akarnokd.rxjava3.debug; -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; /** * Wraps a Publisher and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblyScalarSupplier.java b/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblyScalarSupplier.java index ae85b852..e96eb8d6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblyScalarSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblyScalarSupplier.java @@ -17,8 +17,8 @@ package hu.akarnokd.rxjava3.debug; import hu.akarnokd.rxjava3.debug.SingleOnAssembly.OnAssemblySingleObserver; -import io.reactivex.*; -import io.reactivex.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; /** * Wraps a Publisher and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblySupplier.java b/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblySupplier.java index 2de80886..496233bc 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblySupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblySupplier.java @@ -17,9 +17,9 @@ package hu.akarnokd.rxjava3.debug; import hu.akarnokd.rxjava3.debug.SingleOnAssembly.OnAssemblySingleObserver; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; /** * Wraps a Publisher and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/multihook/MultiHandlerManager.java b/src/main/java/hu/akarnokd/rxjava3/debug/multihook/MultiHandlerManager.java index 4766fc86..94e70f77 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/multihook/MultiHandlerManager.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/multihook/MultiHandlerManager.java @@ -20,10 +20,10 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.annotations.NonNull; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Manages an array of handlers. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/multihook/OnScheduleMultiHandlerManager.java b/src/main/java/hu/akarnokd/rxjava3/debug/multihook/OnScheduleMultiHandlerManager.java index 5f87b97d..076ef3de 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/multihook/OnScheduleMultiHandlerManager.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/multihook/OnScheduleMultiHandlerManager.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.debug.multihook; -import io.reactivex.functions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Handles the OnSchedule hooks. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/validator/CompletableValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/CompletableValidator.java index f1e07cf7..7e74e23e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/validator/CompletableValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/CompletableValidator.java @@ -17,8 +17,8 @@ package hu.akarnokd.rxjava3.debug.validator; import hu.akarnokd.rxjava3.functions.PlainConsumer; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; /** * Validates a Completable. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/validator/ConnectableFlowableValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ConnectableFlowableValidator.java index 07b80266..7eecc535 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/validator/ConnectableFlowableValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ConnectableFlowableValidator.java @@ -19,9 +19,9 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.functions.PlainConsumer; -import io.reactivex.disposables.Disposable; -import io.reactivex.flowables.ConnectableFlowable; -import io.reactivex.functions.Consumer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.flowables.ConnectableFlowable; +import io.reactivex.rxjava3.functions.Consumer; /** * Validates a ConnectableFlowable. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/validator/ConnectableObservableValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ConnectableObservableValidator.java index a20283e3..ad74e041 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/validator/ConnectableObservableValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ConnectableObservableValidator.java @@ -17,10 +17,10 @@ package hu.akarnokd.rxjava3.debug.validator; import hu.akarnokd.rxjava3.functions.PlainConsumer; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Consumer; -import io.reactivex.observables.ConnectableObservable; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.observables.ConnectableObservable; /** * Validates a ConnectableObservable. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/validator/FlowableValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/FlowableValidator.java index 2c743b87..a94218a3 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/validator/FlowableValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/FlowableValidator.java @@ -19,7 +19,7 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.functions.PlainConsumer; -import io.reactivex.*; +import io.reactivex.rxjava3.core.*; /** * Validates a Flowable. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/validator/MaybeValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/MaybeValidator.java index e6b4589a..bf233d4b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/validator/MaybeValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/MaybeValidator.java @@ -17,8 +17,8 @@ package hu.akarnokd.rxjava3.debug.validator; import hu.akarnokd.rxjava3.functions.PlainConsumer; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; /** * Validates a Maybe. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/validator/ObservableValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ObservableValidator.java index db578fa4..e2707c9b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/validator/ObservableValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ObservableValidator.java @@ -17,8 +17,8 @@ package hu.akarnokd.rxjava3.debug.validator; import hu.akarnokd.rxjava3.functions.PlainConsumer; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; /** * Validates an Observable. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/validator/ParallelFlowableValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ParallelFlowableValidator.java index d472f3f6..49ca8ee3 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/validator/ParallelFlowableValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ParallelFlowableValidator.java @@ -19,7 +19,7 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.functions.PlainConsumer; -import io.reactivex.parallel.ParallelFlowable; +import io.reactivex.rxjava3.parallel.ParallelFlowable; /** * Validates a ParallelFlowable. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidator.java index 10c23f62..1f430214 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidator.java @@ -18,14 +18,14 @@ import hu.akarnokd.rxjava3.debug.SavedHooks; import hu.akarnokd.rxjava3.functions.PlainConsumer; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.flowables.ConnectableFlowable; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.Functions; -import io.reactivex.observables.ConnectableObservable; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.flowables.ConnectableFlowable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.observables.ConnectableObservable; +import io.reactivex.rxjava3.parallel.ParallelFlowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Installs assembly hooks that validate the Reactive-Streams and derived diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/validator/SingleValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/SingleValidator.java index be4f565c..e23967d2 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/validator/SingleValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/SingleValidator.java @@ -17,8 +17,8 @@ package hu.akarnokd.rxjava3.debug.validator; import hu.akarnokd.rxjava3.functions.PlainConsumer; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; /** * Validates a Single. diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/CompletableIfThen.java b/src/main/java/hu/akarnokd/rxjava3/expr/CompletableIfThen.java index 0aeacb32..6ab5fc4e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/CompletableIfThen.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/CompletableIfThen.java @@ -16,12 +16,10 @@ package hu.akarnokd.rxjava3.expr; -import io.reactivex.Completable; -import io.reactivex.CompletableObserver; -import io.reactivex.CompletableSource; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BooleanSupplier; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BooleanSupplier; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; /** * When an Observer subscribes, the condition is evaluated and the appropriate diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/CompletableSwitchCase.java b/src/main/java/hu/akarnokd/rxjava3/expr/CompletableSwitchCase.java index fc328667..a087dd68 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/CompletableSwitchCase.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/CompletableSwitchCase.java @@ -18,10 +18,10 @@ import java.util.Map; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; /** * For each Observer, it calls a keySelector for a key to lookup in the given Map for a CompletableSource diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/FlowableIfThen.java b/src/main/java/hu/akarnokd/rxjava3/expr/FlowableIfThen.java index 388f1c45..7f0fdede 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/FlowableIfThen.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/FlowableIfThen.java @@ -18,10 +18,10 @@ import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BooleanSupplier; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BooleanSupplier; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * When an Subscriber subscribes, the condition is evaluated and the appropriate diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/FlowableSwitchCase.java b/src/main/java/hu/akarnokd/rxjava3/expr/FlowableSwitchCase.java index 27194b12..03129098 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/FlowableSwitchCase.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/FlowableSwitchCase.java @@ -20,10 +20,10 @@ import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -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.subscriptions.EmptySubscription; /** * For each Subscriber, it calls a keySelector for a key to lookup in the given Map for an Publisher diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/FlowableWhileDoWhile.java b/src/main/java/hu/akarnokd/rxjava3/expr/FlowableWhileDoWhile.java index 6206dc2c..7e252090 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/FlowableWhileDoWhile.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/FlowableWhileDoWhile.java @@ -20,10 +20,10 @@ import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BooleanSupplier; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BooleanSupplier; +import io.reactivex.rxjava3.internal.subscriptions.*; final class FlowableWhileDoWhile extends Flowable { diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/MaybeIfThen.java b/src/main/java/hu/akarnokd/rxjava3/expr/MaybeIfThen.java index 75cf22c0..2fe36ae8 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/MaybeIfThen.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/MaybeIfThen.java @@ -16,12 +16,10 @@ package hu.akarnokd.rxjava3.expr; -import io.reactivex.Maybe; -import io.reactivex.MaybeObserver; -import io.reactivex.MaybeSource; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BooleanSupplier; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BooleanSupplier; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; /** * When an Observer subscribes, the condition is evaluated and the appropriate diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/MaybeSwitchCase.java b/src/main/java/hu/akarnokd/rxjava3/expr/MaybeSwitchCase.java index c0b9626d..9eabdfd8 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/MaybeSwitchCase.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/MaybeSwitchCase.java @@ -18,10 +18,10 @@ import java.util.Map; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; /** * For each Observer, it calls a keySelector for a key to lookup in the given Map for a MaybeSource diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/ObservableIfThen.java b/src/main/java/hu/akarnokd/rxjava3/expr/ObservableIfThen.java index 6c19a4e8..9d360824 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/ObservableIfThen.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/ObservableIfThen.java @@ -16,10 +16,10 @@ package hu.akarnokd.rxjava3.expr; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BooleanSupplier; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BooleanSupplier; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; /** * When an Observer subscribes, the condition is evaluated and the appropriate diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/ObservableSwitchCase.java b/src/main/java/hu/akarnokd/rxjava3/expr/ObservableSwitchCase.java index 4683d82c..f2688694 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/ObservableSwitchCase.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/ObservableSwitchCase.java @@ -18,10 +18,10 @@ import java.util.Map; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; /** * For each Observer, it calls a keySelector for a key to lookup in the given Map for an ObservableSource diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/ObservableWhileDoWhile.java b/src/main/java/hu/akarnokd/rxjava3/expr/ObservableWhileDoWhile.java index b3d0d312..a4f7bb1d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/ObservableWhileDoWhile.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/ObservableWhileDoWhile.java @@ -18,11 +18,11 @@ import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BooleanSupplier; -import io.reactivex.internal.disposables.*; +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.*; final class ObservableWhileDoWhile extends Observable { diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/SingleIfThen.java b/src/main/java/hu/akarnokd/rxjava3/expr/SingleIfThen.java index 88cd94f2..05daa759 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/SingleIfThen.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/SingleIfThen.java @@ -16,12 +16,10 @@ package hu.akarnokd.rxjava3.expr; -import io.reactivex.Single; -import io.reactivex.SingleObserver; -import io.reactivex.SingleSource; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BooleanSupplier; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BooleanSupplier; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; /** * When an Observer subscribes, the condition is evaluated and the appropriate diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/SingleSwitchCase.java b/src/main/java/hu/akarnokd/rxjava3/expr/SingleSwitchCase.java index 4e73b581..cd9f7828 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/SingleSwitchCase.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/SingleSwitchCase.java @@ -18,10 +18,10 @@ import java.util.Map; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; /** * For each Observer, it calls a keySelector for a key to lookup in the given Map for a SingleSource diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/StatementCompletable.java b/src/main/java/hu/akarnokd/rxjava3/expr/StatementCompletable.java index 7b734594..c1de6e2c 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/StatementCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/StatementCompletable.java @@ -18,10 +18,10 @@ import java.util.Map; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Imperative statements expressed as Completable operators. diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/StatementFlowable.java b/src/main/java/hu/akarnokd/rxjava3/expr/StatementFlowable.java index ce919836..b66f00f4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/StatementFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/StatementFlowable.java @@ -21,10 +21,10 @@ import org.reactivestreams.Publisher; import hu.akarnokd.rxjava3.util.AlwaysTrueBooleanSupplier; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Imperative statements expressed as Flowable operators. diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/StatementMaybe.java b/src/main/java/hu/akarnokd/rxjava3/expr/StatementMaybe.java index 3251eeec..b88520d9 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/StatementMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/StatementMaybe.java @@ -18,10 +18,10 @@ import java.util.Map; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Imperative statements expressed as Maybe operators. diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/StatementObservable.java b/src/main/java/hu/akarnokd/rxjava3/expr/StatementObservable.java index 2cc1a687..4d49723f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/StatementObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/StatementObservable.java @@ -19,10 +19,10 @@ import java.util.Map; import hu.akarnokd.rxjava3.util.AlwaysTrueBooleanSupplier; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Imperative statements expressed as Observable operators. diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/StatementSingle.java b/src/main/java/hu/akarnokd/rxjava3/expr/StatementSingle.java index 47d6d13f..5245b8e2 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/StatementSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/StatementSingle.java @@ -18,10 +18,10 @@ import java.util.Map; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Imperative statements expressed as Single operators. diff --git a/src/main/java/hu/akarnokd/rxjava3/functions/FunctionTagging.java b/src/main/java/hu/akarnokd/rxjava3/functions/FunctionTagging.java index d8c59081..e6c40bc5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/functions/FunctionTagging.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/FunctionTagging.java @@ -18,10 +18,10 @@ import java.util.*; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.CompositeException; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Wraps the regular {@code io.reactivex.functions} function types and appends diff --git a/src/main/java/hu/akarnokd/rxjava3/functions/FunctionsEx.java b/src/main/java/hu/akarnokd/rxjava3/functions/FunctionsEx.java index 3849a5f5..76c2a5a8 100644 --- a/src/main/java/hu/akarnokd/rxjava3/functions/FunctionsEx.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/FunctionsEx.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.functions; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.functions.*; /** * Utility methods to work with functional interfaces of this package. diff --git a/src/main/java/hu/akarnokd/rxjava3/functions/PlainBiConsumer.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainBiConsumer.java index d977042c..20af1582 100644 --- a/src/main/java/hu/akarnokd/rxjava3/functions/PlainBiConsumer.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainBiConsumer.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.functions; -import io.reactivex.functions.BiConsumer; +import io.reactivex.rxjava3.functions.BiConsumer; /** * A {@link BiConsumer} with suppressed exception on its diff --git a/src/main/java/hu/akarnokd/rxjava3/functions/PlainBiFunction.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainBiFunction.java index 30f6e919..83bc091a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/functions/PlainBiFunction.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainBiFunction.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.functions; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.functions.BiFunction; /** * A {@link BiFunction} with suppressed exception on its diff --git a/src/main/java/hu/akarnokd/rxjava3/functions/PlainConsumer.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainConsumer.java index fb7249f6..5e0314ff 100644 --- a/src/main/java/hu/akarnokd/rxjava3/functions/PlainConsumer.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainConsumer.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.functions; -import io.reactivex.functions.Consumer; +import io.reactivex.rxjava3.functions.Consumer; /** * A {@link Consumer} with suppressed exception on its {@link #accept(Object)} method. diff --git a/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction.java index 4f3c912b..d1cd0de0 100644 --- a/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.functions; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; /** * A {@link Function} with suppressed exception on its {@link #apply(Object)} method. diff --git a/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction3.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction3.java index 37e2f368..39cf8e8d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction3.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction3.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.functions; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.functions.Function3; /** * A {@link Function3} with suppressed exception on its diff --git a/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction4.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction4.java index c99f1c5c..2aebf69f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction4.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction4.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.functions; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.functions.Function4; /** * A {@link Function4} with suppressed exception on its diff --git a/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction5.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction5.java index 48c9b4c5..664e25e3 100644 --- a/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction5.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction5.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.functions; -import io.reactivex.functions.Function5; +import io.reactivex.rxjava3.functions.Function5; /** * A {@link Function5} with suppressed exception on its diff --git a/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction6.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction6.java index d0de355e..911508be 100644 --- a/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction6.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction6.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.functions; -import io.reactivex.functions.Function6; +import io.reactivex.rxjava3.functions.Function6; /** * A {@link Function6} with suppressed exception on its diff --git a/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction7.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction7.java index 42314bc7..610ec5dd 100644 --- a/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction7.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction7.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.functions; -import io.reactivex.functions.Function7; +import io.reactivex.rxjava3.functions.Function7; /** * A {@link Function7} with suppressed exception on its diff --git a/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction8.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction8.java index 7b4da7b3..2ff1454d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction8.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction8.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.functions; -import io.reactivex.functions.Function8; +import io.reactivex.rxjava3.functions.Function8; /** * A {@link Function8} with suppressed exception on its diff --git a/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction9.java b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction9.java index 4498ba8c..46321ee8 100644 --- a/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction9.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/PlainFunction9.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.functions; -import io.reactivex.functions.Function9; +import io.reactivex.rxjava3.functions.Function9; /** * A {@link Function9} with suppressed exception on its diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan0.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan0.java index 1f4d0153..ca7eae06 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan0.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan0.java @@ -16,8 +16,7 @@ package hu.akarnokd.rxjava3.joins; -import java.util.HashMap; -import java.util.Map; +import java.util.*; /** * Represents an activated plan. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan1.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan1.java index 6de13bf6..3a4f669a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan1.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan1.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.joins; -import io.reactivex.Notification; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.core.Notification; +import io.reactivex.rxjava3.functions.*; /** * Represents an active plan. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan2.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan2.java index a2137143..39f83098 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan2.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan2.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.joins; -import io.reactivex.Notification; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.core.Notification; +import io.reactivex.rxjava3.functions.*; /** * Represents an active plan. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan3.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan3.java index d7e54d75..4ec41955 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan3.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan3.java @@ -17,8 +17,8 @@ package hu.akarnokd.rxjava3.joins; import hu.akarnokd.rxjava3.functions.Consumer3; -import io.reactivex.Notification; -import io.reactivex.functions.Action; +import io.reactivex.rxjava3.core.Notification; +import io.reactivex.rxjava3.functions.Action; /** * Represents an active plan. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan4.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan4.java index f0334e9e..b05fe642 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan4.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan4.java @@ -17,8 +17,8 @@ package hu.akarnokd.rxjava3.joins; import hu.akarnokd.rxjava3.functions.Consumer4; -import io.reactivex.Notification; -import io.reactivex.functions.Action; +import io.reactivex.rxjava3.core.Notification; +import io.reactivex.rxjava3.functions.Action; /** * Represents an active plan. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan5.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan5.java index 9cce56a2..4a92af92 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan5.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan5.java @@ -17,8 +17,8 @@ package hu.akarnokd.rxjava3.joins; import hu.akarnokd.rxjava3.functions.Consumer5; -import io.reactivex.Notification; -import io.reactivex.functions.Action; +import io.reactivex.rxjava3.core.Notification; +import io.reactivex.rxjava3.functions.Action; /** * Represents an active plan. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan6.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan6.java index dcd36a8d..019e8ca6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan6.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan6.java @@ -17,8 +17,8 @@ package hu.akarnokd.rxjava3.joins; import hu.akarnokd.rxjava3.functions.Consumer6; -import io.reactivex.Notification; -import io.reactivex.functions.Action; +import io.reactivex.rxjava3.core.Notification; +import io.reactivex.rxjava3.functions.Action; /** * Represents an active plan. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan7.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan7.java index 8bfc0ccf..567a87b5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan7.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan7.java @@ -17,8 +17,8 @@ package hu.akarnokd.rxjava3.joins; import hu.akarnokd.rxjava3.functions.Consumer7; -import io.reactivex.Notification; -import io.reactivex.functions.Action; +import io.reactivex.rxjava3.core.Notification; +import io.reactivex.rxjava3.functions.Action; /** * Represents an active plan. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan8.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan8.java index 5dae4aaa..243a679f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan8.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan8.java @@ -17,8 +17,8 @@ package hu.akarnokd.rxjava3.joins; import hu.akarnokd.rxjava3.functions.Consumer8; -import io.reactivex.Notification; -import io.reactivex.functions.Action; +import io.reactivex.rxjava3.core.Notification; +import io.reactivex.rxjava3.functions.Action; /** * Represents an active plan. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan9.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan9.java index 5922c26f..6267278d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan9.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan9.java @@ -17,8 +17,8 @@ package hu.akarnokd.rxjava3.joins; import hu.akarnokd.rxjava3.functions.Consumer9; -import io.reactivex.Notification; -import io.reactivex.functions.Action; +import io.reactivex.rxjava3.core.Notification; +import io.reactivex.rxjava3.functions.Action; /** * Represents an active plan. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlanN.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlanN.java index aed8c9f9..f453eaee 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlanN.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlanN.java @@ -18,8 +18,8 @@ import java.util.*; -import io.reactivex.Notification; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.core.Notification; +import io.reactivex.rxjava3.functions.*; /** * Represents an active plan. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/JoinObservable.java b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObservable.java index 158909dd..218ff8ac 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/JoinObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObservable.java @@ -16,9 +16,9 @@ package hu.akarnokd.rxjava3.joins; -import io.reactivex.Observable; -import io.reactivex.functions.Function; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Represents an observable that supports join operations. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver.java b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver.java index 069c6be6..4919aced 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.joins; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.disposables.Disposable; /** * Base interface to manage joined observations. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver1.java b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver1.java index 72f59056..1cb29f3b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver1.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver1.java @@ -19,14 +19,14 @@ import java.util.*; import java.util.concurrent.atomic.*; -import io.reactivex.Notification; -import io.reactivex.Observable; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.Notification; +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.Consumer; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Default implementation of a join observer. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/JoinPatterns.java b/src/main/java/hu/akarnokd/rxjava3/joins/JoinPatterns.java index 593f065e..15dd6be2 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/JoinPatterns.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/JoinPatterns.java @@ -18,11 +18,11 @@ import java.util.*; -import io.reactivex.Observable; -import io.reactivex.Observer; -import io.reactivex.disposables.*; -import io.reactivex.functions.*; -import io.reactivex.observers.SafeObserver; +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.observers.SafeObserver; /** * Join patterns And, Then and When. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern1.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern1.java index bcef9e12..c138c839 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern1.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern1.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.joins; -import io.reactivex.Observable; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.functions.Function; /** * Represents a join pattern over Observable sequences. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern2.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern2.java index 0633f0c3..4cd66239 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern2.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern2.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.joins; -import io.reactivex.Observable; -import io.reactivex.functions.BiFunction; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.functions.BiFunction; /** * Represents a join pattern over observable sequences. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern3.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern3.java index e16ff5b8..34b68132 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern3.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern3.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.joins; -import io.reactivex.Observable; -import io.reactivex.functions.Function3; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.functions.Function3; /** * Represents a join pattern over observable sequences. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern4.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern4.java index 2db8c8f4..d61e0724 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern4.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern4.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.joins; -import io.reactivex.Observable; -import io.reactivex.functions.Function4; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.functions.Function4; /** * Represents a join pattern over observable sequences. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern5.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern5.java index 65ca8e2c..6ca962b7 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern5.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern5.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.joins; -import io.reactivex.Observable; -import io.reactivex.functions.Function5; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.functions.Function5; /** * Represents a join pattern over observable sequences. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern6.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern6.java index 92b6462a..f54b3d49 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern6.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern6.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.joins; -import io.reactivex.Observable; -import io.reactivex.functions.Function6; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.functions.Function6; /** * Represents a join pattern over observable sequences. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern7.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern7.java index ee638517..5eefb201 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern7.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern7.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.joins; -import io.reactivex.Observable; -import io.reactivex.functions.Function7; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.functions.Function7; /** * Represents a join pattern over observable sequences. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern8.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern8.java index d01ac60d..30d79113 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern8.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern8.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.joins; -import io.reactivex.Observable; -import io.reactivex.functions.Function8; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.functions.Function8; /** * Represents a join pattern over observable sequences. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern9.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern9.java index ba740d26..af670548 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern9.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern9.java @@ -18,9 +18,9 @@ import java.util.*; -import io.reactivex.Observable; -import io.reactivex.functions.Function9; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.functions.Function9; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Represents a join pattern over observable sequences. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/PatternN.java b/src/main/java/hu/akarnokd/rxjava3/joins/PatternN.java index eee2b840..4bb569aa 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/PatternN.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/PatternN.java @@ -18,8 +18,8 @@ import java.util.*; -import io.reactivex.Observable; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.functions.Function; /** * Represents a join pattern over observable sequences. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan.java index da890e76..f5d1639c 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan.java @@ -18,8 +18,8 @@ import java.util.Map; -import io.reactivex.*; -import io.reactivex.functions.Consumer; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Consumer; /** * Represents an execution plan for join patterns. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan1.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan1.java index db86dd0f..b077cd32 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan1.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan1.java @@ -19,8 +19,8 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.Observer; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.functions.*; /** * Represents an execution plan for join patterns. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan2.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan2.java index a2d95f05..dc706f71 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan2.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan2.java @@ -19,8 +19,8 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.Observer; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.functions.*; /** * Represents an execution plan for join patterns. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan3.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan3.java index 4d0dffb7..1ecd4958 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan3.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan3.java @@ -20,8 +20,8 @@ import java.util.concurrent.atomic.AtomicReference; import hu.akarnokd.rxjava3.functions.Consumer3; -import io.reactivex.Observer; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.functions.*; /** * Represents an execution plan for join patterns. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan4.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan4.java index 4f309a5a..f36c1567 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan4.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan4.java @@ -20,8 +20,8 @@ import java.util.concurrent.atomic.AtomicReference; import hu.akarnokd.rxjava3.functions.Consumer4; -import io.reactivex.Observer; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.functions.*; /** * Represents an execution plan for join patterns. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan5.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan5.java index f487f8e7..610d2ed9 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan5.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan5.java @@ -20,8 +20,8 @@ import java.util.concurrent.atomic.AtomicReference; import hu.akarnokd.rxjava3.functions.Consumer5; -import io.reactivex.Observer; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.functions.*; /** * Represents an execution plan for join patterns. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan6.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan6.java index 2e590d32..d2188bf6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan6.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan6.java @@ -20,8 +20,8 @@ import java.util.concurrent.atomic.AtomicReference; import hu.akarnokd.rxjava3.functions.Consumer6; -import io.reactivex.Observer; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.functions.*; /** * Represents an execution plan for join patterns. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan7.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan7.java index 7bcc98b2..47f207a2 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan7.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan7.java @@ -20,8 +20,8 @@ import java.util.concurrent.atomic.AtomicReference; import hu.akarnokd.rxjava3.functions.Consumer7; -import io.reactivex.Observer; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.functions.*; /** * Represents an execution plan for join patterns. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan8.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan8.java index 6c8eef62..6f72fbf1 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan8.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan8.java @@ -20,8 +20,8 @@ import java.util.concurrent.atomic.AtomicReference; import hu.akarnokd.rxjava3.functions.Consumer8; -import io.reactivex.Observer; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.functions.*; /** * Represents an execution plan for join patterns. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan9.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan9.java index 2986e739..05030278 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan9.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan9.java @@ -20,8 +20,8 @@ import java.util.concurrent.atomic.AtomicReference; import hu.akarnokd.rxjava3.functions.Consumer9; -import io.reactivex.Observer; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.functions.*; /** * Represents an execution plan for join patterns. diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/PlanN.java b/src/main/java/hu/akarnokd/rxjava3/joins/PlanN.java index 99752b01..6f4d65e1 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/PlanN.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/PlanN.java @@ -19,8 +19,8 @@ import java.util.*; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.Observer; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.functions.*; /** * Represents an execution plan for join patterns. diff --git a/src/main/java/hu/akarnokd/rxjava3/math/FlowableAverageDouble.java b/src/main/java/hu/akarnokd/rxjava3/math/FlowableAverageDouble.java index 52fd7be5..bbcfc849 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/FlowableAverageDouble.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/FlowableAverageDouble.java @@ -18,7 +18,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscribers.DeferredScalarSubscriber; +import io.reactivex.rxjava3.internal.subscribers.DeferredScalarSubscriber; final class FlowableAverageDouble extends FlowableSource { diff --git a/src/main/java/hu/akarnokd/rxjava3/math/FlowableAverageFloat.java b/src/main/java/hu/akarnokd/rxjava3/math/FlowableAverageFloat.java index 47cf7c0f..ce668770 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/FlowableAverageFloat.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/FlowableAverageFloat.java @@ -18,7 +18,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscribers.DeferredScalarSubscriber; +import io.reactivex.rxjava3.internal.subscribers.DeferredScalarSubscriber; final class FlowableAverageFloat extends FlowableSource { diff --git a/src/main/java/hu/akarnokd/rxjava3/math/FlowableMinMax.java b/src/main/java/hu/akarnokd/rxjava3/math/FlowableMinMax.java index 32fd1d8e..d83484be 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/FlowableMinMax.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/FlowableMinMax.java @@ -20,8 +20,8 @@ import org.reactivestreams.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.subscribers.DeferredScalarSubscriber; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.subscribers.DeferredScalarSubscriber; final class FlowableMinMax extends FlowableSource { diff --git a/src/main/java/hu/akarnokd/rxjava3/math/FlowableSource.java b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSource.java index f1e991a6..08a8b6af 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/FlowableSource.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSource.java @@ -18,7 +18,7 @@ import org.reactivestreams.Publisher; -import io.reactivex.Flowable; +import io.reactivex.rxjava3.core.Flowable; abstract class FlowableSource extends Flowable { diff --git a/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumDouble.java b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumDouble.java index c1576b7b..e232bf01 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumDouble.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumDouble.java @@ -18,7 +18,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscribers.DeferredScalarSubscriber; +import io.reactivex.rxjava3.internal.subscribers.DeferredScalarSubscriber; final class FlowableSumDouble extends FlowableSource { diff --git a/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumFloat.java b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumFloat.java index abb22146..18cdc469 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumFloat.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumFloat.java @@ -18,7 +18,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscribers.DeferredScalarSubscriber; +import io.reactivex.rxjava3.internal.subscribers.DeferredScalarSubscriber; final class FlowableSumFloat extends FlowableSource { diff --git a/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumInt.java b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumInt.java index baf1cc63..0058860b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumInt.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumInt.java @@ -18,7 +18,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscribers.DeferredScalarSubscriber; +import io.reactivex.rxjava3.internal.subscribers.DeferredScalarSubscriber; final class FlowableSumInt extends FlowableSource { diff --git a/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumLong.java b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumLong.java index 9ce43595..9d651003 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumLong.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/FlowableSumLong.java @@ -18,7 +18,7 @@ import org.reactivestreams.*; -import io.reactivex.internal.subscribers.DeferredScalarSubscriber; +import io.reactivex.rxjava3.internal.subscribers.DeferredScalarSubscriber; final class FlowableSumLong extends FlowableSource { diff --git a/src/main/java/hu/akarnokd/rxjava3/math/MathFlowable.java b/src/main/java/hu/akarnokd/rxjava3/math/MathFlowable.java index 1b5780e3..650e13bc 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/MathFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/MathFlowable.java @@ -21,8 +21,8 @@ import org.reactivestreams.Publisher; import hu.akarnokd.rxjava3.util.SelfComparator; -import io.reactivex.Flowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Utility methods to work with numerical Flowable sources: sum, min, max and average. diff --git a/src/main/java/hu/akarnokd/rxjava3/math/MathObservable.java b/src/main/java/hu/akarnokd/rxjava3/math/MathObservable.java index c1662fcc..d4607214 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/MathObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/MathObservable.java @@ -19,8 +19,8 @@ import java.util.Comparator; import hu.akarnokd.rxjava3.util.SelfComparator; -import io.reactivex.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Utility methods to work with numerical Observable sources: sum, min, max and average. diff --git a/src/main/java/hu/akarnokd/rxjava3/math/ObservableAverageDouble.java b/src/main/java/hu/akarnokd/rxjava3/math/ObservableAverageDouble.java index dffe14af..676c191a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/ObservableAverageDouble.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/ObservableAverageDouble.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.math; -import io.reactivex.*; -import io.reactivex.internal.observers.DeferredScalarObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.observers.DeferredScalarObserver; public class ObservableAverageDouble extends ObservableWithSource { diff --git a/src/main/java/hu/akarnokd/rxjava3/math/ObservableAverageFloat.java b/src/main/java/hu/akarnokd/rxjava3/math/ObservableAverageFloat.java index e2dc99b7..2c8e6a13 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/ObservableAverageFloat.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/ObservableAverageFloat.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.math; -import io.reactivex.internal.observers.DeferredScalarObserver; -import io.reactivex.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.observers.DeferredScalarObserver; public class ObservableAverageFloat extends ObservableWithSource { diff --git a/src/main/java/hu/akarnokd/rxjava3/math/ObservableMinMax.java b/src/main/java/hu/akarnokd/rxjava3/math/ObservableMinMax.java index 333f6326..f02d91d8 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/ObservableMinMax.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/ObservableMinMax.java @@ -18,9 +18,9 @@ import java.util.Comparator; -import io.reactivex.internal.observers.DeferredScalarObserver; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.observers.DeferredScalarObserver; final class ObservableMinMax extends ObservableWithSource { diff --git a/src/main/java/hu/akarnokd/rxjava3/math/ObservableSource.java b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSource.java index 76cfcbaf..356fcb75 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/ObservableSource.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSource.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.math; -import io.reactivex.*; +import io.reactivex.rxjava3.core.*; abstract class ObservableWithSource extends Observable { diff --git a/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumDouble.java b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumDouble.java index c7407c88..408b1473 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumDouble.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumDouble.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.math; -import io.reactivex.internal.observers.DeferredScalarObserver; -import io.reactivex.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.observers.DeferredScalarObserver; public class ObservableSumDouble extends ObservableWithSource { diff --git a/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumFloat.java b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumFloat.java index 15226ccd..6f50cbe9 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumFloat.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumFloat.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.math; -import io.reactivex.internal.observers.DeferredScalarObserver; -import io.reactivex.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.observers.DeferredScalarObserver; public class ObservableSumFloat extends ObservableWithSource { diff --git a/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumInt.java b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumInt.java index 1c9776a6..2fd4a25a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumInt.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumInt.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.math; -import io.reactivex.internal.observers.DeferredScalarObserver; -import io.reactivex.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.observers.DeferredScalarObserver; final class ObservableSumInt extends ObservableWithSource { diff --git a/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumLong.java b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumLong.java index 64d09a91..60644d9f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumLong.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/ObservableSumLong.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.math; -import io.reactivex.internal.observers.DeferredScalarObserver; -import io.reactivex.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.observers.DeferredScalarObserver; public class ObservableSumLong extends ObservableWithSource { diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java b/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java index 5c3bde92..ac556f20 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java @@ -16,25 +16,18 @@ package hu.akarnokd.rxjava3.operators; -import java.util.Arrays; -import java.util.Comparator; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; - -import org.reactivestreams.Publisher; -import org.reactivestreams.Subscriber; -import org.reactivestreams.Subscription; - -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.fuseable.SimpleQueue; -import io.reactivex.internal.subscribers.InnerQueuedSubscriber; -import io.reactivex.internal.subscribers.InnerQueuedSubscriberSupport; -import io.reactivex.internal.subscriptions.EmptySubscription; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.plugins.RxJavaPlugins; +import java.util.*; +import java.util.concurrent.atomic.*; + +import org.reactivestreams.*; + +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.fuseable.SimpleQueue; +import io.reactivex.rxjava3.internal.subscribers.*; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.parallel.ParallelFlowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Subscription coordinator that merges items from a fixed set of source Publishers by diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletable.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletable.java index e87ade66..a930fb58 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletable.java @@ -18,12 +18,12 @@ 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 the terminal signals of the upstream into CompletableSources and consumes them. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowable.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowable.java index 58f85bc1..05ae5fa8 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowable.java @@ -20,13 +20,13 @@ import org.reactivestreams.*; -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.subscriptions.SubscriptionHelper; +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.subscriptions.SubscriptionHelper; /** * Maps the terminal signals of the upstream into ObservableSources and consumes them. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybe.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybe.java index 264dccf8..69fa953b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybe.java @@ -18,12 +18,12 @@ 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 the terminal signals of the upstream into MaybeSources and consumes them. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservable.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservable.java index dc849b28..d451512a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservable.java @@ -18,12 +18,12 @@ 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 the terminal signals of the upstream into ObservableSources and consumes them. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingle.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingle.java index c878c4f4..232edc37 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingle.java @@ -18,12 +18,12 @@ 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 the terminal signals of the upstream into SingleSources and consumes them. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableTransformers.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableTransformers.java index b8afb2b2..0fc0d2f0 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableTransformers.java @@ -16,9 +16,9 @@ package hu.akarnokd.rxjava3.operators; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Additional operators in the form of {@link CompletableTransformer}, diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/Completables.java b/src/main/java/hu/akarnokd/rxjava3/operators/Completables.java index d297f4a3..b33ba4bf 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/Completables.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/Completables.java @@ -18,9 +18,9 @@ import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Additional operators in the form of {@link CompletableConverter}s, diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableAsyncEmitter.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableAsyncEmitter.java index 65b76867..b03b4dd1 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableAsyncEmitter.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableAsyncEmitter.java @@ -16,9 +16,9 @@ package hu.akarnokd.rxjava3.operators; -import io.reactivex.Emitter; -import io.reactivex.annotations.Experimental; -import io.reactivex.functions.Cancellable; +import io.reactivex.rxjava3.annotations.Experimental; +import io.reactivex.rxjava3.core.Emitter; +import io.reactivex.rxjava3.functions.Cancellable; /** * Provides an API on top of the {@link Emitter} signals that allow diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicate.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicate.java index 3824aefd..7132b8b1 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicate.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicate.java @@ -20,13 +20,13 @@ 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.ConditionalSubscriber; -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.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Buffer into the same buffer while the predicate returns true or diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCacheLast.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCacheLast.java index 8f72f537..ed6ed97c 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCacheLast.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCacheLast.java @@ -20,8 +20,8 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.processors.AsyncProcessor; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.processors.AsyncProcessor; /** * Cache only the very last value and relay/replay it to Subscribers. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCoalesce.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCoalesce.java index 745151a3..23511ff5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCoalesce.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCoalesce.java @@ -20,13 +20,13 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.fuseable.SimplePlainQueue; -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.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +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.BackpressureHelper; /** * Coalesces items into a container if the downstream is not ready to receive items. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirst.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirst.java index 000f5a4a..927b42b8 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirst.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirst.java @@ -20,9 +20,9 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Debounce the upstream by taking an item and then blocking out subsequent diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableErrorJump.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableErrorJump.java index 0d2d6811..82eb1730 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableErrorJump.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableErrorJump.java @@ -20,10 +20,10 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Makes sure an upstream error skips the flow created with a diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableEvery.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableEvery.java index a36855c3..1e250dd5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableEvery.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableEvery.java @@ -18,9 +18,9 @@ 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; /** * Emits only every Nth item. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java index ff44a2bd..058757c4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java @@ -21,14 +21,14 @@ 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.SimplePlainQueue; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.*; +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.SimplePlainQueue; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.*; /** * Emit and recursively expand elements from upstream. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsync.java index bf46a093..e7d48f7d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsync.java @@ -22,12 +22,12 @@ import hu.akarnokd.rxjava3.operators.FlowableMapAsync.AsyncSupport; import hu.akarnokd.rxjava3.operators.FlowableMapAsync.MapAsyncSubscriber.InnerSubscriber; -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.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.*; /** * Maps each upstream value into a single {@code true} or {@code false} value provided by a generated Publisher for that diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java index 16bcdd1b..347fd8b6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java @@ -19,10 +19,10 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.operators.FlowableFlatMapSync.*; -import io.reactivex.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.fuseable.SimpleQueue; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.fuseable.SimpleQueue; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * FlatMap a bounded number of inner, non-trivial flows (unbound not supported). diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java index c10a1397..2be0d1ea 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java @@ -20,15 +20,15 @@ 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.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.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; /** * FlatMap a bounded number of inner, non-trivial flows (unbound not supported). diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsync.java index 7ba59436..ee540a7d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsync.java @@ -20,12 +20,12 @@ import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.subscriptions.EmptySubscription; -import io.reactivex.internal.util.*; -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.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Generates items by invoking a callback, for each downstream request one by one, that sets up an diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableIndexOf.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableIndexOf.java index 750ce5b7..bb1a88e4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableIndexOf.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableIndexOf.java @@ -18,10 +18,10 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.subscribers.DeferredScalarSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.subscribers.DeferredScalarSubscriber; /** * Returns the first index of an element that matches a predicate or -1L if no elements match. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableIntervalBackpressure.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableIntervalBackpressure.java index c07911b8..504305b5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableIntervalBackpressure.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableIntervalBackpressure.java @@ -21,10 +21,10 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.disposables.SequentialDisposable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; /** * Periodically try to emit an ever increasing long value (starting from 0L) diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapAsync.java index 6143b9e5..39a9b125 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapAsync.java @@ -20,13 +20,13 @@ 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; /** * Maps each upstream value into a single value provided by a generated Publisher for that diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapFilter.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapFilter.java index d995b6ae..a8075602 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapFilter.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapFilter.java @@ -18,12 +18,12 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.BiConsumer; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscribers.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.BiConsumer; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscribers.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Filters and/or maps source values via a callback and emitter. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeout.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeout.java index 42d11d17..e5ac4dc7 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeout.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeout.java @@ -22,13 +22,13 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -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.core.Scheduler.Worker; +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; /** * If the downstream doesn't request, it buffers events and times out diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMerge.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMerge.java index 66cad69d..a9e1ecc1 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMerge.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMerge.java @@ -16,16 +16,14 @@ package hu.akarnokd.rxjava3.operators; -import java.util.Arrays; -import java.util.Comparator; +import java.util.*; -import org.reactivestreams.Publisher; -import org.reactivestreams.Subscriber; +import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.exceptions.Exceptions; -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.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * Merges a fixed set of sources by picking the next smallest diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollect.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollect.java index 2722c495..3d9dbc87 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollect.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollect.java @@ -20,12 +20,12 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Consumer; -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.Consumer; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Allows converting upstream items into output objects where an upstream item diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatScalar.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatScalar.java index e7ecec8a..6fe0d520 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatScalar.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatScalar.java @@ -18,10 +18,10 @@ import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.BackpressureHelper; +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; /** * Repeats a scalar value indefinitely. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatSupplier.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatSupplier.java index 6827cbba..a31e0d2b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatSupplier.java @@ -18,13 +18,13 @@ 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.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.BackpressureHelper; +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.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; /** * Repeatedly calls a Supplier indefinitely. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOn.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOn.java index 5c327d04..cd0ed7a8 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOn.java @@ -20,9 +20,9 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; /** * Requests one-by-one and emits those items on the given {@link Scheduler}, allowing an diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSample.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSample.java index 68f4bcd0..abb36adc 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSample.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSample.java @@ -20,11 +20,11 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.MissingBackpressureException; -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.MissingBackpressureException; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Issues {@link Subscription#request(long)}(1) when the other source Publisher signals an onNext item. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTime.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTime.java index fa4cc838..d4ecc9e4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTime.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTime.java @@ -21,13 +21,13 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.disposables.DisposableHelper; -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.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; /** * Issues {@link Subscription#request(long)}(1) after the initial delay and then at each period. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSpanout.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSpanout.java index a5d3d207..bdd658b3 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSpanout.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSpanout.java @@ -20,11 +20,11 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Makes sure there is at least the given amount of time between emissions of the upstream elements. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMap.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMap.java index 12cfc15f..77c832c7 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMap.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMap.java @@ -21,15 +21,15 @@ 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.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.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +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; final class FlowableSwitchFlatMap extends Flowable implements FlowableTransformer { diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyMany.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyMany.java index 6a58621b..1560826d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyMany.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyMany.java @@ -21,10 +21,10 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; final class FlowableSwitchIfEmptyMany extends Flowable implements FlowableTransformer { diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArray.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArray.java index 0a88557f..416489d8 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArray.java @@ -20,9 +20,9 @@ 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; final class FlowableSwitchIfEmptyManyArray extends Flowable implements FlowableTransformer { diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirst.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirst.java index 914c64b7..bea00151 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirst.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirst.java @@ -20,11 +20,11 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.functions.*; -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.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Wait for the very first item and if it matches a predicate, switch to diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLast.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLast.java index c75688d6..fedf3a8f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLast.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLast.java @@ -21,12 +21,12 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.SequentialDisposable; -import io.reactivex.internal.subscriptions.*; -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.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.subscribers.SerializedSubscriber; /** * Emit the very last item if the source ends or the timeout diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTransformers.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTransformers.java index 124ac5be..2028d734 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTransformers.java @@ -17,16 +17,16 @@ package hu.akarnokd.rxjava3.operators; import java.util.*; -import java.util.concurrent.*; +import java.util.concurrent.TimeUnit; import org.reactivestreams.Publisher; import hu.akarnokd.rxjava3.util.BiFunctionSecondIdentity; -import io.reactivex.*; -import io.reactivex.annotations.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; -import io.reactivex.schedulers.Schedulers; +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.schedulers.Schedulers; /** * Additional operators in the form of {@link FlowableTransformer}, diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java index 33463b78..9d20001f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java @@ -20,12 +20,12 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -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.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Allows stopping and resuming the flow of the main source when a secondary flow diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicate.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicate.java index 574ab017..9625bc10 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicate.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicate.java @@ -20,13 +20,13 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.processors.UnicastProcessor; +import io.reactivex.rxjava3.core.*; +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.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.processors.UnicastProcessor; /** * Emit into the same window while the predicate returns true or diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableZipLatest.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableZipLatest.java index 8a14ebe4..59673a29 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableZipLatest.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableZipLatest.java @@ -21,14 +21,14 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -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.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +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.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Takes only the latest value from the sources in each zip round and applies a transformer function diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java b/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java index 08caad89..36797ceb 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java @@ -17,17 +17,17 @@ package hu.akarnokd.rxjava3.operators; import java.util.Comparator; -import java.util.concurrent.*; +import java.util.concurrent.TimeUnit; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.annotations.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; -import io.reactivex.internal.schedulers.ImmediateThinScheduler; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; +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.schedulers.ImmediateThinScheduler; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * Utility class to create Flowable sources. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletable.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletable.java index 60c2e50b..0ef06357 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletable.java @@ -18,12 +18,12 @@ 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 the signals of the upstream into CompletableSources and consumes them. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowable.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowable.java index 4cc3d1b4..a4d3b76a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowable.java @@ -20,13 +20,13 @@ import org.reactivestreams.*; -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.subscriptions.SubscriptionHelper; +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.subscriptions.SubscriptionHelper; /** * Maps the signals of the upstream into Publishers and consumes them. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybe.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybe.java index 8c52dea2..aa568cb9 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybe.java @@ -18,12 +18,12 @@ 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 the signals of the upstream into MaybeSources and consumes them. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservable.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservable.java index 885e1564..a42b09cc 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservable.java @@ -18,12 +18,12 @@ 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 the signals of the upstream into ObservableSources and consumes them. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingle.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingle.java index c32af7d1..2d209851 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingle.java @@ -18,12 +18,12 @@ 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 the signals of the upstream into SingleSources and consumes them. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeTransformers.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeTransformers.java index a91f9646..731075fb 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeTransformers.java @@ -16,9 +16,9 @@ package hu.akarnokd.rxjava3.operators; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Additional operators in the form of {@link MaybeTransformer}, diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/Maybes.java b/src/main/java/hu/akarnokd/rxjava3/operators/Maybes.java index 0922573d..ef66825b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/Maybes.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/Maybes.java @@ -18,9 +18,9 @@ import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Additional operators in the form of {@link MaybeConverter}s, diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableErrorJump.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableErrorJump.java index 56165963..9ac63874 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableErrorJump.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableErrorJump.java @@ -18,11 +18,11 @@ import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.internal.disposables.EmptyDisposable; -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.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Makes sure an upstream error skips the flow created with a diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java index f6a60c27..8ad3f9f0 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java @@ -18,15 +18,15 @@ 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.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.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Filters elements of the upstream by mapping each of them, one after the other, onto a diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDrop.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDrop.java index 2b26ef81..d769d0ee 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDrop.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDrop.java @@ -18,14 +18,14 @@ 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; /** * FlatMap only one {@link ObservableSource} at a time and ignore upstream values until it terminates. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatest.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatest.java index 4a5dfcc9..b06c68f8 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatest.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatest.java @@ -18,14 +18,14 @@ 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; /** * FlatMap only one {@link ObservableSource} at a time and keep the latest upstream value until it terminates diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableIndexOf.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableIndexOf.java index 11eb9c99..c2af6a08 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableIndexOf.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableIndexOf.java @@ -16,10 +16,10 @@ package hu.akarnokd.rxjava3.operators; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.observers.DeferredScalarObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.observers.DeferredScalarObserver; /** * Returns the first index of an element that matches a predicate or -1L if no elements match. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java index e702fd8a..2b6e16f9 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java @@ -18,15 +18,15 @@ 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.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.*; +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 each upstream element into the single result of an inner Observable while diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDrop.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDrop.java index d98d38ed..3bf78083 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDrop.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDrop.java @@ -18,10 +18,10 @@ import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +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; /** * Schedules the event emission on a Scheduler and drops upstream values while diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatest.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatest.java index 45c4624d..9c534112 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatest.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatest.java @@ -18,10 +18,10 @@ import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +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; /** * Schedules the event emission on a Scheduler and keeps the latest upstream item diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableTransformers.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableTransformers.java index c298b05f..51035188 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableTransformers.java @@ -17,10 +17,10 @@ package hu.akarnokd.rxjava3.operators; import hu.akarnokd.rxjava3.util.BiFunctionSecondIdentity; -import io.reactivex.*; -import io.reactivex.annotations.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Additional operators in the form of {@link ObservableTransformer}, diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java index 02e7d6e2..cca68eea 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java @@ -18,13 +18,13 @@ 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; /** * Allows stopping and resuming the flow of the main source when a secondary flow diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletable.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletable.java index a8545eec..e707d488 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletable.java @@ -18,12 +18,12 @@ 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 signals of the upstream into CompletableSources and consumes them. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowable.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowable.java index 20655d18..3130aeec 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowable.java @@ -20,13 +20,13 @@ 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 signals of the upstream into Publishers and consumes them. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybe.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybe.java index 9f66c57d..efcdd263 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybe.java @@ -18,12 +18,12 @@ 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 signals of the upstream into MaybeSources and consumes them. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservable.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservable.java index 01362410..6ef015c1 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservable.java @@ -18,12 +18,12 @@ 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 signals of the upstream into ObservableSources and consumes them. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingle.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingle.java index f869e061..2bdaf799 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingle.java @@ -18,12 +18,12 @@ 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 signals of the upstream into SingleSources and consumes them. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/SingleTransformers.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleTransformers.java index a8f11087..aa3e65a4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/SingleTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleTransformers.java @@ -16,9 +16,9 @@ package hu.akarnokd.rxjava3.operators; -import io.reactivex.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Additional operators in the form of {@link SingleTransformer}, diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/Singles.java b/src/main/java/hu/akarnokd/rxjava3/operators/Singles.java index 0e2f98ae..e1e9debf 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/Singles.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/Singles.java @@ -18,9 +18,9 @@ import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Additional operators in the form of {@link SingleConverter}s, diff --git a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMerge.java b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMerge.java index 2a24bc76..c7a26745 100644 --- a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMerge.java +++ b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMerge.java @@ -21,8 +21,8 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.operators.BasicMergeSubscription; -import io.reactivex.Flowable; -import io.reactivex.parallel.ParallelFlowable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.parallel.ParallelFlowable; /** * Merges the individual 'rails' of the source ParallelFlowable by picking diff --git a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumDouble.java b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumDouble.java index 400c852b..83e21f38 100644 --- a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumDouble.java +++ b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumDouble.java @@ -18,10 +18,9 @@ import org.reactivestreams.*; -import io.reactivex.FlowableSubscriber; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.parallel.ParallelTransformer; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.parallel.*; /** * Sums numbers as longs on each parallel rail, or empty if the rail doesn't produce any data. diff --git a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumInteger.java b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumInteger.java index 95901be9..5c780af6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumInteger.java +++ b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumInteger.java @@ -18,10 +18,9 @@ import org.reactivestreams.*; -import io.reactivex.FlowableSubscriber; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.parallel.ParallelTransformer; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.parallel.*; /** * Sums numbers as integers on each parallel rail, or empty if the rail doesn't produce any data. diff --git a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumLong.java b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumLong.java index 727a167b..084b5642 100644 --- a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumLong.java +++ b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelSumLong.java @@ -18,10 +18,9 @@ import org.reactivestreams.*; -import io.reactivex.FlowableSubscriber; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.parallel.ParallelTransformer; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.parallel.*; /** * Sums numbers as longs on each parallel rail, or empty if the rail doesn't produce any data. diff --git a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java index f2984618..8a1d6aa9 100644 --- a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java @@ -18,12 +18,10 @@ import java.util.Comparator; -import io.reactivex.Flowable; -import io.reactivex.internal.functions.Functions; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.parallel.ParallelTransformer; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.parallel.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Transformers for RxJava 2 ParallelFlowable sequences. diff --git a/src/main/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessor.java b/src/main/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessor.java index eb56c537..86cf194b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessor.java +++ b/src/main/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessor.java @@ -21,15 +21,15 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.util.SpmcLinkedArrayQueue; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.processors.FlowableProcessor; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.processors.FlowableProcessor; /** * A {@link FlowableProcessor} variant that queues up items and dispatches them asynchronously diff --git a/src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessorWrap.java b/src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessorWrap.java index f8145bbe..ba4718f4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessorWrap.java +++ b/src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessorWrap.java @@ -16,12 +16,12 @@ package hu.akarnokd.rxjava3.processors; -import java.util.concurrent.atomic.*; +import java.util.concurrent.atomic.AtomicBoolean; import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.processors.FlowableProcessor; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.processors.FlowableProcessor; final class FlowableProcessorWrap extends FlowableProcessor { diff --git a/src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessors.java b/src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessors.java index 107b858e..c36a79e7 100644 --- a/src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessors.java +++ b/src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessors.java @@ -18,9 +18,9 @@ import org.reactivestreams.Processor; -import io.reactivex.annotations.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.processors.*; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.processors.FlowableProcessor; /** * Utility methods to work with Reactive-Streams Processors and RxJava 2 FlowableProcessors. @@ -51,7 +51,7 @@ public static FlowableProcessor wrap(Processor processor) { * Wraps a FlowableProcessor and makes sure if all subscribers cancel * their subscriptions, the upstream's Subscription gets cancelled as well. *

- * This operator is similar to {@link io.reactivex.flowables.ConnectableFlowable#refCount()} + * This operator is similar to {@link io.reactivex.rxjava3.flowables.ConnectableFlowable#refCount()} * except the first Subscriber doesn't trigger any sort of connection; that happens * when the resulting FlowableProcessor is subscribed to a Publisher manually. * @param the input and output value type diff --git a/src/main/java/hu/akarnokd/rxjava3/processors/RefCountProcessor.java b/src/main/java/hu/akarnokd/rxjava3/processors/RefCountProcessor.java index 2d58ecf8..e4020f6b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/processors/RefCountProcessor.java +++ b/src/main/java/hu/akarnokd/rxjava3/processors/RefCountProcessor.java @@ -17,9 +17,9 @@ 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/main/java/hu/akarnokd/rxjava3/schedulers/BlockingScheduler.java b/src/main/java/hu/akarnokd/rxjava3/schedulers/BlockingScheduler.java index ce939ca6..b9989e32 100644 --- a/src/main/java/hu/akarnokd/rxjava3/schedulers/BlockingScheduler.java +++ b/src/main/java/hu/akarnokd/rxjava3/schedulers/BlockingScheduler.java @@ -20,13 +20,13 @@ import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; -import io.reactivex.Scheduler; -import io.reactivex.disposables.*; -import io.reactivex.functions.Action; -import io.reactivex.internal.disposables.SequentialDisposable; -import io.reactivex.internal.functions.*; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * A Scheduler that uses the current thread, in an event-loop and diff --git a/src/main/java/hu/akarnokd/rxjava3/schedulers/ParallelScheduler.java b/src/main/java/hu/akarnokd/rxjava3/schedulers/ParallelScheduler.java index a3a316d3..98433444 100644 --- a/src/main/java/hu/akarnokd/rxjava3/schedulers/ParallelScheduler.java +++ b/src/main/java/hu/akarnokd/rxjava3/schedulers/ParallelScheduler.java @@ -19,13 +19,13 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.Scheduler; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.Functions; -import io.reactivex.internal.schedulers.RxThreadFactory; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.disposables.DisposableContainer; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.internal.schedulers.RxThreadFactory; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Scheduler with a configurable fixed amount of thread-pools. diff --git a/src/main/java/hu/akarnokd/rxjava3/schedulers/SharedScheduler.java b/src/main/java/hu/akarnokd/rxjava3/schedulers/SharedScheduler.java index af0c7609..b48851e7 100644 --- a/src/main/java/hu/akarnokd/rxjava3/schedulers/SharedScheduler.java +++ b/src/main/java/hu/akarnokd/rxjava3/schedulers/SharedScheduler.java @@ -19,9 +19,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.Scheduler; -import io.reactivex.disposables.*; -import io.reactivex.internal.disposables.*; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.internal.disposables.*; /** * A Scheduler implementation that uses one of the Workers from another Scheduler diff --git a/src/main/java/hu/akarnokd/rxjava3/string/FlowableCharSequence.java b/src/main/java/hu/akarnokd/rxjava3/string/FlowableCharSequence.java index df01b056..bf1b3273 100644 --- a/src/main/java/hu/akarnokd/rxjava3/string/FlowableCharSequence.java +++ b/src/main/java/hu/akarnokd/rxjava3/string/FlowableCharSequence.java @@ -18,10 +18,10 @@ import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.internal.fuseable.QueueFuseable; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.fuseable.QueueFuseable; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; /** * Streams the characters of a string. diff --git a/src/main/java/hu/akarnokd/rxjava3/string/FlowableSplit.java b/src/main/java/hu/akarnokd/rxjava3/string/FlowableSplit.java index c5f1eaa9..3aae4bf7 100644 --- a/src/main/java/hu/akarnokd/rxjava3/string/FlowableSplit.java +++ b/src/main/java/hu/akarnokd/rxjava3/string/FlowableSplit.java @@ -21,13 +21,13 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.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.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.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.plugins.RxJavaPlugins; /** * Consider a sequence of CharSequence as one and split it based on diff --git a/src/main/java/hu/akarnokd/rxjava3/string/ObservableCharSequence.java b/src/main/java/hu/akarnokd/rxjava3/string/ObservableCharSequence.java index ffeb1206..e27ac409 100644 --- a/src/main/java/hu/akarnokd/rxjava3/string/ObservableCharSequence.java +++ b/src/main/java/hu/akarnokd/rxjava3/string/ObservableCharSequence.java @@ -18,8 +18,8 @@ import java.util.concurrent.atomic.AtomicBoolean; -import io.reactivex.*; -import io.reactivex.disposables.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; final class ObservableCharSequence extends Observable { diff --git a/src/main/java/hu/akarnokd/rxjava3/string/StringFlowable.java b/src/main/java/hu/akarnokd/rxjava3/string/StringFlowable.java index 82d22074..8da50728 100644 --- a/src/main/java/hu/akarnokd/rxjava3/string/StringFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/string/StringFlowable.java @@ -18,9 +18,9 @@ import java.util.regex.Pattern; -import io.reactivex.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Utility class for String operations with {@link Flowable}s. diff --git a/src/main/java/hu/akarnokd/rxjava3/string/StringObservable.java b/src/main/java/hu/akarnokd/rxjava3/string/StringObservable.java index aa353e84..a7bd75ae 100644 --- a/src/main/java/hu/akarnokd/rxjava3/string/StringObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/string/StringObservable.java @@ -16,8 +16,8 @@ package hu.akarnokd.rxjava3.string; -import io.reactivex.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Utility class for String operations with {@link Observable}s. diff --git a/src/main/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubject.java b/src/main/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubject.java index 9b611b4a..75caf584 100644 --- a/src/main/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubject.java +++ b/src/main/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubject.java @@ -19,15 +19,15 @@ import java.util.concurrent.atomic.*; import hu.akarnokd.rxjava3.util.SpmcLinkedArrayQueue; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.util.ExceptionHelper; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subjects.Subject; +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.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.util.ExceptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.subjects.Subject; /** * A {@link Subject} variant that queues up items and dispatches them asynchronously diff --git a/src/main/java/hu/akarnokd/rxjava3/subjects/RefCountSubject.java b/src/main/java/hu/akarnokd/rxjava3/subjects/RefCountSubject.java index f3c2b7c8..9f735e84 100644 --- a/src/main/java/hu/akarnokd/rxjava3/subjects/RefCountSubject.java +++ b/src/main/java/hu/akarnokd/rxjava3/subjects/RefCountSubject.java @@ -15,10 +15,10 @@ import java.util.concurrent.atomic.*; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.*; -import io.reactivex.subjects.Subject; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.subjects.Subject; /** * A Subject wrapper that disposes the Disposable set via diff --git a/src/main/java/hu/akarnokd/rxjava3/subjects/Subjects.java b/src/main/java/hu/akarnokd/rxjava3/subjects/Subjects.java index c2da06b2..f823b2b6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/subjects/Subjects.java +++ b/src/main/java/hu/akarnokd/rxjava3/subjects/Subjects.java @@ -16,9 +16,9 @@ package hu.akarnokd.rxjava3.subjects; -import io.reactivex.annotations.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.subjects.Subject; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.subjects.Subject; /** * Utility methods to work with RxJava 2 Subjects. diff --git a/src/main/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubject.java b/src/main/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubject.java index c6453372..5d4be951 100644 --- a/src/main/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubject.java +++ b/src/main/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubject.java @@ -18,15 +18,15 @@ import java.util.concurrent.atomic.*; -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.SimplePlainQueue; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.ExceptionHelper; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subjects.Subject; +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.SimplePlainQueue; +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.Subject; /** * A {@link Subject} that holds an unbounded queue of items and relays/replays it to diff --git a/src/main/java/hu/akarnokd/rxjava3/util/AlwaysFalseBooleanSupplier.java b/src/main/java/hu/akarnokd/rxjava3/util/AlwaysFalseBooleanSupplier.java index 5d519879..fce00faa 100644 --- a/src/main/java/hu/akarnokd/rxjava3/util/AlwaysFalseBooleanSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/AlwaysFalseBooleanSupplier.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.util; -import io.reactivex.functions.BooleanSupplier; +import io.reactivex.rxjava3.functions.BooleanSupplier; /** * A {@link BooleanSupplier} implementation that is always false. diff --git a/src/main/java/hu/akarnokd/rxjava3/util/AlwaysTrueBooleanSupplier.java b/src/main/java/hu/akarnokd/rxjava3/util/AlwaysTrueBooleanSupplier.java index 3440a83b..4651e847 100644 --- a/src/main/java/hu/akarnokd/rxjava3/util/AlwaysTrueBooleanSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/AlwaysTrueBooleanSupplier.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.util; -import io.reactivex.functions.BooleanSupplier; +import io.reactivex.rxjava3.functions.BooleanSupplier; /** * A {@link BooleanSupplier} implementation that is always true. diff --git a/src/main/java/hu/akarnokd/rxjava3/util/BiFunctionSecondIdentity.java b/src/main/java/hu/akarnokd/rxjava3/util/BiFunctionSecondIdentity.java index 1e5b9f6e..fc2d2610 100644 --- a/src/main/java/hu/akarnokd/rxjava3/util/BiFunctionSecondIdentity.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/BiFunctionSecondIdentity.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.util; -import io.reactivex.functions.BiFunction; +import io.reactivex.rxjava3.functions.BiFunction; /** * A BiFunction that returns its second parameter; use {@link #instance()} to diff --git a/src/main/java/hu/akarnokd/rxjava3/util/CompositeSubscription.java b/src/main/java/hu/akarnokd/rxjava3/util/CompositeSubscription.java index ab547b1f..70a8cecb 100644 --- a/src/main/java/hu/akarnokd/rxjava3/util/CompositeSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/CompositeSubscription.java @@ -18,7 +18,7 @@ import org.reactivestreams.Subscription; -import io.reactivex.internal.util.OpenHashSet; +import io.reactivex.rxjava3.internal.util.OpenHashSet; /** * Container for Subscriptions and atomic operations on them. diff --git a/src/main/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueue.java b/src/main/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueue.java index 7b6c92bc..d609aca4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueue.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueue.java @@ -18,8 +18,8 @@ import java.util.concurrent.atomic.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; /** * A single-producer multiple-conumer queue implementation with array islands. diff --git a/src/main/java/hu/akarnokd/rxjava3/util/SpscOneQueue.java b/src/main/java/hu/akarnokd/rxjava3/util/SpscOneQueue.java index 0e89883e..2434719b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/util/SpscOneQueue.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/SpscOneQueue.java @@ -18,8 +18,8 @@ import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; /** * A single-producer single-consumer queue with exactly one slot of value. diff --git a/src/test/java/hu/akarnokd/rxjava3/async/AsyncFlowableTest.java b/src/test/java/hu/akarnokd/rxjava3/async/AsyncFlowableTest.java index 92f84d9a..8fb4a598 100644 --- a/src/test/java/hu/akarnokd/rxjava3/async/AsyncFlowableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/async/AsyncFlowableTest.java @@ -27,12 +27,12 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.functions.*; -import io.reactivex.Flowable; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.Functions; -import io.reactivex.processors.UnicastProcessor; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.processors.UnicastProcessor; +import io.reactivex.rxjava3.schedulers.Schedulers; public class AsyncFlowableTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/async/AsyncObservableTest.java b/src/test/java/hu/akarnokd/rxjava3/async/AsyncObservableTest.java index 3a1b2cdd..ab6ec9b2 100644 --- a/src/test/java/hu/akarnokd/rxjava3/async/AsyncObservableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/async/AsyncObservableTest.java @@ -27,13 +27,13 @@ import hu.akarnokd.rxjava3.async.AsyncFlowableTest.MultiFunction; import hu.akarnokd.rxjava3.functions.*; -import io.reactivex.Observable; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.Functions; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subjects.UnicastSubject; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.schedulers.Schedulers; +import io.reactivex.rxjava3.subjects.UnicastSubject; public class AsyncObservableTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoProcessorTest.java b/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoProcessorTest.java index 1269ed77..b8aab940 100644 --- a/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoProcessorTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoProcessorTest.java @@ -25,10 +25,10 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.internal.subscriptions.BooleanSubscription; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class NonoProcessorTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoTest.java b/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoTest.java index 3f59aeca..f5c8acce 100644 --- a/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoTest.java @@ -26,18 +26,18 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.*; -import io.reactivex.Observable; -import io.reactivex.exceptions.CompositeException; -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.internal.util.ExceptionHelper; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.processors.PublishProcessor; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.exceptions.CompositeException; +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.internal.util.ExceptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.processors.PublishProcessor; +import io.reactivex.rxjava3.schedulers.Schedulers; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class NonoTest implements Action, Consumer, LongConsumer, Cancellable { diff --git a/src/test/java/hu/akarnokd/rxjava3/basetypes/PerhapsTest.java b/src/test/java/hu/akarnokd/rxjava3/basetypes/PerhapsTest.java index 2bd87b64..acd75905 100644 --- a/src/test/java/hu/akarnokd/rxjava3/basetypes/PerhapsTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/basetypes/PerhapsTest.java @@ -26,15 +26,15 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.Functions; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.processors.PublishProcessor; -import io.reactivex.schedulers.*; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.CompositeException; +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.*; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class PerhapsTest implements Consumer, Action, LongConsumer, Cancellable { diff --git a/src/test/java/hu/akarnokd/rxjava3/basetypes/SoloTest.java b/src/test/java/hu/akarnokd/rxjava3/basetypes/SoloTest.java index 9a3847d8..8209e401 100644 --- a/src/test/java/hu/akarnokd/rxjava3/basetypes/SoloTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/basetypes/SoloTest.java @@ -26,15 +26,15 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.Functions; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.processors.PublishProcessor; -import io.reactivex.schedulers.*; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.CompositeException; +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.*; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class SoloTest implements Consumer, Action, LongConsumer, Cancellable { diff --git a/src/test/java/hu/akarnokd/rxjava3/consumers/CompletableConsumersTest.java b/src/test/java/hu/akarnokd/rxjava3/consumers/CompletableConsumersTest.java index b4753c4f..5d2e5530 100644 --- a/src/test/java/hu/akarnokd/rxjava3/consumers/CompletableConsumersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/consumers/CompletableConsumersTest.java @@ -24,13 +24,13 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.functions.*; -import io.reactivex.observers.LambdaConsumerIntrospection; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subjects.CompletableSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.CompositeException; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.subjects.CompletableSubject; public class CompletableConsumersTest implements Consumer, Action { diff --git a/src/test/java/hu/akarnokd/rxjava3/consumers/FlowableConsumersTest.java b/src/test/java/hu/akarnokd/rxjava3/consumers/FlowableConsumersTest.java index 68050794..0da94456 100644 --- a/src/test/java/hu/akarnokd/rxjava3/consumers/FlowableConsumersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/consumers/FlowableConsumersTest.java @@ -25,14 +25,14 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.Flowable; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.subscriptions.BooleanSubscription; -import io.reactivex.observers.LambdaConsumerIntrospection; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.processors.PublishProcessor; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription; +import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.processors.PublishProcessor; public class FlowableConsumersTest implements Consumer, Action { diff --git a/src/test/java/hu/akarnokd/rxjava3/consumers/MaybeConsumersTest.java b/src/test/java/hu/akarnokd/rxjava3/consumers/MaybeConsumersTest.java index 6b62bd34..0e2db7d5 100644 --- a/src/test/java/hu/akarnokd/rxjava3/consumers/MaybeConsumersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/consumers/MaybeConsumersTest.java @@ -24,13 +24,13 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.functions.*; -import io.reactivex.observers.LambdaConsumerIntrospection; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subjects.MaybeSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.CompositeException; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.subjects.MaybeSubject; public class MaybeConsumersTest implements Consumer, Action { diff --git a/src/test/java/hu/akarnokd/rxjava3/consumers/ObservableConsumersTest.java b/src/test/java/hu/akarnokd/rxjava3/consumers/ObservableConsumersTest.java index 04e774de..6d65b5d5 100644 --- a/src/test/java/hu/akarnokd/rxjava3/consumers/ObservableConsumersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/consumers/ObservableConsumersTest.java @@ -24,14 +24,14 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.Observable; -import io.reactivex.Observer; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.observers.LambdaConsumerIntrospection; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subjects.PublishSubject; +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.observers.LambdaConsumerIntrospection; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.subjects.PublishSubject; public class ObservableConsumersTest implements Consumer, Action { diff --git a/src/test/java/hu/akarnokd/rxjava3/consumers/SingleConsumersTest.java b/src/test/java/hu/akarnokd/rxjava3/consumers/SingleConsumersTest.java index 49689066..5b249b87 100644 --- a/src/test/java/hu/akarnokd/rxjava3/consumers/SingleConsumersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/consumers/SingleConsumersTest.java @@ -24,13 +24,13 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.functions.*; -import io.reactivex.observers.LambdaConsumerIntrospection; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subjects.SingleSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.CompositeException; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.subjects.SingleSubject; public class SingleConsumersTest implements Consumer { diff --git a/src/test/java/hu/akarnokd/rxjava3/debug/RxJava3AssemblyTrackingTest.java b/src/test/java/hu/akarnokd/rxjava3/debug/RxJava3AssemblyTrackingTest.java index 8d051e5d..1a4b9c44 100644 --- a/src/test/java/hu/akarnokd/rxjava3/debug/RxJava3AssemblyTrackingTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/debug/RxJava3AssemblyTrackingTest.java @@ -24,14 +24,14 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Action; -import io.reactivex.observers.TestObserver; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.processors.PublishProcessor; -import io.reactivex.subjects.PublishSubject; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.observers.TestObserver; +import io.reactivex.rxjava3.parallel.ParallelFlowable; +import io.reactivex.rxjava3.processors.PublishProcessor; +import io.reactivex.rxjava3.subjects.PublishSubject; +import io.reactivex.rxjava3.subscribers.TestSubscriber; /** * Named as such to avoid being filtered out in stacktraces of this test. diff --git a/src/test/java/hu/akarnokd/rxjava3/debug/multihook/OnScheduleMultiHandlerManagerTest.java b/src/test/java/hu/akarnokd/rxjava3/debug/multihook/OnScheduleMultiHandlerManagerTest.java index 31fe0400..026012e7 100644 --- a/src/test/java/hu/akarnokd/rxjava3/debug/multihook/OnScheduleMultiHandlerManagerTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/debug/multihook/OnScheduleMultiHandlerManagerTest.java @@ -24,11 +24,11 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.Functions; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; public class OnScheduleMultiHandlerManagerTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidatorTest.java b/src/test/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidatorTest.java index 9eaa4d61..0e85c5c6 100644 --- a/src/test/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidatorTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidatorTest.java @@ -25,16 +25,16 @@ import hu.akarnokd.rxjava3.debug.*; import hu.akarnokd.rxjava3.functions.PlainConsumer; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.flowables.ConnectableFlowable; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.subscriptions.BooleanSubscription; -import io.reactivex.observables.ConnectableObservable; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subjects.*; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.flowables.ConnectableFlowable; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription; +import io.reactivex.rxjava3.observables.ConnectableObservable; +import io.reactivex.rxjava3.parallel.ParallelFlowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.subjects.*; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class RxJavaProtocolValidatorTest implements PlainConsumer { diff --git a/src/test/java/hu/akarnokd/rxjava3/expr/StatementCompletableTest.java b/src/test/java/hu/akarnokd/rxjava3/expr/StatementCompletableTest.java index 1d592ea3..dc22d9a8 100644 --- a/src/test/java/hu/akarnokd/rxjava3/expr/StatementCompletableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/expr/StatementCompletableTest.java @@ -21,9 +21,9 @@ import org.junit.*; import org.mockito.MockitoAnnotations; -import io.reactivex.Completable; -import io.reactivex.functions.*; -import io.reactivex.schedulers.TestScheduler; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.schedulers.TestScheduler; @SuppressWarnings("rawtypes") public class StatementCompletableTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/expr/StatementFlowableTest.java b/src/test/java/hu/akarnokd/rxjava3/expr/StatementFlowableTest.java index 2f3db822..be120f6d 100644 --- a/src/test/java/hu/akarnokd/rxjava3/expr/StatementFlowableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/expr/StatementFlowableTest.java @@ -21,9 +21,9 @@ import org.junit.*; import org.mockito.MockitoAnnotations; -import io.reactivex.Flowable; -import io.reactivex.functions.*; -import io.reactivex.schedulers.*; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.schedulers.*; public class StatementFlowableTest { TestScheduler scheduler; diff --git a/src/test/java/hu/akarnokd/rxjava3/expr/StatementMaybeTest.java b/src/test/java/hu/akarnokd/rxjava3/expr/StatementMaybeTest.java index a3153866..5523f5b6 100644 --- a/src/test/java/hu/akarnokd/rxjava3/expr/StatementMaybeTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/expr/StatementMaybeTest.java @@ -21,9 +21,9 @@ import org.junit.*; import org.mockito.MockitoAnnotations; -import io.reactivex.Maybe; -import io.reactivex.functions.*; -import io.reactivex.schedulers.TestScheduler; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.schedulers.TestScheduler; public class StatementMaybeTest { TestScheduler scheduler; diff --git a/src/test/java/hu/akarnokd/rxjava3/expr/StatementObservableTest.java b/src/test/java/hu/akarnokd/rxjava3/expr/StatementObservableTest.java index 5c643556..a0037ba0 100644 --- a/src/test/java/hu/akarnokd/rxjava3/expr/StatementObservableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/expr/StatementObservableTest.java @@ -21,9 +21,9 @@ import org.junit.*; import org.mockito.MockitoAnnotations; -import io.reactivex.Observable; -import io.reactivex.functions.*; -import io.reactivex.schedulers.*; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.schedulers.*; public class StatementObservableTest { TestScheduler scheduler; diff --git a/src/test/java/hu/akarnokd/rxjava3/expr/StatementSingleTest.java b/src/test/java/hu/akarnokd/rxjava3/expr/StatementSingleTest.java index f6f20775..be36bce1 100644 --- a/src/test/java/hu/akarnokd/rxjava3/expr/StatementSingleTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/expr/StatementSingleTest.java @@ -21,9 +21,9 @@ import org.junit.*; import org.mockito.MockitoAnnotations; -import io.reactivex.Single; -import io.reactivex.functions.*; -import io.reactivex.schedulers.TestScheduler; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.schedulers.TestScheduler; public class StatementSingleTest { TestScheduler scheduler; diff --git a/src/test/java/hu/akarnokd/rxjava3/functions/FunctionTaggingTest.java b/src/test/java/hu/akarnokd/rxjava3/functions/FunctionTaggingTest.java index 63db46ae..a0ecb7e7 100644 --- a/src/test/java/hu/akarnokd/rxjava3/functions/FunctionTaggingTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/functions/FunctionTaggingTest.java @@ -25,9 +25,9 @@ import hu.akarnokd.rxjava3.functions.FunctionTagging.FunctionTaggingException; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.Functions; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public class FunctionTaggingTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/joins/OperatorJoinsTest.java b/src/test/java/hu/akarnokd/rxjava3/joins/OperatorJoinsTest.java index 01314df3..e430ee23 100644 --- a/src/test/java/hu/akarnokd/rxjava3/joins/OperatorJoinsTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/joins/OperatorJoinsTest.java @@ -26,11 +26,11 @@ import org.mockito.*; import hu.akarnokd.rxjava3.test.TestException; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.Functions; -import io.reactivex.observers.TestObserver; -import io.reactivex.subjects.PublishSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.observers.TestObserver; +import io.reactivex.rxjava3.subjects.PublishSubject; public class OperatorJoinsTest { @Mock diff --git a/src/test/java/hu/akarnokd/rxjava3/math/MathFlowableTest.java b/src/test/java/hu/akarnokd/rxjava3/math/MathFlowableTest.java index 063edcce..315ee687 100644 --- a/src/test/java/hu/akarnokd/rxjava3/math/MathFlowableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/math/MathFlowableTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.BaseTest; -import io.reactivex.Flowable; +import io.reactivex.rxjava3.core.Flowable; public class MathFlowableTest extends BaseTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/math/MathObservableTest.java b/src/test/java/hu/akarnokd/rxjava3/math/MathObservableTest.java index 4938015d..38b7217e 100644 --- a/src/test/java/hu/akarnokd/rxjava3/math/MathObservableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/math/MathObservableTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.BaseTest; -import io.reactivex.Observable; +import io.reactivex.rxjava3.core.Observable; public class MathObservableTest extends BaseTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletableTest.java index ad5b548d..a3d1b0b2 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletableTest.java @@ -21,9 +21,9 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.subjects.CompletableSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.subjects.CompletableSubject; public class CompletableFlatMapSignalCompletableTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowableTest.java index 9d549d3b..b8f29562 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowableTest.java @@ -21,10 +21,10 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.subjects.CompletableSubject; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.subjects.CompletableSubject; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class CompletableFlatMapSignalFlowableTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybeTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybeTest.java index 5ff3721c..b331aecf 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybeTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybeTest.java @@ -21,9 +21,9 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.subjects.CompletableSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.subjects.CompletableSubject; public class CompletableFlatMapSignalMaybeTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservableTest.java index f0c33092..8a6e8834 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservableTest.java @@ -21,9 +21,9 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.subjects.CompletableSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.subjects.CompletableSubject; public class CompletableFlatMapSignalObservableTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingleTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingleTest.java index 398044f3..50153e5b 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingleTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingleTest.java @@ -21,9 +21,9 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.subjects.CompletableSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.subjects.CompletableSubject; public class CompletableFlatMapSignalSingleTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java index a3948a7f..8832f487 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java @@ -23,10 +23,10 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.Flowable; -import io.reactivex.functions.*; -import io.reactivex.internal.subscriptions.BooleanSubscription; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public class FlowableBufferPredicateTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableCacheLastTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableCacheLastTest.java index 4fb36d18..2c1f4ab6 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableCacheLastTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableCacheLastTest.java @@ -24,9 +24,9 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.Flowable; -import io.reactivex.functions.Consumer; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.schedulers.Schedulers; public class FlowableCacheLastTest implements Consumer { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableCoalesceTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableCoalesceTest.java index 65b1d989..19008b78 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableCoalesceTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableCoalesceTest.java @@ -22,12 +22,12 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.Flowable; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.Functions; -import io.reactivex.processors.PublishProcessor; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.processors.PublishProcessor; +import io.reactivex.rxjava3.schedulers.Schedulers; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class FlowableCoalesceTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirstTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirstTest.java index 92bfe409..fafdd837 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirstTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirstTest.java @@ -22,9 +22,9 @@ import org.junit.Test; import org.reactivestreams.Publisher; -import io.reactivex.Flowable; -import io.reactivex.functions.Function; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.schedulers.Schedulers; public class FlowableDebounceFirstTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableErrorJumpTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableErrorJumpTest.java index e853efe0..dafb6aca 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableErrorJumpTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableErrorJumpTest.java @@ -22,9 +22,9 @@ import org.reactivestreams.Publisher; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.CompositeException; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class FlowableErrorJumpTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableEveryTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableEveryTest.java index cd1b06f9..d1f3f055 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableEveryTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableEveryTest.java @@ -20,7 +20,7 @@ import org.junit.Test; -import io.reactivex.Flowable; +import io.reactivex.rxjava3.core.Flowable; public class FlowableEveryTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableExpandTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableExpandTest.java index 632ee581..6ae2e481 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableExpandTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableExpandTest.java @@ -25,12 +25,12 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.Functions; -import io.reactivex.processors.PublishProcessor; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.processors.PublishProcessor; +import io.reactivex.rxjava3.schedulers.Schedulers; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class FlowableExpandTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsyncTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsyncTest.java index 5591f293..7bd16561 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsyncTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsyncTest.java @@ -25,13 +25,13 @@ import hu.akarnokd.rxjava3.basetypes.Solo; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.Flowable; -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.rxjava3.core.Flowable; +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; public class FlowableFilterAsyncTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsyncTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsyncTest.java index 29378ee1..1dbe83ab 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsyncTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsyncTest.java @@ -21,9 +21,9 @@ import org.junit.Test; import org.reactivestreams.Publisher; -import io.reactivex.Flowable; -import io.reactivex.functions.Function; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.schedulers.Schedulers; public class FlowableFlatMapAsyncTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSyncTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSyncTest.java index dc04ebe8..ce0652ae 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSyncTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSyncTest.java @@ -21,9 +21,9 @@ import org.junit.Test; import org.reactivestreams.Publisher; -import io.reactivex.Flowable; -import io.reactivex.functions.Function; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.schedulers.Schedulers; public class FlowableFlatMapSyncTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsyncTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsyncTest.java index acf5fddd..0500f62c 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsyncTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsyncTest.java @@ -19,19 +19,19 @@ import static org.junit.Assert.*; import java.util.List; -import java.util.concurrent.*; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; import org.junit.Test; import hu.akarnokd.rxjava3.operators.FlowableGenerateAsync.AtomicCancellable; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.*; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class FlowableGenerateAsyncTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableIndexOfTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableIndexOfTest.java index 2836d29e..69f237f7 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableIndexOfTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableIndexOfTest.java @@ -21,9 +21,9 @@ import org.junit.Test; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.subscriptions.BooleanSubscription; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription; public class FlowableIndexOfTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableIntervalBackpressureTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableIntervalBackpressureTest.java index 134efd1f..8caaa456 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableIntervalBackpressureTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableIntervalBackpressureTest.java @@ -20,8 +20,8 @@ import org.junit.Test; -import io.reactivex.schedulers.*; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.schedulers.*; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class FlowableIntervalBackpressureTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapAsyncTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapAsyncTest.java index ef099ff9..a5626118 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapAsyncTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapAsyncTest.java @@ -23,15 +23,15 @@ import org.junit.*; import org.reactivestreams.*; -import hu.akarnokd.rxjava3.basetypes.*; +import hu.akarnokd.rxjava3.basetypes.Perhaps; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.Flowable; -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.rxjava3.core.Flowable; +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; public class FlowableMapAsyncTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapFilterConditionalTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapFilterConditionalTest.java index 96a64f65..6d0c4fd0 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapFilterConditionalTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapFilterConditionalTest.java @@ -22,11 +22,11 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.Flowable; -import io.reactivex.functions.BiConsumer; -import io.reactivex.internal.functions.Functions; -import io.reactivex.internal.fuseable.QueueFuseable; -import io.reactivex.processors.*; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.BiConsumer; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.internal.fuseable.QueueFuseable; +import io.reactivex.rxjava3.processors.*; public class FlowableMapFilterConditionalTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapFilterTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapFilterTest.java index f784ab18..bd021269 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapFilterTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableMapFilterTest.java @@ -22,10 +22,10 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.Flowable; -import io.reactivex.functions.BiConsumer; -import io.reactivex.internal.fuseable.QueueFuseable; -import io.reactivex.processors.*; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.BiConsumer; +import io.reactivex.rxjava3.internal.fuseable.QueueFuseable; +import io.reactivex.rxjava3.processors.*; public class FlowableMapFilterTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeoutTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeoutTest.java index d77ddb35..08957b94 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeoutTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeoutTest.java @@ -23,12 +23,12 @@ import org.junit.*; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.Flowable; -import io.reactivex.functions.Consumer; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.processors.PublishProcessor; -import io.reactivex.schedulers.*; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.processors.PublishProcessor; +import io.reactivex.rxjava3.schedulers.*; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class FlowableOnBackpressureTimeoutTest implements Consumer { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMergeTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMergeTest.java index d955850d..520673a3 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMergeTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMergeTest.java @@ -21,13 +21,13 @@ import org.junit.Test; -import hu.akarnokd.rxjava3.test.*; -import io.reactivex.Flowable; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.Functions; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subscribers.TestSubscriber; +import hu.akarnokd.rxjava3.test.TestHelper; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.CompositeException; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class FlowableOrderedMergeTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollectTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollectTest.java index 055edb01..8ce2f279 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollectTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollectTest.java @@ -25,15 +25,15 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.Flowable; -import io.reactivex.exceptions.MissingBackpressureException; -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.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +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; public class FlowablePartialCollectTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRepeatCallableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRepeatCallableTest.java index 74a64a3a..ed9b4f58 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRepeatCallableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRepeatCallableTest.java @@ -20,10 +20,10 @@ import org.junit.Test; -import io.reactivex.Flowable; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.functions.Functions; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class FlowableRepeatCallableTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOnTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOnTest.java index b855df2d..0eeb8872 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOnTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOnTest.java @@ -21,10 +21,10 @@ import org.junit.Test; -import io.reactivex.Flowable; -import io.reactivex.internal.schedulers.ImmediateThinScheduler; -import io.reactivex.schedulers.*; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler; +import io.reactivex.rxjava3.schedulers.*; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class FlowableRequestObserveOnTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTest.java index f334cb6a..c7f617ed 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTest.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.operators; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; import java.io.IOException; import java.util.List; @@ -26,14 +26,14 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.Flowable; -import io.reactivex.exceptions.MissingBackpressureException; -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.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +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; public class FlowableRequestSampleTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTimeTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTimeTest.java index 683f9c1e..872e5710 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTimeTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTimeTest.java @@ -24,12 +24,12 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.Flowable; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.functions.Functions; -import io.reactivex.internal.subscriptions.BooleanSubscription; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; public class FlowableRequestSampleTimeTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSpanoutTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSpanoutTest.java index 5d7926cf..9bd7bb16 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSpanoutTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSpanoutTest.java @@ -21,10 +21,10 @@ import org.junit.Test; -import io.reactivex.Flowable; -import io.reactivex.processors.PublishProcessor; -import io.reactivex.schedulers.*; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.processors.PublishProcessor; +import io.reactivex.rxjava3.schedulers.*; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class FlowableSpanoutTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMapTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMapTest.java index c4b3bb61..93b287bb 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMapTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMapTest.java @@ -26,14 +26,14 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.Flowable; -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.*; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.Flowable; +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.schedulers.Schedulers; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class FlowableSwitchFlatMapTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArrayTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArrayTest.java index 723c1f43..2d19fbae 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArrayTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArrayTest.java @@ -23,8 +23,8 @@ import org.junit.Test; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.schedulers.Schedulers; public class FlowableSwitchIfEmptyManyArrayTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyTest.java index 11365a85..7492cb05 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyTest.java @@ -23,8 +23,8 @@ import org.junit.Test; import org.reactivestreams.Publisher; -import io.reactivex.Flowable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.schedulers.Schedulers; public class FlowableSwitchIfEmptyManyTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirstTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirstTest.java index 89b90cc3..e665912d 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirstTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirstTest.java @@ -25,12 +25,12 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.Flowable; -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.rxjava3.core.Flowable; +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; public class FlowableSwitchOnFirstTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLastTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLastTest.java index 346814b4..f592096b 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLastTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLastTest.java @@ -22,9 +22,9 @@ import org.junit.Test; import org.reactivestreams.Publisher; -import io.reactivex.Flowable; -import io.reactivex.functions.Function; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.schedulers.Schedulers; public class FlowableTimeoutLastTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableValveTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableValveTest.java index 6555bb85..f40c0aec 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableValveTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableValveTest.java @@ -25,12 +25,12 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.Flowable; -import io.reactivex.functions.Function; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.processors.PublishProcessor; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.processors.PublishProcessor; +import io.reactivex.rxjava3.schedulers.Schedulers; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class FlowableValveTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicateTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicateTest.java index b2e1d2c9..8184bbf5 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicateTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicateTest.java @@ -24,12 +24,10 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.Flowable; -import io.reactivex.Single; -import io.reactivex.functions.Function; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.subscriptions.BooleanSubscription; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public class FlowableWindowPredicateTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableZipLatestTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableZipLatestTest.java index 62c0a4ab..bf209dbe 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableZipLatestTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableZipLatestTest.java @@ -24,14 +24,14 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.Flowable; -import io.reactivex.exceptions.ProtocolViolationException; -import io.reactivex.functions.*; -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.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.ProtocolViolationException; +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.*; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class FlowableZipLatestTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowablesTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowablesTest.java index 2e7c8ac8..d46809e6 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowablesTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowablesTest.java @@ -19,7 +19,7 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.internal.functions.Functions; +import io.reactivex.rxjava3.internal.functions.Functions; public class FlowablesTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletableTest.java index ac299b26..1ef8a985 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletableTest.java @@ -21,9 +21,9 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.subjects.MaybeSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.subjects.MaybeSubject; public class MaybeFlatMapSignalCompletableTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowableTest.java index 18ebc6bc..1d4ea596 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowableTest.java @@ -21,9 +21,9 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.subjects.MaybeSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.subjects.MaybeSubject; public class MaybeFlatMapSignalFlowableTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybeTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybeTest.java index 8c2da607..31d01159 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybeTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybeTest.java @@ -21,9 +21,9 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.Maybe; -import io.reactivex.functions.*; -import io.reactivex.subjects.MaybeSubject; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.subjects.MaybeSubject; public class MaybeFlatMapSignalMaybeTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservableTest.java index 906d94ae..75e49a91 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservableTest.java @@ -21,9 +21,9 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.subjects.MaybeSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.subjects.MaybeSubject; public class MaybeFlatMapSignalObservableTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingleTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingleTest.java index 54fa5fca..f29050f1 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingleTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingleTest.java @@ -21,9 +21,9 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.subjects.MaybeSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.subjects.MaybeSubject; public class MaybeFlatMapSignalSingleTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableErrorJumpTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableErrorJumpTest.java index 1ca35597..47e721c5 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableErrorJumpTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableErrorJumpTest.java @@ -21,10 +21,10 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.Observable; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.observers.TestObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.exceptions.CompositeException; +import io.reactivex.rxjava3.observers.TestObserver; public class ObservableErrorJumpTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsyncTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsyncTest.java index 952e4a9d..630b836e 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsyncTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsyncTest.java @@ -25,13 +25,13 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposables; -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.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposables; +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.subjects.PublishSubject; public class ObservableFilterAsyncTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDropTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDropTest.java index aaf27c53..74d49e7a 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDropTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDropTest.java @@ -24,13 +24,13 @@ import org.junit.Test; -import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposables; -import io.reactivex.functions.*; -import io.reactivex.observers.TestObserver; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subjects.PublishSubject; +import hu.akarnokd.rxjava3.test.TestHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposables; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.observers.TestObserver; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.subjects.PublishSubject; public class ObservableFlatMapDropTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatestTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatestTest.java index abfec4ca..23c8fc01 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatestTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatestTest.java @@ -24,13 +24,13 @@ import org.junit.Test; -import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposables; -import io.reactivex.functions.*; -import io.reactivex.observers.TestObserver; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subjects.PublishSubject; +import hu.akarnokd.rxjava3.test.TestHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposables; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.observers.TestObserver; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.subjects.PublishSubject; public class ObservableFlatMapLatestTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableIndexOfTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableIndexOfTest.java index 96e1de91..cec57b32 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableIndexOfTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableIndexOfTest.java @@ -20,9 +20,9 @@ import org.junit.Test; -import io.reactivex.*; -import io.reactivex.disposables.Disposables; -import io.reactivex.functions.Predicate; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposables; +import io.reactivex.rxjava3.functions.Predicate; public class ObservableIndexOfTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableMapAsyncTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableMapAsyncTest.java index cba9a906..88add71a 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableMapAsyncTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableMapAsyncTest.java @@ -25,13 +25,13 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposables; -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.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposables; +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; public class ObservableMapAsyncTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDropTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDropTest.java index c9cb9dd3..dac7c63b 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDropTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDropTest.java @@ -24,10 +24,10 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.observers.TestObserver; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.observers.TestObserver; +import io.reactivex.rxjava3.schedulers.Schedulers; public class ObservableObserveOnDropTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatestTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatestTest.java index 512754b4..b76f633b 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatestTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatestTest.java @@ -24,10 +24,10 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.observers.TestObserver; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.observers.TestObserver; +import io.reactivex.rxjava3.schedulers.Schedulers; public class ObservableObserveOnLatestTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableValveTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableValveTest.java index c60a1771..53207199 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableValveTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableValveTest.java @@ -25,12 +25,12 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.Observable; -import io.reactivex.functions.Function; -import io.reactivex.observers.TestObserver; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subjects.PublishSubject; +import io.reactivex.rxjava3.core.Observable; +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.subjects.PublishSubject; public class ObservableValveTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletableTest.java index 0ff0e799..f6f6fac8 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletableTest.java @@ -21,9 +21,9 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.functions.Function; -import io.reactivex.subjects.SingleSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.subjects.SingleSubject; public class SingleFlatMapSignalCompletableTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowableTest.java index 14857937..23ec2b5c 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowableTest.java @@ -21,9 +21,9 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.functions.Function; -import io.reactivex.subjects.SingleSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.subjects.SingleSubject; public class SingleFlatMapSignalFlowableTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybeTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybeTest.java index fb317bc3..673ec834 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybeTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybeTest.java @@ -21,9 +21,9 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.functions.Function; -import io.reactivex.subjects.SingleSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.subjects.SingleSubject; public class SingleFlatMapSignalMaybeTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservableTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservableTest.java index 51d3d8e1..ba2e0970 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservableTest.java @@ -21,9 +21,9 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.functions.Function; -import io.reactivex.subjects.SingleSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.subjects.SingleSubject; public class SingleFlatMapSignalObservableTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingleTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingleTest.java index 31f68f94..ec4fdae8 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingleTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingleTest.java @@ -21,9 +21,9 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.Single; -import io.reactivex.functions.Function; -import io.reactivex.subjects.SingleSubject; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.subjects.SingleSubject; public class SingleFlatMapSignalSingleTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMergeTest.java b/src/test/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMergeTest.java index 85f1e1c5..76a1e4cb 100644 --- a/src/test/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMergeTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMergeTest.java @@ -20,9 +20,9 @@ import org.junit.Test; -import io.reactivex.Flowable; -import io.reactivex.functions.Function; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.schedulers.Schedulers; public class ParallelOrderedMergeTest { @Test diff --git a/src/test/java/hu/akarnokd/rxjava3/parallel/ParallelSumTest.java b/src/test/java/hu/akarnokd/rxjava3/parallel/ParallelSumTest.java index 997fa9f0..80b83b73 100644 --- a/src/test/java/hu/akarnokd/rxjava3/parallel/ParallelSumTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/parallel/ParallelSumTest.java @@ -21,9 +21,9 @@ import org.junit.*; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.Flowable; -import io.reactivex.functions.*; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.schedulers.Schedulers; public class ParallelSumTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessorTest.java b/src/test/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessorTest.java index 9c53c064..a5d6d0f0 100644 --- a/src/test/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessorTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessorTest.java @@ -26,13 +26,13 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.internal.subscriptions.BooleanSubscription; -import io.reactivex.observers.TestObserver; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.*; +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.Schedulers; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class DispatchWorkProcessorTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/processors/FlowableProcessorsTest.java b/src/test/java/hu/akarnokd/rxjava3/processors/FlowableProcessorsTest.java index 195af45a..5ba0d391 100644 --- a/src/test/java/hu/akarnokd/rxjava3/processors/FlowableProcessorsTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/processors/FlowableProcessorsTest.java @@ -24,9 +24,9 @@ import org.reactivestreams.*; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.internal.subscriptions.BooleanSubscription; -import io.reactivex.processors.*; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription; +import io.reactivex.rxjava3.processors.*; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class FlowableProcessorsTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/processors/RefCountProcessorTest.java b/src/test/java/hu/akarnokd/rxjava3/processors/RefCountProcessorTest.java index a1aeed6f..b1eefe6a 100644 --- a/src/test/java/hu/akarnokd/rxjava3/processors/RefCountProcessorTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/processors/RefCountProcessorTest.java @@ -20,12 +20,12 @@ import org.junit.Test; import org.reactivestreams.Subscription; -import hu.akarnokd.rxjava3.test.*; -import io.reactivex.FlowableSubscriber; -import io.reactivex.internal.subscriptions.BooleanSubscription; -import io.reactivex.processors.*; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subscribers.TestSubscriber; +import hu.akarnokd.rxjava3.test.TestHelper; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription; +import io.reactivex.rxjava3.processors.*; +import io.reactivex.rxjava3.schedulers.Schedulers; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class RefCountProcessorTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/schedulers/BlockingSchedulerTest.java b/src/test/java/hu/akarnokd/rxjava3/schedulers/BlockingSchedulerTest.java index cd9ea4aa..a77bbc3f 100644 --- a/src/test/java/hu/akarnokd/rxjava3/schedulers/BlockingSchedulerTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/schedulers/BlockingSchedulerTest.java @@ -24,15 +24,15 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.Flowable; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.Functions; -import io.reactivex.internal.subscriptions.BooleanSubscription; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.disposables.Disposable; +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.schedulers.Schedulers; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class BlockingSchedulerTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/schedulers/ParallelSchedulerTest.java b/src/test/java/hu/akarnokd/rxjava3/schedulers/ParallelSchedulerTest.java index f646ba63..9a198b66 100644 --- a/src/test/java/hu/akarnokd/rxjava3/schedulers/ParallelSchedulerTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/schedulers/ParallelSchedulerTest.java @@ -26,12 +26,12 @@ import hu.akarnokd.rxjava3.schedulers.ParallelScheduler.TrackingParallelWorker.TrackedAction; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.*; -import io.reactivex.internal.functions.Functions; -import io.reactivex.internal.schedulers.RxThreadFactory; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.*; +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.RxThreadFactory; +import io.reactivex.rxjava3.schedulers.Schedulers; public class ParallelSchedulerTest implements Runnable { diff --git a/src/test/java/hu/akarnokd/rxjava3/schedulers/SharedSchedulerTest.java b/src/test/java/hu/akarnokd/rxjava3/schedulers/SharedSchedulerTest.java index 1c45e0fe..96fdf50b 100644 --- a/src/test/java/hu/akarnokd/rxjava3/schedulers/SharedSchedulerTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/schedulers/SharedSchedulerTest.java @@ -26,12 +26,12 @@ import hu.akarnokd.rxjava3.schedulers.SharedScheduler.SharedWorker.SharedAction; import hu.akarnokd.rxjava3.test.TestHelper; -import io.reactivex.Flowable; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.Functions; -import io.reactivex.schedulers.*; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.schedulers.*; public class SharedSchedulerTest implements Runnable { diff --git a/src/test/java/hu/akarnokd/rxjava3/string/FlowableCharSequenceTest.java b/src/test/java/hu/akarnokd/rxjava3/string/FlowableCharSequenceTest.java index ff96eb85..59e3033a 100644 --- a/src/test/java/hu/akarnokd/rxjava3/string/FlowableCharSequenceTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/string/FlowableCharSequenceTest.java @@ -19,9 +19,9 @@ import org.junit.Test; import org.reactivestreams.Publisher; -import io.reactivex.Flowable; -import io.reactivex.functions.Function; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public class FlowableCharSequenceTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/string/StringFlowableTest.java b/src/test/java/hu/akarnokd/rxjava3/string/StringFlowableTest.java index ffbcb44f..7bba180b 100644 --- a/src/test/java/hu/akarnokd/rxjava3/string/StringFlowableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/string/StringFlowableTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.BaseTest; -import io.reactivex.Flowable; +import io.reactivex.rxjava3.core.Flowable; public class StringFlowableTest extends BaseTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubjectTest.java b/src/test/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubjectTest.java index 0cfcb0ce..63ce7b29 100644 --- a/src/test/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubjectTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubjectTest.java @@ -25,12 +25,12 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.Single; -import io.reactivex.disposables.*; -import io.reactivex.functions.BiFunction; -import io.reactivex.observers.TestObserver; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.functions.BiFunction; +import io.reactivex.rxjava3.observers.TestObserver; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; public class DispatchWorkSubjectTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/subjects/RefCountSubjectTest.java b/src/test/java/hu/akarnokd/rxjava3/subjects/RefCountSubjectTest.java index 301036c5..ae360ff0 100644 --- a/src/test/java/hu/akarnokd/rxjava3/subjects/RefCountSubjectTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/subjects/RefCountSubjectTest.java @@ -19,12 +19,12 @@ import org.junit.Test; -import hu.akarnokd.rxjava3.test.*; -import io.reactivex.Observer; -import io.reactivex.disposables.*; -import io.reactivex.observers.TestObserver; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subjects.*; +import hu.akarnokd.rxjava3.test.TestHelper; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.observers.TestObserver; +import io.reactivex.rxjava3.schedulers.Schedulers; +import io.reactivex.rxjava3.subjects.*; public class RefCountSubjectTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/subjects/SubjectsTest.java b/src/test/java/hu/akarnokd/rxjava3/subjects/SubjectsTest.java index f758d35f..26a38e56 100644 --- a/src/test/java/hu/akarnokd/rxjava3/subjects/SubjectsTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/subjects/SubjectsTest.java @@ -18,7 +18,6 @@ import org.junit.Test; -import hu.akarnokd.rxjava3.subjects.Subjects; import hu.akarnokd.rxjava3.test.TestHelper; public class SubjectsTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubjectTest.java b/src/test/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubjectTest.java index 86101d6b..d6b8399e 100644 --- a/src/test/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubjectTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubjectTest.java @@ -24,9 +24,9 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.disposables.*; -import io.reactivex.observers.TestObserver; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.observers.TestObserver; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public class UnicastWorkSubjectTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/test/BaseTest.java b/src/test/java/hu/akarnokd/rxjava3/test/BaseTest.java index d34a6aea..7e344c96 100644 --- a/src/test/java/hu/akarnokd/rxjava3/test/BaseTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/test/BaseTest.java @@ -18,9 +18,9 @@ import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.observers.TestObserver; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.observers.TestObserver; +import io.reactivex.rxjava3.subscribers.TestSubscriber; public abstract class BaseTest { diff --git a/src/test/java/hu/akarnokd/rxjava3/test/BaseTestConsumerEx.java b/src/test/java/hu/akarnokd/rxjava3/test/BaseTestConsumerEx.java index 5f44ce0a..ca921d36 100644 --- a/src/test/java/hu/akarnokd/rxjava3/test/BaseTestConsumerEx.java +++ b/src/test/java/hu/akarnokd/rxjava3/test/BaseTestConsumerEx.java @@ -2,11 +2,11 @@ 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/hu/akarnokd/rxjava3/test/TestHelper.java b/src/test/java/hu/akarnokd/rxjava3/test/TestHelper.java index a9155482..99f5a0fc 100644 --- a/src/test/java/hu/akarnokd/rxjava3/test/TestHelper.java +++ b/src/test/java/hu/akarnokd/rxjava3/test/TestHelper.java @@ -32,26 +32,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.*; -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.*; +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 from 1.x mostly. diff --git a/src/test/java/hu/akarnokd/rxjava3/test/TestObserverEx.java b/src/test/java/hu/akarnokd/rxjava3/test/TestObserverEx.java index 4d6e613d..35e9d758 100644 --- a/src/test/java/hu/akarnokd/rxjava3/test/TestObserverEx.java +++ b/src/test/java/hu/akarnokd/rxjava3/test/TestObserverEx.java @@ -2,10 +2,10 @@ 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/hu/akarnokd/rxjava3/test/TestSubscriberEx.java b/src/test/java/hu/akarnokd/rxjava3/test/TestSubscriberEx.java index 9ee7881b..f91d7bcd 100644 --- a/src/test/java/hu/akarnokd/rxjava3/test/TestSubscriberEx.java +++ b/src/test/java/hu/akarnokd/rxjava3/test/TestSubscriberEx.java @@ -4,9 +4,9 @@ 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. From c038c2033345cb6846007fa3f3c70d47b0e07e51 Mon Sep 17 00:00:00 2001 From: akarnokd Date: Tue, 20 Aug 2019 10:31:00 +0200 Subject: [PATCH 006/203] Fix javadoc links --- .../rxjava3/consumers/CompletableConsumers.java | 2 +- .../rxjava3/consumers/FlowableConsumers.java | 2 +- .../akarnokd/rxjava3/consumers/MaybeConsumers.java | 2 +- .../rxjava3/consumers/ObservableConsumers.java | 2 +- .../rxjava3/consumers/SingleConsumers.java | 2 +- .../rxjava3/operators/FlowableTransformers.java | 14 +++++++------- .../rxjava3/operators/ObservableTransformers.java | 6 +++--- .../hu/akarnokd/rxjava3/subjects/Subjects.java | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/CompletableConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/CompletableConsumers.java index 4453c494..482e1828 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/CompletableConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/CompletableConsumers.java @@ -22,7 +22,7 @@ import io.reactivex.rxjava3.internal.functions.*; /** - * Utility methods for creating and using consumers {@link io.reactivex.Completable}s. + * Utility methods for creating and using consumers {@link io.reactivex.rxjava3.core.Completable}s. * @since 0.18.0 */ public final class CompletableConsumers { diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/FlowableConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/FlowableConsumers.java index a030d971..9ec1aaa1 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/FlowableConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/FlowableConsumers.java @@ -22,7 +22,7 @@ import io.reactivex.rxjava3.internal.functions.*; /** - * Utility methods for creating and using consumers {@link io.reactivex.Flowable}s. + * Utility methods for creating and using consumers {@link io.reactivex.rxjava3.core.Flowable}s. * @since 0.18.0 */ public final class FlowableConsumers { diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/MaybeConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/MaybeConsumers.java index 118c8b11..a25ff678 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/MaybeConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/MaybeConsumers.java @@ -22,7 +22,7 @@ import io.reactivex.rxjava3.internal.functions.*; /** - * Utility methods for creating and using consumers {@link io.reactivex.Maybe}s. + * Utility methods for creating and using consumers {@link io.reactivex.rxjava3.core.Maybe}s. * @since 0.18.0 */ public final class MaybeConsumers { diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/ObservableConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/ObservableConsumers.java index 76525b16..bacf2461 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/ObservableConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/ObservableConsumers.java @@ -22,7 +22,7 @@ import io.reactivex.rxjava3.internal.functions.*; /** - * Utility methods for creating and using consumers {@link io.reactivex.Observable}s. + * Utility methods for creating and using consumers {@link io.reactivex.rxjava3.core.Observable}s. * @since 0.18.0 */ public final class ObservableConsumers { diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/SingleConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/SingleConsumers.java index 2516eaa7..6db25559 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/SingleConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/SingleConsumers.java @@ -22,7 +22,7 @@ import io.reactivex.rxjava3.internal.functions.*; /** - * Utility methods for creating and using consumers {@link io.reactivex.SingleObserver}s. + * Utility methods for creating and using consumers {@link io.reactivex.rxjava3.core.SingleObserver}s. * @since 0.18.0 */ public final class SingleConsumers { diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTransformers.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTransformers.java index 2028d734..7a38d679 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTransformers.java @@ -49,7 +49,7 @@ private FlowableTransformers() { *
    *
  • The operator starts with an open valve.
    • *
  • If the other Publisher completes, the sequence terminates with an {@code IllegalStateException}.
    • - *
  • The operator doesn't run on any particular {@link io.reactivex.Scheduler Scheduler}.
    • + *
  • The operator doesn't run on any particular {@link io.reactivex.rxjava3.core.Scheduler Scheduler}.
    • *
  • The operator is a pass-through for backpressure and uses an internal unbounded buffer * of size {@link Flowable#bufferSize()} to hold onto values if the valve is closed.
    • *
@@ -73,7 +73,7 @@ public static FlowableTransformer valve(Publisher other) { *

Properties: *

    *
  • If the other Publisher completes, the sequence terminates with an {@code IllegalStateException}.
    • - *
  • The operator doesn't run on any particular {@link io.reactivex.Scheduler Scheduler}.
    • + *
  • The operator doesn't run on any particular {@link io.reactivex.rxjava3.core.Scheduler Scheduler}.
    • *
  • The operator is a pass-through for backpressure and uses an internal unbounded buffer * of size {@link Flowable#bufferSize()} to hold onto values if the valve is closed.
    • *
@@ -99,7 +99,7 @@ public static FlowableTransformer valve(Publisher other, bool *

Properties: *

    *
  • If the other Publisher completes, the sequence terminates with an {@code IllegalStateException}.
    • - *
  • The operator doesn't run on any particular {@link io.reactivex.Scheduler Scheduler}.
    • + *
  • The operator doesn't run on any particular {@link io.reactivex.rxjava3.core.Scheduler Scheduler}.
    • *
* @param the value type of the main source * @param other the other source @@ -1229,7 +1229,7 @@ public static FlowableTransformer indexOf(Predicate pred * as an individual {@code Runnable} task. Each item received from the upstream will * also run on the given {@code Scheduler} as individual {@code Runnable} tasks which * should maximize the possibility of work interleaved on a threadpool-backed {@code Scheduler} - * such as {@link io.reactivex.schedulers.Schedulers#computation()}. + * such as {@link io.reactivex.rxjava3.schedulers.Schedulers#computation()}. *
*
Backpressure:
*
The operator requests one item at a time and requests the next item once the downstream @@ -1257,7 +1257,7 @@ public static FlowableTransformer requestObserveOn(Scheduler scheduler *
Backpressure:
*
The operator issues {@code request(1)} to its upstream periodically and expects the downstream * to be ready to consume the items. If the downstream is not ready at that moment, - * a {@link io.reactivex.exceptions.MissingBackpressureException MissingBackpressureException} is signalled + * a {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException MissingBackpressureException} is signalled * and the flow is cancelled.
*
Scheduler:
*
You specify the {@link Scheduler} this operator should use for issuing each {@code request(1)} call. @@ -1282,7 +1282,7 @@ public static FlowableTransformer requestSample(long period, TimeUnit *
Backpressure:
*
The operator issues {@code request(1)} to its upstream after an initial delay, then periodically and expects the downstream * to be ready to consume the items. If the downstream is not ready at that moment, - * a {@link io.reactivex.exceptions.MissingBackpressureException MissingBackpressureException} is signalled + * a {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException MissingBackpressureException} is signalled * and the flow is cancelled.
*
Scheduler:
*
You specify the {@link Scheduler} this operator should use for issuing each {@code request(1)} call. @@ -1309,7 +1309,7 @@ public static FlowableTransformer requestSample(long initialDelay, lon *
Backpressure:
*
The operator issues {@code request(1)} when the other {@code Publisher} signals an {@code onNext} and expects the downstream * to be ready to consume the items. If the downstream is not ready at that moment, - * a {@link io.reactivex.exceptions.MissingBackpressureException MissingBackpressureException} is signalled + * a {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException MissingBackpressureException} is signalled * and the flow is cancelled. The other {@code Publisher} is consumed in an unbounded manner.
*
Scheduler:
*
This operator doesn't run on any particular {@link Scheduler}.
diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableTransformers.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableTransformers.java index 51035188..49faa407 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableTransformers.java @@ -154,7 +154,7 @@ public static ObservableTransformer errorJump(ObservableTransformer *
    *
  • The operator starts with an open valve.
    • *
  • If the other ObservableSource completes, the sequence terminates with an {@code IllegalStateException}.
    • - *
  • The operator doesn't run on any particular {@link io.reactivex.Scheduler Scheduler}.
    • + *
  • The operator doesn't run on any particular {@link io.reactivex.rxjava3.core.Scheduler Scheduler}.
    • *
  • The operator uses an internal unbounded buffer * of size {@link Flowable#bufferSize()} to hold onto values if the valve is closed.
    • *
@@ -177,7 +177,7 @@ public static ObservableTransformer valve(ObservableSource ot *

Properties: *

    *
  • If the other ObservableSource completes, the sequence terminates with an {@code IllegalStateException}.
    • - *
  • The operator doesn't run on any particular {@link io.reactivex.Scheduler Scheduler}.
    • + *
  • The operator doesn't run on any particular {@link io.reactivex.rxjava3.core.Scheduler Scheduler}.
    • *
  • The operator uses an internal unbounded buffer * of size {@link Flowable#bufferSize()} to hold onto values if the valve is closed.
    • *
@@ -202,7 +202,7 @@ public static ObservableTransformer valve(ObservableSource ot *

Properties: *

    *
  • If the other ObservableSource completes, the sequence terminates with an {@code IllegalStateException}.
    • - *
  • The operator doesn't run on any particular {@link io.reactivex.Scheduler Scheduler}.
    • + *
  • The operator doesn't run on any particular {@link io.reactivex.rxjava3.core.Scheduler Scheduler}.
    • *
* @param the value type of the main source * @param other the other source diff --git a/src/main/java/hu/akarnokd/rxjava3/subjects/Subjects.java b/src/main/java/hu/akarnokd/rxjava3/subjects/Subjects.java index f823b2b6..6f8eb052 100644 --- a/src/main/java/hu/akarnokd/rxjava3/subjects/Subjects.java +++ b/src/main/java/hu/akarnokd/rxjava3/subjects/Subjects.java @@ -34,7 +34,7 @@ private Subjects() { * Wraps a Subject and makes sure if all observers dispose * their disposables, the upstream's Disposable gets disposed as well. *

- * This operator is similar to {@link io.reactivex.observables.ConnectableObservable#refCount()} + * This operator is similar to {@link io.reactivex.rxjava3.observables.ConnectableObservable#refCount()} * except the first Observer doesn't trigger any sort of connection; that happens * when the resulting Subject is subscribed to an Observable manually. * @param the input and output value type From 0b90b7fc33095d7a03f14de355565501ceb15924 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2019 14:57:43 +0200 Subject: [PATCH 007/203] Bump reactive-streams from 1.0.3-RC1 to 1.0.3 (#41) Bumps [reactive-streams](https://github.com/reactive-streams/reactive-streams) from 1.0.3-RC1 to 1.0.3. - [Release notes](https://github.com/reactive-streams/reactive-streams/releases) - [Changelog](https://github.com/reactive-streams/reactive-streams-jvm/blob/master/RELEASE-NOTES.md) - [Commits](https://github.com/reactive-streams/reactive-streams/compare/v1.0.3-RC1...v1.0.3) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 33cc332a..f9e6fb7b 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ apply plugin: 'osgi' dependencies { signature 'org.codehaus.mojo.signature:java16:1.1@signature' - compile "org.reactivestreams:reactive-streams:1.0.3-RC1" + compile "org.reactivestreams:reactive-streams:1.0.3" compile "io.reactivex.rxjava3:rxjava:3.0.0-RC2" testCompile group: 'junit', name: 'junit', version: '4.12' From 9be86a424a0e0f6dace46a6645f794d268d0b785 Mon Sep 17 00:00:00 2001 From: akarnokd Date: Wed, 18 Sep 2019 08:39:57 +0200 Subject: [PATCH 008/203] Upgrade to RxJava 3.0.0-RC3, adjust internals --- README.md | 2 +- build.gradle | 2 +- gradle.properties | 2 +- .../rxjava3/basetypes/NonoConcat.java | 49 +++++++++---------- .../rxjava3/basetypes/NonoConcatArray.java | 19 ++++--- .../rxjava3/basetypes/NonoConcatIterable.java | 19 ++++--- .../akarnokd/rxjava3/basetypes/NonoMerge.java | 19 ++----- .../rxjava3/basetypes/NonoMergeArray.java | 20 +++----- .../rxjava3/basetypes/NonoMergeIterable.java | 10 ++-- .../operators/BasicMergeSubscription.java | 16 +++--- .../rxjava3/operators/FlowableExpand.java | 23 +++------ .../operators/FlowableFilterAsync.java | 17 ++++--- .../operators/FlowableFlatMapAsync.java | 5 +- .../operators/FlowableFlatMapSync.java | 30 +++++------- .../operators/FlowableGenerateAsync.java | 12 ++--- .../rxjava3/operators/FlowableMapAsync.java | 18 +++---- .../operators/FlowablePartialCollect.java | 17 ++----- .../rxjava3/operators/FlowableValve.java | 9 ++-- .../rxjava3/operators/FlowableZipLatest.java | 24 +++------ .../operators/ObservableFilterAsync.java | 19 +++---- .../operators/ObservableFlatMapDrop.java | 24 ++------- .../operators/ObservableFlatMapLatest.java | 22 +++------ .../rxjava3/operators/ObservableMapAsync.java | 26 ++++------ .../rxjava3/operators/ObservableValve.java | 9 ++-- .../processors/DispatchWorkProcessorTest.java | 2 +- 25 files changed, 156 insertions(+), 259 deletions(-) diff --git a/README.md b/README.md index bdf8291b..976df909 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ RxJava 3.x implementation of extra sources, operators and components and ports o ``` dependencies { - compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC2" + compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC3" } ``` diff --git a/build.gradle b/build.gradle index f9e6fb7b..bbf4e6ef 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java16:1.1@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.0-RC2" + compile "io.reactivex.rxjava3:rxjava:3.0.0-RC3" testCompile group: 'junit', name: 'junit', version: '4.12' diff --git a/gradle.properties b/gradle.properties index 98cbddc6..75df9ab9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=3.0.0-RC2 +version=3.0.0-RC3 diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java index c8c9e50b..e4132ff8 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java @@ -25,7 +25,6 @@ import io.reactivex.rxjava3.internal.queue.*; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.*; -import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Concatenate sources emitted by a Publisher one after another and complete after each complete. @@ -64,7 +63,7 @@ abstract static class AbstractConcatSubscriber extends BasicIntQueueSubscription final int limit; - final AtomicThrowable error; + final AtomicThrowable errors; final InnerSubscriber inner; @@ -86,7 +85,7 @@ abstract static class AbstractConcatSubscriber extends BasicIntQueueSubscription this.downstream = downstream; this.prefetch = prefetch; this.limit = prefetch - (prefetch >> 2); - this.error = new AtomicThrowable(); + this.errors = new AtomicThrowable(); this.inner = new InnerSubscriber(); } @@ -240,14 +239,14 @@ static final class ConcatImmediateSubscriber extends AbstractConcatSubscriber { @Override public void onError(Throwable t) { - cancel(); - HalfSerializer.onError(downstream, t, this, error); + cancelIf(true); + HalfSerializer.onError(downstream, t, this, errors); } @Override public void innerError(Throwable t) { - cancel(); - HalfSerializer.onError(downstream, t, this, error); + cancelIf(true); + HalfSerializer.onError(downstream, t, this, errors); } @Override @@ -258,13 +257,21 @@ public void onComplete() { @Override public void cancel() { + cancelIf(false); + } + + void cancelIf(boolean error) { cancelled = true; upstream.cancel(); inner.dispose(); + if (!error) { + errors.tryTerminateAndReport(); + } if (wip.getAndIncrement() == 0) { queue.clear(); } + } @Override @@ -289,14 +296,14 @@ public void drain() { Exceptions.throwIfFatal(ex); upstream.cancel(); queue.clear(); - HalfSerializer.onError(downstream, ex, this, error); + HalfSerializer.onError(downstream, ex, this, errors); return; } boolean empty = np == null; if (d && empty) { - HalfSerializer.onComplete(downstream, this, error); + HalfSerializer.onComplete(downstream, this, errors); return; } @@ -324,11 +331,9 @@ static final class ConcatDelayedSubscriber extends AbstractConcatSubscriber { @Override public void onError(Throwable t) { - if (error.addThrowable(t)) { + if (errors.tryAddThrowableOrReport(t)) { done = true; drain(); - } else { - RxJavaPlugins.onError(t); } } @@ -343,6 +348,7 @@ public void cancel() { cancelled = true; upstream.cancel(); inner.dispose(); + errors.tryTerminateAndReport(); if (getAndIncrement() == 0) { queue.clear(); @@ -362,9 +368,9 @@ void drain() { } if (!active) { - if (!tillTheEnd && error.get() != null) { + if (!tillTheEnd && errors.get() != null) { queue.clear(); - downstream.onError(error.terminate()); + errors.tryTerminateConsumer(downstream); return; } @@ -378,21 +384,16 @@ void drain() { Exceptions.throwIfFatal(ex); upstream.cancel(); queue.clear(); - error.addThrowable(ex); + errors.tryAddThrowableOrReport(ex); - downstream.onError(error.terminate()); + errors.tryTerminateConsumer(downstream); return; } boolean empty = np == null; if (d && empty) { - Throwable ex = error.terminate(); - if (ex != null) { - downstream.onError(ex); - } else { - downstream.onComplete(); - } + errors.tryTerminateConsumer(downstream); return; } @@ -408,14 +409,12 @@ void drain() { @Override void innerError(Throwable t) { - if (error.addThrowable(t)) { + if (errors.tryAddThrowableOrReport(t)) { if (!tillTheEnd) { upstream.cancel(); } active = false; drain(); - } else { - RxJavaPlugins.onError(t); } } } diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatArray.java index b2a71fda..efad5a8a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatArray.java @@ -70,6 +70,9 @@ static final class ConcatSubscriber extends BasicRefQueueSubscription implements Subscriber, Disposable { diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeArray.java index 19ccfb96..0cc4a87b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeArray.java @@ -22,8 +22,7 @@ import hu.akarnokd.rxjava3.util.CompositeSubscription; import io.reactivex.rxjava3.internal.subscriptions.*; -import io.reactivex.rxjava3.internal.util.*; -import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; /** * Run Nono sources in parallel and complete when all complete. @@ -108,6 +107,7 @@ public void request(long n) { public void cancel() { cancelled = true; set.cancel(); + errors.tryTerminateAndReport(); } void subscribe(int n) { @@ -143,16 +143,13 @@ void subscribe(int n) { Nono np = srcs[i]; if (np == null) { - errors.addThrowable(new NullPointerException("A source is null")); + errors.tryAddThrowableOrReport(new NullPointerException("A source is null")); if (delayErrors) { i = f; break; } set.cancel(); - Throwable ex = errors.terminate(); - if (ex != ExceptionHelper.TERMINATED) { - downstream.onError(ex); - } + errors.tryTerminateConsumer(downstream); return; } @@ -190,20 +187,15 @@ void subscribe(int n) { @Override public void innerError(InnerSubscriber inner, Throwable ex) { set.delete(inner); - if (errors.addThrowable(ex)) { + if (errors.tryAddThrowableOrReport(ex)) { if (!delayErrors) { set.cancel(); - ex = errors.terminate(); - if (ex != ExceptionHelper.TERMINATED) { - downstream.onError(ex); - } + errors.tryTerminateConsumer(downstream); } else { subscribe(1); complete(); } - } else { - RxJavaPlugins.onError(ex); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeIterable.java index 24b1d6b4..6ee6020e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeIterable.java @@ -27,7 +27,6 @@ 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; /** * Run Nono sources in parallel and complete when all complete. @@ -119,6 +118,7 @@ public void request(long n) { public void cancel() { cancelled = true; set.cancel(); + errors.tryTerminateAndReport(); } void subscribe(int n) { @@ -158,7 +158,7 @@ void subscribe(int n) { } } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - errors.addThrowable(ex); + errors.tryAddThrowableOrReport(ex); complete(); return; } @@ -190,17 +190,15 @@ void subscribe(int n) { @Override public void innerError(InnerSubscriber inner, Throwable ex) { set.delete(inner); - if (errors.addThrowable(ex)) { + if (errors.tryAddThrowableOrReport(ex)) { if (!delayErrors) { set.cancel(); - downstream.onError(errors.terminate()); + errors.tryTerminateConsumer(downstream); } else { subscribe(1); complete(); } - } else { - RxJavaPlugins.onError(ex); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java b/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java index ac556f20..fefa3195 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java @@ -27,7 +27,6 @@ import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.*; import io.reactivex.rxjava3.parallel.ParallelFlowable; -import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Subscription coordinator that merges items from a fixed set of source Publishers by @@ -131,6 +130,7 @@ public void cancel() { if (!cancelled) { cancelled = true; cancelSources(); + errors.tryTerminateAndReport(); if (getAndIncrement() == 0) { clearSources(); } @@ -145,15 +145,13 @@ public void innerNext(InnerQueuedSubscriber inner, T value) { @Override public void innerError(InnerQueuedSubscriber inner, Throwable e) { - if (errors.addThrowable(e)) { + if (errors.tryAddThrowableOrReport(e)) { if (!delayErrors) { cancelSources(); } else { inner.setDone(); } drain(); - } else { - RxJavaPlugins.onError(e); } } @@ -216,11 +214,11 @@ public void drain() { v = q != null ? q.poll() : null; } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - err.addThrowable(ex); + err.tryAddThrowableOrReport(ex); inner.setDone(); if (!delayErrors) { cancelAndClearSources(); - a.onError(err.terminate()); + err.tryTerminateConsumer(a); return; } v = this; @@ -252,7 +250,7 @@ public void drain() { } } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - err.addThrowable(ex); + err.tryAddThrowableOrReport(ex); cancelAndClearSources(); a.onError(err.terminate()); return; @@ -311,10 +309,10 @@ public void drain() { o = q.poll(); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - err.addThrowable(ex); + err.tryAddThrowableOrReport(ex); if (!delayErrors) { cancelAndClearSources(); - a.onError(ex); + err.tryTerminateConsumer(a); return; } o = this; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java index 058757c4..cdf296d6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java @@ -134,7 +134,7 @@ public void onNext(T t) { public void onError(Throwable t) { setSubscription(SubscriptionHelper.CANCELLED); if (delayErrors) { - errors.addThrowable(t); + errors.tryAddThrowableOrReport(t); active = false; } else { super.cancel(); @@ -152,6 +152,7 @@ public void onComplete() { @Override public void cancel() { super.cancel(); + errors.tryTerminateAndReport(); drainQueue(); } @@ -166,12 +167,7 @@ void drainQueue() { if (q.isEmpty()) { setSubscription(SubscriptionHelper.CANCELLED); super.cancel(); - Throwable ex = errors.terminate(); - if (ex == null) { - downstream.onComplete(); - } else { - downstream.onError(ex); - } + errors.tryTerminateConsumer(downstream); } else { Publisher p = q.poll(); long c = produced; @@ -333,7 +329,7 @@ void drainQueue() { if (!delayErrors && error.get() != null) { cancel(); - a.onError(error.terminate()); + error.tryTerminateConsumer(a); return; } @@ -354,7 +350,7 @@ void drainQueue() { curr.done = true; currentDone = true; v = null; - error.addThrowable(ex); + error.tryAddThrowableOrReport(ex); } if (p != null) { @@ -374,12 +370,7 @@ void drainQueue() { if (!newSource) { if (currentDone && v == null) { if (n.decrementAndGet() == 0) { - Throwable ex = error.terminate(); - if (ex != null) { - a.onError(ex); - } else { - a.onComplete(); - } + error.tryTerminateConsumer(a); return; } curr = pop(); @@ -410,7 +401,7 @@ void innerNext(ExpandDepthSubscriber inner, T t) { } void innerError(ExpandDepthSubscriber inner, Throwable t) { - error.addThrowable(t); + error.tryAddThrowableOrReport(t); inner.done = true; drainQueue(); } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsync.java index e7d48f7d..3fcb3f4f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsync.java @@ -75,7 +75,7 @@ static final class FilterAsyncSubscriber final int bufferSize; - final AtomicThrowable error; + final AtomicThrowable errors; final AtomicLong requested; @@ -114,7 +114,7 @@ static final class FilterAsyncSubscriber this.downstream = downstream; this.asyncPredicate = asyncPredicate; this.bufferSize = bufferSize; - this.error = new AtomicThrowable(); + this.errors = new AtomicThrowable(); this.requested = new AtomicLong(); this.wip = new AtomicInteger(); this.current = new AtomicReference>(); @@ -133,7 +133,7 @@ public void onNext(T t) { @Override public void onError(Throwable t) { - error.addThrowable(t); + errors.tryAddThrowableOrReport(t); done = true; drain(); } @@ -157,6 +157,7 @@ public void cancel() { if (!cancelled) { cancelled = true; upstream.cancel(); + errors.tryTerminateAndReport(); cancelInner(); if (wip.getAndIncrement() == 0) { clear(); @@ -224,7 +225,7 @@ void drain() { boolean empty = t == null; if (d && empty) { - Throwable ex = error.terminate(); + Throwable ex = errors.terminate(); if (ex == null) { a.onComplete(); } else { @@ -245,7 +246,7 @@ void drain() { p = ObjectHelper.requireNonNull(asyncPredicate.apply(t), "The asyncPredicate returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - error.addThrowable(ex); + errors.tryAddThrowableOrReport(ex); p = null; } @@ -257,7 +258,7 @@ void drain() { u = ((Supplier)p).get(); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - error.addThrowable(ex); + errors.tryAddThrowableOrReport(ex); u = null; } @@ -316,7 +317,7 @@ void drain() { boolean empty = t == null; if (d && empty) { - Throwable ex = error.terminate(); + Throwable ex = errors.terminate(); if (ex == null) { a.onComplete(); } else { @@ -358,7 +359,7 @@ public void innerResult(Boolean item) { @Override public void innerError(Throwable ex) { - error.addThrowable(ex); + errors.tryAddThrowableOrReport(ex); state = STATE_RESULT; clearCurrent(); drain(); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java index 347fd8b6..b7596054 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java @@ -22,7 +22,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.fuseable.SimpleQueue; -import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * FlatMap a bounded number of inner, non-trivial flows (unbound not supported). @@ -109,14 +108,12 @@ public void innerNext(FlatMapInnerSubscriber inner, R item) { @Override public void innerError(FlatMapInnerSubscriber inner, Throwable ex) { remove(inner); - if (error.addThrowable(ex)) { + if (error.tryAddThrowableOrReport(ex)) { inner.done = true; done = true; upstream.cancel(); cancelInners(); drain(); - } else { - RxJavaPlugins.onError(ex); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java index 2be0d1ea..ba389b06 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java @@ -28,7 +28,6 @@ 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; /** * FlatMap a bounded number of inner, non-trivial flows (unbound not supported). @@ -158,11 +157,9 @@ public final void onNext(T t) { Exceptions.throwIfFatal(ex); upstream.cancel(); cancelInners(); - if (error.addThrowable(ex)) { + if (error.tryAddThrowableOrReport(ex)) { done = true; drain(); - } else { - RxJavaPlugins.onError(ex); } return; } @@ -195,11 +192,9 @@ public final void onNext(T t) { @Override public final void onError(Throwable t) { - if (error.addThrowable(t)) { + if (error.tryAddThrowableOrReport(t)) { done = true; drain(); - } else { - RxJavaPlugins.onError(t); } } @@ -222,6 +217,7 @@ public final void cancel() { if (!cancelled) { cancelled = true; upstream.cancel(); + error.tryTerminateAndReport(); cancelInners(); cleanupAfter(); } @@ -283,7 +279,7 @@ final void depthFirst() { if (d) { Throwable ex = error.get(); if (ex != null) { - a.onError(error.terminate()); + error.tryTerminateConsumer(a); cleanupAfter(); return; } @@ -295,10 +291,10 @@ final void depthFirst() { v = q.poll(); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - error.addThrowable(ex); + error.tryAddThrowableOrReport(ex); upstream.cancel(); cancelInners(); - a.onError(error.terminate()); + error.tryTerminateConsumer(a); cleanupAfter(); return; } @@ -356,7 +352,7 @@ final void depthFirst() { Throwable ex = error.get(); if (ex != null) { - a.onError(error.terminate()); + error.tryTerminateConsumer(a); cleanupAfter(); return; } @@ -409,7 +405,7 @@ final void breadthFirst() { if (done) { Throwable ex = error.get(); if (ex != null) { - a.onError(error.terminate()); + error.tryTerminateConsumer(a); cleanupAfter(); return; } @@ -435,10 +431,10 @@ final void breadthFirst() { v = q.poll(); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - error.addThrowable(ex); + error.tryAddThrowableOrReport(ex); upstream.cancel(); cancelInners(); - a.onError(error.terminate()); + error.tryTerminateConsumer(a); cleanupAfter(); return; } @@ -465,7 +461,7 @@ final void breadthFirst() { if (done) { Throwable ex = error.get(); if (ex != null) { - a.onError(error.terminate()); + error.tryTerminateConsumer(a); cleanupAfter(); return; } @@ -587,14 +583,12 @@ public void innerNext(FlatMapInnerSubscriber inner, R item) { @Override public void innerError(FlatMapInnerSubscriber inner, Throwable ex) { remove(inner); - if (error.addThrowable(ex)) { + if (error.tryAddThrowableOrReport(ex)) { inner.done = true; done = true; upstream.cancel(); cancelInners(); drain(); - } else { - RxJavaPlugins.onError(ex); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsync.java index ee540a7d..3d840c48 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsync.java @@ -131,6 +131,7 @@ public void request(long n) { @Override public void cancel() { cancelled = true; + errors.tryTerminateAndReport(); resource.cancel(); if (getAndIncrement() == 0) { cleanup(); @@ -162,12 +163,10 @@ public void onError(Throwable error) { if (error == null) { error = new NullPointerException("error is null"); } - if (errors.addThrowable(error)) { + if (errors.tryAddThrowableOrReport(error)) { itemState |= ITEM_STATE_DONE; done = true; drain(); - } else { - RxJavaPlugins.onError(error); } } @@ -239,12 +238,7 @@ void drain() { int s = itemState; if (d && s == ITEM_STATE_DONE) { - Throwable ex = errors.terminate(); - if (ex != null) { - downstream.onError(ex); - } else { - downstream.onComplete(); - } + errors.tryTerminateConsumer(downstream); resource.cancel(); cleanup(); return; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapAsync.java index 39a9b125..2822d004 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapAsync.java @@ -150,7 +150,7 @@ public void onNext(T t) { @Override public void onError(Throwable t) { - error.addThrowable(t); + error.tryAddThrowableOrReport(t); done = true; drain(); } @@ -174,6 +174,7 @@ public void cancel() { if (!cancelled) { cancelled = true; upstream.cancel(); + error.tryTerminateAndReport(); cancelInner(); if (wip.getAndIncrement() == 0) { clear(); @@ -261,7 +262,7 @@ void drain() { p = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - error.addThrowable(ex); + error.tryAddThrowableOrReport(ex); p = null; } @@ -279,7 +280,7 @@ void drain() { } } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - error.addThrowable(ex); + error.tryAddThrowableOrReport(ex); v = null; } @@ -315,7 +316,7 @@ void drain() { v = ObjectHelper.requireNonNull(combiner.apply(t, u), "The combiner returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - error.addThrowable(ex); + error.tryAddThrowableOrReport(ex); v = null; } @@ -350,12 +351,7 @@ void drain() { boolean empty = t == null; if (d && empty) { - Throwable ex = error.terminate(); - if (ex == null) { - a.onComplete(); - } else { - a.onError(ex); - } + error.tryTerminateConsumer(a); return; } } @@ -392,7 +388,7 @@ public void innerResult(U item) { @Override public void innerError(Throwable ex) { - error.addThrowable(ex); + error.tryAddThrowableOrReport(ex); state = STATE_RESULT; clearCurrent(); drain(); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollect.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollect.java index 3d9dbc87..6661cae1 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollect.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollect.java @@ -152,11 +152,9 @@ public void onNext(T t) { @Override public void onError(Throwable t) { - if (errors.addThrowable(t)) { + if (errors.tryAddThrowableOrReport(t)) { done = true; drain(); - } else { - RxJavaPlugins.onError(t); } } @@ -170,6 +168,7 @@ public void onComplete() { public void cancel() { cancelled = true; upstream.cancel(); + errors.tryTerminateAndReport(); drain(); } @@ -317,20 +316,14 @@ void drain() { boolean d = this.done; if (d && errors.get() != null) { - Throwable ex = errors.terminate(); - downstream.onError(ex); + errors.tryTerminateConsumer(downstream); cleanup(); cancelled = true; break; } if (this.handlerDone) { - Throwable ex = errors.terminate(); - if (ex == null) { - downstream.onComplete(); - } else { - downstream.onError(ex); - } + errors.tryTerminateConsumer(downstream); cleanup(); cancelled = true; break; @@ -344,7 +337,7 @@ void drain() { } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); - errors.addThrowable(ex); + errors.tryAddThrowableOrReport(ex); this.handlerDone = true; continue; } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java index 9d20001f..5fa18546 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java @@ -25,7 +25,6 @@ import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.AtomicThrowable; -import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Allows stopping and resuming the flow of the main source when a secondary flow @@ -117,10 +116,8 @@ public void onNext(T t) { @Override public void onError(Throwable t) { - if (error.addThrowable(t)) { + if (error.tryAddThrowableOrReport(t)) { drain(); - } else { - RxJavaPlugins.onError(t); } } @@ -140,6 +137,7 @@ public void cancel() { cancelled = true; SubscriptionHelper.cancel(upstream); SubscriptionHelper.cancel(other); + error.tryTerminateAndReport(); } void drain() { @@ -161,11 +159,10 @@ void drain() { } if (error.get() != null) { - Throwable ex = error.terminate(); q.clear(); SubscriptionHelper.cancel(upstream); SubscriptionHelper.cancel(other); - a.onError(ex); + error.tryTerminateConsumer(a); return; } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableZipLatest.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableZipLatest.java index 59673a29..09f15021 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableZipLatest.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableZipLatest.java @@ -28,7 +28,6 @@ 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; /** * Takes only the latest value from the sources in each zip round and applies a transformer function @@ -140,6 +139,7 @@ public void request(long n) { public void cancel() { cancelled = true; cancelAll(); + errors.tryTerminateAndReport(); if (wip.getAndIncrement() == 0) { clear(); } @@ -189,12 +189,7 @@ public void run() { cancelled = true; cancelAll(); clear(); - Throwable ex = errors.terminate(); - if (ex == null) { - a.onComplete(); - } else { - a.onError(ex); - } + errors.tryTerminateConsumer(a); worker.dispose(); return; } @@ -217,11 +212,11 @@ public void run() { v = ObjectHelper.requireNonNull(combiner.apply(array), "The combiner returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - errors.addThrowable(ex); + errors.tryAddThrowableOrReport(ex); cancelled = true; cancelAll(); clear(); - a.onError(errors.terminate()); + errors.tryTerminateConsumer(a); worker.dispose(); return; } @@ -242,12 +237,7 @@ public void run() { cancelled = true; cancelAll(); clear(); - Throwable ex = errors.terminate(); - if (ex == null) { - a.onComplete(); - } else { - a.onError(ex); - } + errors.tryTerminateConsumer(a); worker.dispose(); return; } @@ -303,12 +293,10 @@ public void onNext(T t) { @Override public void onError(Throwable t) { ZipLatestCoordinator p = parent; - if (p.errors.addThrowable(t)) { + if (p.errors.tryAddThrowableOrReport(t)) { lazySet(SubscriptionHelper.CANCELLED); done = true; p.drain(); - } else { - RxJavaPlugins.onError(t); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java index 8ad3f9f0..d456af1d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java @@ -110,6 +110,7 @@ public void dispose() { disposed = true; upstream.dispose(); DisposableHelper.dispose(innerDisposable); + errors.tryTerminateAndReport(); drain(); } @@ -135,11 +136,9 @@ public void onNext(T t) { @Override public void onError(Throwable e) { DisposableHelper.dispose(innerDisposable); - if (errors.addThrowable(e)) { + if (errors.tryAddThrowableOrReport(e)) { done = true; drain(); - } else { - RxJavaPlugins.onError(e); } } @@ -162,9 +161,8 @@ public void drain() { queue.clear(); } else { if (errors.get() != null) { - Throwable ex = errors.terminate(); disposed = true; - downstream.onError(ex); + errors.tryTerminateConsumer(downstream); continue; } int s = state; @@ -185,11 +183,10 @@ public void drain() { innerSource = ObjectHelper.requireNonNull(asyncPredicate.apply(item), "The mapper returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - upstream.dispose(); - errors.addThrowable(ex); - ex = errors.terminate(); disposed = true; - downstream.onError(ex); + upstream.dispose(); + errors.tryAddThrowableOrReport(ex); + errors.tryTerminateConsumer(downstream); continue; } @@ -226,13 +223,11 @@ void innerSuccess(boolean value) { } void innerError(Throwable ex) { - if (errors.addThrowable(ex)) { + if (errors.tryAddThrowableOrReport(ex)) { state = STATE_FALSE; DisposableHelper.replace(innerDisposable, null); upstream.dispose(); drain(); - } else { - RxJavaPlugins.onError(ex); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDrop.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDrop.java index d769d0ee..aedc0db5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDrop.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDrop.java @@ -25,7 +25,6 @@ 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; /** * FlatMap only one {@link ObservableSource} at a time and ignore upstream values until it terminates. @@ -112,22 +111,15 @@ public void onNext(T t) { @Override public void onError(Throwable e) { - if (errors.addThrowable(e)) { + if (errors.tryAddThrowableOrReport(e)) { onComplete(); - } else { - RxJavaPlugins.onError(e); } } @Override public void onComplete() { if (done.decrementAndGet() == 0) { - Throwable ex = errors.terminate(); - if (ex == null) { - downstream.onComplete(); - } else { - downstream.onError(ex); - } + errors.tryTerminateConsumer(downstream); } } @@ -135,6 +127,7 @@ public void onComplete() { public void dispose() { upstream.dispose(); DisposableHelper.dispose(innerObserver); + errors.tryTerminateAndReport(); } @Override @@ -147,22 +140,15 @@ void innerNext(R item) { } void innerError(Throwable e) { - if (errors.addThrowable(e)) { + if (errors.tryAddThrowableOrReport(e)) { innerComplete(); - } else { - RxJavaPlugins.onError(e); } } void innerComplete() { active = false; if (done.decrementAndGet() == 0) { - Throwable ex = errors.terminate(); - if (ex == null) { - downstream.onComplete(); - } else { - downstream.onError(ex); - } + errors.tryTerminateConsumer(downstream); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatest.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatest.java index b06c68f8..b33a4ec2 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatest.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatest.java @@ -25,7 +25,6 @@ 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; /** * FlatMap only one {@link ObservableSource} at a time and keep the latest upstream value until it terminates @@ -105,10 +104,8 @@ public void onNext(T t) { @Override public void onError(Throwable e) { - if (errors.addThrowable(e)) { + if (errors.tryAddThrowableOrReport(e)) { onComplete(); - } else { - RxJavaPlugins.onError(e); } } @@ -123,6 +120,7 @@ public void dispose() { disposed = true; upstream.dispose(); DisposableHelper.dispose(innerObserver); + errors.tryTerminateAndReport(); if (getAndIncrement() == 0) { latest.lazySet(null); } @@ -138,10 +136,8 @@ void innerNext(R item) { } void innerError(Throwable e) { - if (errors.addThrowable(e)) { + if (errors.tryAddThrowableOrReport(e)) { innerComplete(); - } else { - RxJavaPlugins.onError(e); } } @@ -164,12 +160,7 @@ void drain() { boolean d = done; T v = latest.getAndSet(null); if (d && v == null) { - Throwable ex = errors.terminate(); - if (ex == null) { - downstream.onComplete(); - } else { - downstream.onError(ex); - } + errors.tryTerminateConsumer(downstream); return; } if (v != null) { @@ -180,9 +171,8 @@ void drain() { } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.dispose(); - errors.addThrowable(ex); - ex = errors.terminate(); - downstream.onError(ex); + errors.tryAddThrowableOrReport(ex); + errors.tryTerminateConsumer(downstream); return; } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java index 2b6e16f9..74669b25 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java @@ -119,6 +119,7 @@ public void dispose() { disposed = true; upstream.dispose(); DisposableHelper.dispose(innerDisposable); + errors.tryTerminateAndReport(); drain(); } @@ -144,11 +145,9 @@ public void onNext(T t) { @Override public void onError(Throwable e) { DisposableHelper.dispose(innerDisposable); - if (errors.addThrowable(e)) { + if (errors.tryAddThrowableOrReport(e)) { done = true; drain(); - } else { - RxJavaPlugins.onError(e); } } @@ -172,9 +171,8 @@ public void drain() { queue.clear(); } else { if (errors.get() != null) { - Throwable ex = errors.terminate(); disposed = true; - downstream.onError(ex); + errors.tryTerminateConsumer(downstream); continue; } int s = state; @@ -195,11 +193,10 @@ public void drain() { innerSource = ObjectHelper.requireNonNull(mapper.apply(item), "The mapper returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - upstream.dispose(); - errors.addThrowable(ex); - ex = errors.terminate(); disposed = true; - downstream.onError(ex); + upstream.dispose(); + errors.tryAddThrowableOrReport(ex); + errors.tryTerminateConsumer(downstream); continue; } @@ -218,11 +215,10 @@ public void drain() { result = ObjectHelper.requireNonNull(combiner.apply(mainItem, innerItem), "The combiner returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - upstream.dispose(); - errors.addThrowable(ex); - ex = errors.terminate(); disposed = true; - downstream.onError(ex); + upstream.dispose(); + errors.tryAddThrowableOrReport(ex); + errors.tryTerminateConsumer(downstream); continue; } @@ -252,13 +248,11 @@ void innerSuccess(U item) { } void innerError(Throwable ex) { - if (errors.addThrowable(ex)) { + if (errors.tryAddThrowableOrReport(ex)) { state = STATE_EMPTY; DisposableHelper.replace(innerDisposable, null); upstream.dispose(); drain(); - } else { - RxJavaPlugins.onError(ex); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java index cca68eea..0d644250 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java @@ -24,7 +24,6 @@ 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; /** * Allows stopping and resuming the flow of the main source when a secondary flow @@ -108,10 +107,8 @@ public void onNext(T t) { @Override public void onError(Throwable t) { - if (error.addThrowable(t)) { + if (error.tryAddThrowableOrReport(t)) { drain(); - } else { - RxJavaPlugins.onError(t); } } @@ -131,6 +128,7 @@ public void dispose() { cancelled = true; DisposableHelper.dispose(upstream); DisposableHelper.dispose(other); + error.tryTerminateAndReport(); } void drain() { @@ -152,11 +150,10 @@ void drain() { } if (error.get() != null) { - Throwable ex = error.terminate(); q.clear(); DisposableHelper.dispose(upstream); DisposableHelper.dispose(other); - a.onError(ex); + error.tryTerminateConsumer(a); return; } diff --git a/src/test/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessorTest.java b/src/test/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessorTest.java index a5d6d0f0..eab73892 100644 --- a/src/test/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessorTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessorTest.java @@ -501,7 +501,7 @@ public void limit() { dws.onNext(2); dws.onComplete(); - dws.limit(1).test().assertResult(1); + dws.take(1).test().assertResult(1); assertFalse(dws.hasSubscribers()); } From 81015cc5a9298b525e4026a8ef923fb721825835 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2019 10:20:30 +0200 Subject: [PATCH 009/203] Bump mockito-core from 3.0.0 to 3.1.0 (#42) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.0.0...v3.1.0) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index bbf4e6ef..aec939ae 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' - testCompile 'org.mockito:mockito-core:3.0.0' + testCompile 'org.mockito:mockito-core:3.1.0' } task sourcesJar(type: Jar, dependsOn: classes) { From a69e4310d5af3280963390ad3052c0f8e570f0cc Mon Sep 17 00:00:00 2001 From: akarnokd Date: Mon, 21 Oct 2019 11:16:35 +0200 Subject: [PATCH 010/203] Upgrade to RxJava 3.0.0-RC4 --- README.md | 2 +- build.gradle | 2 +- gradle.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 976df909..8584e620 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ RxJava 3.x implementation of extra sources, operators and components and ports o ``` dependencies { - compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC3" + compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC4" } ``` diff --git a/build.gradle b/build.gradle index aec939ae..a4c08a91 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java16:1.1@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.0-RC3" + compile "io.reactivex.rxjava3:rxjava:3.0.0-RC4" testCompile group: 'junit', name: 'junit', version: '4.12' diff --git a/gradle.properties b/gradle.properties index 75df9ab9..27c3713e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=3.0.0-RC3 +version=3.0.0-RC4 From 2b4224be0ee874cd3f4cb96a4f8322c2223b388a Mon Sep 17 00:00:00 2001 From: akarnokd Date: Fri, 1 Nov 2019 23:46:08 +0100 Subject: [PATCH 011/203] Add some test for bufferUntil --- .../FlowableBufferPredicateTest.java | 53 ++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java index 8832f487..b63be0bb 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java @@ -18,15 +18,17 @@ import java.io.IOException; import java.util.*; +import java.util.concurrent.TimeUnit; import org.junit.Test; -import org.reactivestreams.Subscriber; +import org.reactivestreams.*; import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; public class FlowableBufferPredicateTest { @@ -497,4 +499,53 @@ public boolean test(Integer v) throws Exception { Arrays.asList(1, 2) ); } + + @SuppressWarnings("unchecked") + @Test + public void untilAlways() { + Flowable.range(1, 5) + .compose(FlowableTransformers.bufferUntil(new Predicate() { + @Override + public boolean test(Integer v) throws Exception { + return true; + } + })) + .test(0) + .assertEmpty() + .requestMore(1) + .assertValuesOnly(Arrays.asList(1)) + .requestMore(2) + .assertValuesOnly( + Arrays.asList(1), + Arrays.asList(2), + Arrays.asList(3) + ) + .requestMore(2) + .assertResult( + Arrays.asList(1), + Arrays.asList(2), + Arrays.asList(3), + Arrays.asList(4), + Arrays.asList(5) + ) + ; + } + + @Test + public void untilAlways2() { + Flowable.range(1, 1000) + .compose(FlowableTransformers.bufferUntil(new Predicate() { + @Override + public boolean test(Integer v) throws Exception { + return true; + } + })) + .flatMap(new Function, Publisher>() { + @Override + public Publisher apply(List v) throws Throwable { + return Flowable.timer(10, TimeUnit.MILLISECONDS); + } + }) + .blockingLast(); + } } From 7263a6df6721c0bb1209adb6e7ed272d46082ac6 Mon Sep 17 00:00:00 2001 From: akarnokd Date: Tue, 12 Nov 2019 09:29:41 +0100 Subject: [PATCH 012/203] Upgrade to Gradle 6, fix warnings --- build.gradle | 75 +++++-------------- gradle.properties | 21 ++++++ gradle/wrapper/gradle-wrapper.properties | 4 +- .../rxjava3/basetypes/NonoConcat.java | 2 +- .../AbstractDisposableAutoRelease.java | 2 +- .../DisposableAutoReleaseMultiObserver.java | 2 +- .../DisposableAutoReleaseObserver.java | 2 +- .../DisposableAutoReleaseSubscriber.java | 2 +- .../rxjava3/debug/multihook/package-info.java | 2 +- .../akarnokd/rxjava3/debug/package-info.java | 2 +- .../rxjava3/debug/validator/package-info.java | 2 +- .../rxjava3/functions/package-info.java | 4 +- .../operators/ObservableFilterAsync.java | 2 - .../rxjava3/parallel/package-info.java | 2 +- .../rxjava3/processors/package-info.java | 2 +- .../rxjava3/subjects/package-info.java | 2 +- 16 files changed, 54 insertions(+), 74 deletions(-) diff --git a/build.gradle b/build.gradle index a4c08a91..32d52fce 100644 --- a/build.gradle +++ b/build.gradle @@ -7,9 +7,11 @@ buildscript { } dependencies { - classpath 'gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.14.0' - classpath "me.champeau.gradle:jmh-gradle-plugin:0.2.0" - classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.2.0' + classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.0" + classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.0' + classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:4.3.0" + classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0' + classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0" } } @@ -41,10 +43,6 @@ repositories { maven { url 'http://repo.spring.io/libs-snapshot' } } -apply from: file('gradle/maven.gradle') -apply plugin: 'maven' -apply plugin: 'osgi' - dependencies { signature 'org.codehaus.mojo.signature:java16:1.1@signature' @@ -56,59 +54,22 @@ dependencies { testCompile 'org.mockito:mockito-core:3.1.0' } -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives jar - archives sourcesJar - archives javadocJar -} +apply plugin: 'maven' -//uploadMavenCentral { -// repositories { -// mavenDeployer { -// pom.whenConfigured { -// p -> p.dependencies = p.dependencies.findAll { -// dep -> dep.artifactId != "rxjava" -// } -// } -// } -// } -//} +apply plugin: 'biz.aQute.bnd.builder' jar { - manifest { - name = 'rxjava3-extensions' - instruction 'Bundle-Vendor', 'akarnokd' - instruction 'Bundle-DocURL', 'https://github.com/akarnokd/RxJavaExtensions' - instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*' - instruction 'Eclipse-ExtensibleAPI', 'true' - } + bnd ('Bundle-Name': 'rxjava3-bridge', + 'Bundle-Vendor': 'akarnokd', + 'Bundle-Description': 'RxJava 2.x & 3.x extra sources, operators and components and ports of many 1.x companion libraries.', + 'Import-Package': '!org.junit,!junit.framework,!org.mockito.*,*', + 'Bundle-DocURL': 'https://github.com/akarnokd/RxJavaExtensions') } -apply plugin: 'maven-publish' - -publishing { - publications { - mavenJava(MavenPublication) { - from components.java - artifact (sourcesJar) { - classifier = 'sources' - } - } - } -} +apply plugin: "com.vanniktech.maven.publish" jmh { - jmhVersion = '1.16' + jmhVersion = '1.21' humanOutputFile = null if (project.hasProperty('jmh')) { include = ".*" + project.jmh + ".*" @@ -127,7 +88,7 @@ javadoc { options.links( "https://docs.oracle.com/javase/7/docs/api/", - "http://www.reactive-streams.org/reactive-streams-1.0.2-javadoc/", + "http://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/", "http://reactivex.io/RxJava/3.x/javadoc/" ) @@ -151,7 +112,7 @@ license { } jacoco { - toolVersion = '0.7.7.201606060606' // See http://www.eclemma.org/jacoco/. + toolVersion = '0.8.5' // See http://www.eclemma.org/jacoco/. } jacocoTestReport { @@ -180,7 +141,7 @@ pmdMain { } } -task pmdPrint(dependsOn: 'pmdMain') << { +task pmdPrint(dependsOn: 'pmdMain') doLast { File file = rootProject.file('build/reports/pmd/main.xml') if (file.exists()) { @@ -201,5 +162,5 @@ build.dependsOn pmdPrint check.dependsOn pmdPrint animalsniffer { - annotation = 'rx.internal.util.SuppressAnimalSniffer' + annotation = 'io.reactivex.rxjava3.internal.util.SuppressAnimalSniffer' } diff --git a/gradle.properties b/gradle.properties index 27c3713e..f101393c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,22 @@ +GROUP=com.github.akarnokd +VERSION_NAME=3.0.0-RC4 version=3.0.0-RC4 + +POM_ARTIFACT_ID=rxjava3-extensions +POM_NAME=RxJava 3 extra sources, operators and components +POM_PACKAGING=jar + +POM_DESCRIPTION=RxJava 2.x & 3.x extra sources, operators and components and ports of many 1.x companion libraries. +POM_INCEPTION_YEAR=2016 + +POM_URL=https://github.com/akarnokd/RxJavaExtensions +POM_SCM_URL=https://github.com/akarnokd/RxJavaExtensions +POM_SCM_CONNECTION=scm:git:git://github.com/akarnokd/RxJavaExtensions.git +POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/akarnokd/RxJavaExtensions.git + +POM_LICENCE_NAME=The Apache Software License, Version 2.0 +POM_LICENCE_URL=https://www.apache.org/licenses/LICENSE-2.0.txt +POM_LICENCE_DIST=repo + +POM_DEVELOPER_ID=akarnokd +POM_DEVELOPER_NAME=David Karnok diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4a33c5b4..6cb04b42 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jul 05 21:36:15 CEST 2016 +#Tue Nov 12 08:51:53 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java index e4132ff8..8484782b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java @@ -259,7 +259,7 @@ public void onComplete() { public void cancel() { cancelIf(false); } - + void cancelIf(boolean error) { cancelled = true; upstream.cancel(); diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/AbstractDisposableAutoRelease.java b/src/main/java/hu/akarnokd/rxjava3/consumers/AbstractDisposableAutoRelease.java index a90d22ff..ce5ca383 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/AbstractDisposableAutoRelease.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/AbstractDisposableAutoRelease.java @@ -27,7 +27,7 @@ /** * Wraps lambda callbacks and when the upstream terminates or the observer gets disposed, - * removes itself from a {@link io.reactivex.disposables.CompositeDisposable}. + * removes itself from a {@link io.reactivex.rxjava3.disposables.CompositeDisposable}. * @since 0.18.0 */ abstract class AbstractDisposableAutoRelease diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseMultiObserver.java b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseMultiObserver.java index 2cb96f74..d0787e55 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseMultiObserver.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseMultiObserver.java @@ -25,7 +25,7 @@ /** * Wraps lambda callbacks and when the upstream terminates or this (Single | Maybe | Completable) - * observer gets disposed, removes itself from a {@link io.reactivex.disposables.CompositeDisposable}. + * observer gets disposed, removes itself from a {@link io.reactivex.rxjava3.disposables.CompositeDisposable}. * @param the element type consumed * @since 0.18.0 */ diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseObserver.java b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseObserver.java index 62c9adf1..ca1b846e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseObserver.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseObserver.java @@ -24,7 +24,7 @@ /** * Wraps lambda callbacks and when the upstream terminates or this observer gets disposed, - * removes itself from a {@link io.reactivex.disposables.CompositeDisposable}. + * removes itself from a {@link io.reactivex.rxjava3.disposables.CompositeDisposable}. * @param the element type consumed * @since 0.18.0 */ diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseSubscriber.java b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseSubscriber.java index 968185fb..dd67f450 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseSubscriber.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseSubscriber.java @@ -30,7 +30,7 @@ /** * Wraps lambda callbacks and when the upstream terminates or this subscriber gets disposed, - * removes itself from a {@link io.reactivex.disposables.CompositeDisposable}. + * removes itself from a {@link io.reactivex.rxjava3.disposables.CompositeDisposable}. * @param the element type consumed * @since 0.18.0 */ diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/multihook/package-info.java b/src/main/java/hu/akarnokd/rxjava3/debug/multihook/package-info.java index 8f91e187..8eeb9152 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/multihook/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/multihook/package-info.java @@ -15,7 +15,7 @@ */ /** - * Proof of concept {@link io.reactivex.plugins.RxJavaPlugins RxJavaPlugins} + * Proof of concept {@link io.reactivex.rxjava3.plugins.RxJavaPlugins RxJavaPlugins} * hook implementation for handling multiple hooks to * the {@code onSchedule} callback via * {@link hu.akarnokd.rxjava3.debug.multihook.OnScheduleMultiHandlerManager OnScheduleMultiHandlerManager}. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/package-info.java b/src/main/java/hu/akarnokd/rxjava3/debug/package-info.java index 910e768c..79dd407e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/package-info.java @@ -16,7 +16,7 @@ /** * Debugging support to remember where operators have been created in the - * code via {@link io.reactivex.plugins.RxJavaPlugins RxJavaPlugins}' assembly hooks, enabled via + * code via {@link io.reactivex.rxjava3.plugins.RxJavaPlugins RxJavaPlugins}' assembly hooks, enabled via * {@link hu.akarnokd.rxjava3.debug.RxJavaAssemblyTracking RxJavaAssemblyTracking}. */ package hu.akarnokd.rxjava3.debug; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/validator/package-info.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/package-info.java index 45e779cb..ce12388d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/validator/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/package-info.java @@ -15,7 +15,7 @@ */ /** - * Protocol validation support via {@link io.reactivex.plugins.RxJavaPlugins RxJavaPlugins} + * Protocol validation support via {@link io.reactivex.rxjava3.plugins.RxJavaPlugins RxJavaPlugins} * hook implementations enalbed via * {@link hu.akarnokd.rxjava3.debug.validator.RxJavaProtocolValidator RxJavaProtocolValidator}. */ diff --git a/src/main/java/hu/akarnokd/rxjava3/functions/package-info.java b/src/main/java/hu/akarnokd/rxjava3/functions/package-info.java index 959bce13..aba4c96a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/functions/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/package-info.java @@ -15,8 +15,8 @@ */ /** - * Functional interface definitions for {@link io.reactivex.functions.Consumer Consumer}s with - * 3..9 arguments and {@link io.reactivex.functions.Function Function}s without the + * Functional interface definitions for {@link io.reactivex.rxjava3.functions.Consumer Consumer}s with + * 3..9 arguments and {@link io.reactivex.rxjava3.functions.Function Function}s without the * {@code throws Exception} clause in their definition. */ package hu.akarnokd.rxjava3.functions; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java index d456af1d..e336f238 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java @@ -34,8 +34,6 @@ * should be passed to the downstream. * * @param the upstream value type - * @param the inner Observable's element type - * @param the result element type * @since 0.20.4 */ final class ObservableFilterAsync extends Observable diff --git a/src/main/java/hu/akarnokd/rxjava3/parallel/package-info.java b/src/main/java/hu/akarnokd/rxjava3/parallel/package-info.java index 0fd9c61f..6fd0b779 100644 --- a/src/main/java/hu/akarnokd/rxjava3/parallel/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/parallel/package-info.java @@ -15,7 +15,7 @@ */ /** - * Utility methods for parallel aggregation and reduction for {@link io.reactivex.parallel.ParallelFlowable ParallelFlowable}s via + * Utility methods for parallel aggregation and reduction for {@link io.reactivex.rxjava3.parallel.ParallelFlowable ParallelFlowable}s via * {@link hu.akarnokd.rxjava3.parallel.ParallelTransformers ParallelTransformers}. */ package hu.akarnokd.rxjava3.parallel; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava3/processors/package-info.java b/src/main/java/hu/akarnokd/rxjava3/processors/package-info.java index 7e06e2df..a13476c7 100644 --- a/src/main/java/hu/akarnokd/rxjava3/processors/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/processors/package-info.java @@ -17,7 +17,7 @@ /** * Special processors such as * {@link hu.akarnokd.rxjava3.processors.DispatchWorkProcessor DispatchWorkProcessor} - * and generic utilities for {@link io.reactivex.processors.FlowableProcessor FlowableProcessor}s + * and generic utilities for {@link io.reactivex.rxjava3.processors.FlowableProcessor FlowableProcessor}s * via {@link hu.akarnokd.rxjava3.processors.FlowableProcessors} methods. */ package hu.akarnokd.rxjava3.processors; \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava3/subjects/package-info.java b/src/main/java/hu/akarnokd/rxjava3/subjects/package-info.java index b6f35a32..41801767 100644 --- a/src/main/java/hu/akarnokd/rxjava3/subjects/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/subjects/package-info.java @@ -18,7 +18,7 @@ * Special subjects such as * {@link hu.akarnokd.rxjava3.subjects.UnicastWorkSubject UnicastWorkSubject}, * {@link hu.akarnokd.rxjava3.subjects.DispatchWorkSubject DispatchWorkSubject} - * and generic utilities for {@link io.reactivex.subjects.Subject Subject}s + * and generic utilities for {@link io.reactivex.rxjava3.subjects.Subject Subject}s * via {@link hu.akarnokd.rxjava3.subjects.Subjects} methods. */ package hu.akarnokd.rxjava3.subjects; \ No newline at end of file From 0b2e021b8fbd63fb40c1fe276c8fef09f7b70d5a Mon Sep 17 00:00:00 2001 From: akarnokd Date: Tue, 12 Nov 2019 09:33:13 +0100 Subject: [PATCH 013/203] Import cleanup --- .../akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java index b63be0bb..fe88066e 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java @@ -28,7 +28,6 @@ import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava3.plugins.RxJavaPlugins; -import io.reactivex.rxjava3.schedulers.Schedulers; public class FlowableBufferPredicateTest { From 5b4ee0902d7f3ea9c26225ebc42dcad56c31b545 Mon Sep 17 00:00:00 2001 From: akarnokd Date: Tue, 12 Nov 2019 09:40:43 +0100 Subject: [PATCH 014/203] Fix bundle descriptions --- build.gradle | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 32d52fce..11e15cb9 100644 --- a/build.gradle +++ b/build.gradle @@ -61,7 +61,7 @@ apply plugin: 'biz.aQute.bnd.builder' jar { bnd ('Bundle-Name': 'rxjava3-bridge', 'Bundle-Vendor': 'akarnokd', - 'Bundle-Description': 'RxJava 2.x & 3.x extra sources, operators and components and ports of many 1.x companion libraries.', + 'Bundle-Description': 'RxJava 3.x extra sources, operators and components and ports of many 1.x companion libraries.', 'Import-Package': '!org.junit,!junit.framework,!org.mockito.*,*', 'Bundle-DocURL': 'https://github.com/akarnokd/RxJavaExtensions') } diff --git a/gradle.properties b/gradle.properties index f101393c..20c767ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ POM_ARTIFACT_ID=rxjava3-extensions POM_NAME=RxJava 3 extra sources, operators and components POM_PACKAGING=jar -POM_DESCRIPTION=RxJava 2.x & 3.x extra sources, operators and components and ports of many 1.x companion libraries. +POM_DESCRIPTION=RxJava 3.x extra sources, operators and components and ports of many 1.x companion libraries. POM_INCEPTION_YEAR=2016 POM_URL=https://github.com/akarnokd/RxJavaExtensions From 76d6e384106e4a745831661d9b7b793d56bf711a Mon Sep 17 00:00:00 2001 From: akarnokd Date: Tue, 12 Nov 2019 10:51:18 +0100 Subject: [PATCH 015/203] Fix manifest copy-paste error --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 11e15cb9..42c5211c 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ apply plugin: 'maven' apply plugin: 'biz.aQute.bnd.builder' jar { - bnd ('Bundle-Name': 'rxjava3-bridge', + bnd ('Bundle-Name': 'rxjava3-extensions', 'Bundle-Vendor': 'akarnokd', 'Bundle-Description': 'RxJava 3.x extra sources, operators and components and ports of many 1.x companion libraries.', 'Import-Package': '!org.junit,!junit.framework,!org.mockito.*,*', From ced81d3d2c388a9b12564dd730a5197566fd52a7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2019 09:19:25 +0100 Subject: [PATCH 016/203] Bump biz.aQute.bnd.gradle from 4.3.0 to 4.3.1 (#44) Bumps [biz.aQute.bnd.gradle](https://github.com/bndtools/bnd) from 4.3.0 to 4.3.1. - [Release notes](https://github.com/bndtools/bnd/releases) - [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md) - [Commits](https://github.com/bndtools/bnd/commits) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 42c5211c..598eca48 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { dependencies { classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.0" classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.0' - classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:4.3.0" + classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:4.3.1" classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0' classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0" } From 7a0a869d62485680627510f2e1fd464c49717567 Mon Sep 17 00:00:00 2001 From: akarnokd Date: Mon, 18 Nov 2019 11:01:16 +0100 Subject: [PATCH 017/203] Upgrade 3.0.0-RC5 --- README.md | 2 +- build.gradle | 2 +- gradle.properties | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8584e620..e3c36c43 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ RxJava 3.x implementation of extra sources, operators and components and ports o ``` dependencies { - compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC4" + compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC5" } ``` diff --git a/build.gradle b/build.gradle index 598eca48..2a234c1e 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java16:1.1@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.0-RC4" + compile "io.reactivex.rxjava3:rxjava:3.0.0-RC5" testCompile group: 'junit', name: 'junit', version: '4.12' diff --git a/gradle.properties b/gradle.properties index 20c767ea..3d5e2319 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ GROUP=com.github.akarnokd -VERSION_NAME=3.0.0-RC4 -version=3.0.0-RC4 +VERSION_NAME=3.0.0-RC5 +version=3.0.0-RC5 POM_ARTIFACT_ID=rxjava3-extensions POM_NAME=RxJava 3 extra sources, operators and components From 72d1f3e817be2287d5d9a8a2569a3ab91ed6cbe7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 11:43:21 +0100 Subject: [PATCH 018/203] Bump mockito-core from 3.1.0 to 3.2.0 (#45) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.1.0...v3.2.0) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2a234c1e..bd476631 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' - testCompile 'org.mockito:mockito-core:3.1.0' + testCompile 'org.mockito:mockito-core:3.2.0' } apply plugin: 'maven' From f2d5d2a817075436e4465da8d0ecbb7441dbef8b Mon Sep 17 00:00:00 2001 From: David Karnok Date: Tue, 3 Dec 2019 09:46:42 +0100 Subject: [PATCH 019/203] Fix wording of DispatchWorkProcessor docs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e3c36c43..fe19df02 100644 --- a/README.md +++ b/README.md @@ -616,7 +616,7 @@ assertEquals(1000000, to.values().get().size()); ### DispatchWorkProcessor A `FlowableProcessor` variant that buffers items and allows one or more `Subscriber`s to exclusively consume one of the items in the buffer -asynchronously. If there are no `Subscriber`s (or they all disposed), the `DispatchWorkSubscriber` will keep buffering and later +asynchronously. If there are no `Subscriber`s (or they all canceled), the `DispatchWorkProcessor` will keep buffering and later `Subscriber`s can resume the consumption of the buffer. ```java From a737a3aba00ece4e6585bf011b283ee650eb570a Mon Sep 17 00:00:00 2001 From: akarnokd Date: Tue, 3 Dec 2019 13:54:53 +0100 Subject: [PATCH 020/203] Upgrade to Gradle 6.0.1 --- gradle/wrapper/gradle-wrapper.jar | Bin 53319 -> 58702 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 65 +++++++++++++++-------- gradlew.bat | 24 ++++++--- 4 files changed, 60 insertions(+), 32 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d3b83982b9b1bccad955349d702be9b884c6e049..cc4fdc293d0e50b0ad9b65c16e7ddd1db2f6025b 100644 GIT binary patch literal 58702 zcma&OV~}W3vL#%;<*Hk@ZQHhO+qTVHwr$(CZQFL$+?np4n10i5zVAmKMC6WrGGd+F zD|4@NHj-D$z)bJV;MYNJ&!D%)v-fQ%q0JG$_z5GVUJTPg0MHPf1TvicY#6DXYBBQ4M`$iC~gA;06+%@0HFQPLj-JXogAJ1j+fRqw^4M` zcW^RxAfl%+w9SiS>QwBUTAfuFAjPXc2DHf6*sr+V+jLQj^m@DQgHTPmAb@F z8%GyCfcQkhWWlT31%4$PtV4tV*LI?J#C4orYI~WU(cSR{aEs^ycxY`1>j1po>yDMi zh4W$pMaecV*mCsOsPLxQ#Xc!RXhpXy*p3S2Hl8t}H7x#p5V6G5va4jV;5^S^+>+x&#zzv4!R}wB;)TyU zE_N~}nN>DTG+uZns%_eI=DL1E#<--Sccx30gvMT}^eu`2-u|{qQZ58(rA2aBYE*ZD zm|*12zg*@J$n|tbH%Mp|d|O9W%VT~xG})R=Ld5z<(z%DOO6=MF3Xh-aF%9Hf$?1N9%8Pkev{wun$jZ2 z^i*EhRt8Ve<7`Wyz~iMZDye+XVn}O%qbhV`wHL+%P+n)K&-UMuZw^RRfeQ)%K=k*m zq5l7mf`4K_WkV5B73~MxajljrjGiJqpiV#>0FkyyrB)@HY!;Ln(7JJ*W(>d5#^ubU zVAkTMs*CHzzvUa^nRu0*f-(ek+VZw+@P~}a;;(K=|!9Mhv(~y-mlW);J zb&bB=vySHG`u?j&_6dh^*se*l_B3avjlE|!!Cb0pXyEXRbLy*@WEQ4|)M<`p8Q!rfDJ2RI!u1hPzNjy&)(kcY~GaD6?)7#dCbm`NFh?Y_g$#!+Qrie7%<7P}<-+W@{sxi4JYI{iY zk0(>m$DxOI=~-&eXf2bfh^&(U@o)>(iA1_wJ%B(+nFH+ceib%HEck32QL=J(BNFh`f>St1%llF8chX7#cp*;z}& zcTeXkwsXhf+e;##!FS2yi=2cChcYfzm$wQJ z9%4kAq)wLHf5wfcj!A|xDsAiAOHRzf*)Z-|daN9y5jK-*R{Q0?xaSX-3m|WeuZ`BJ z>eTi@uQ{OGSDIJ#Iu@JPtOy!C?q)g*6SHORg)eAJGh8b-I*X_+xNqZ|OXEsQ-RWte ze`zjjeV9PpE3ac2za+Rs=PA;%QZ>T{x(TRzwWLp_X^2yC-DOEMUy5So!npzL&-@}u z#>uK#&`i&c%J$!bsntEJhY@rF(>6eY;6RoI5Qkn!&<80X5+1(x$T|wR-ad?4N1N^a0)nBj#&EkVvQ?I_+8t*%l#VK&I?uo$ERI1HMu4P2rLMeH%m3 zZ|HA^*O^dA$gb$`Cw;z9?G?m3@nH6TNYJ04Fd-M2wp8@(;vAvJ ztFoni)BLwncQ3@cO*^+6u;(&D<;N;RKb)_NQ_Qu&?@h3MWvo>6FHG%%*smTwj3;dG zQJnT7Wb?4!XmV^>N@ZkA7Jv9kAfD-gCHu2i+!A!}y98SO><8g}t;1JOOxj>#l zM!?y|j5fR3WY2(&_HSGjgMa?Zif<M@d8W z)4>Ptm@zj|xX=bbt$=j}@a_s|xdp6-tRlq6D|xb_;`9oJlkYF1AH%?Pzv$eIAogMi zf(_H*5t({Arfs5XAPj46pjiudQw?dulW-=OUqBVa)OW9E;^R+NDr&LES&m_nmP>Ga zPf)7_&Gn(3v1qu_a^qW9w4#XIEfgiHOQ(LDi=E&(-DcUSfuQE0`ULsRvS}fpS@<)3 z|CbQSi49rU{<4|XU;kiV|C7}Gld$}Yh5YXjg^W$~ovobybuZ^&YwBR^=qP3G=wxhT z?C_5Trbu~95mOoIXUmEOY646_j4ZL)ubCM{qFkl1u*%xs%#18a4!(*b<&edy<8t2w z_zUxWS5fypUp9ue+eswoJSyv*J&=*3;2;q9U?j>n^q?)}c8+}4Ns8oToBJgD;Ug=y zOa0>{VFrLJutjR{PJmm(P9lPzoPi{K!I{l)pGwDy59p-uxHB9I&7zl11lkCu(}*A< zh492AmxsgwEondBpB^{`I*L&Ut40fjM^JS8VdAWQMlwc>_RUM5|Mjes!36DGqW`xs z4tU4`CpOk|vew8!(L}fEvv5&-3#GqZ(#1EZF4ekDQ@y*$tMDEeG?nOUiS-KXG=rAZ zHUDlMo@X&yzo1TdE6b6!s#f{*45V-T3`e2)w5Ra3l>JWf46`v?Y6B&7*1$eS4M(3% z9C~G@N@RXm)8~EXL*9IObA+PwD)`%64fON_8}&pqjrg|2LmP{W^<0@W`9s^*i#F}V;E8~`-}(4@R4kz?t(RjA;y-r%s^=)15%C> zbF;NZET~nybEsmUr8sH^Hgq^xc^n$ZP=GcZ!-X-Go7J4nByj8%?aQ`c{88;p15Kf>|0h+5BLkM&@KI-(flp^npO3MC~W@Uyjv* z6Hu!4#(NtZJ0*;_{8^xcLrC4-zK$BVo7S5V=eg?R8P;BOpK3Xwms+Jt-8R6us zf_rUHFYHn~lu!)U$e$#%UBz7d8YS;mq}xx$T1PIi=4={c-_cY6OVc<=){mOVn>~J$ zW*2PB%*40eE^c+d=PP7J@bqIX_h4u6b6#W|ir<;IlR`#s`Q*_Z8Q?*s_&emuu8D;NSiPX9mK?>$CwcbjhCuv zO&u(0)@}8nZe=Fl*0uMri02oYDjs#g$OHCZ6oTXV2Y0TrZ}+o%{%i)OAJBj2xHC|F5o+`Qmq`$`2EaL=uePwq%k<;6S2n=w%_9vj$8NO|{` zTEg*tK8PU#DnQ#dQ2mMJaaL|HV;BCn?eQ%d0vY@S7Pu@7 zsf5u`T=bL7NfyYO?K^PR_|jap@K|qQ zmO8CK+&O3fzgEnp2|_=^K9ln~QhxjgMM>EQqY@k@@#np@FnZq|C{EyEP7^NurUm0q zW5rKmiy%__KE>YItATyMhE({0%ve10la=mUd<^AcB{T_$Y`2_N-x;F#3xTORXvhPZ7psmqhXy?WxxB5w!m*4&Q;?t$4Kt?m_em-htVDxora24&6~5z$MG(RT{trtp(L( zy&VDT{@p9_DGoq+I|abw$E!TyTO7j6dWQ25dqdKV*z3E?n-p|IG42ZUnNok? zY4K{y{27bUT@#|Zcni!tIgjE`j=-0rl(tVlWEn>5x7BJBkt0iw6j^4n1f2i^6ebo; zt^&Yb##}W0$3xhH&Nz*nANYpO$emARR6-FWX;C?(l7+}<97Ay#!y%BI6^st=LaJ>n zu{ORVJ9%`f*oy85MUf@Fek@T_+ML0-0b$lkEE2y8h%#P^X6+cn)IEXa@T7CQ{fV z-{^wJGN*+T!NsAH@VNM3tWG;%y{pVF2m z2*0+i?o40zSKVq_S18#=0RrJIse+;5cv#a`*`wNs+B%Ln8#e0v^I>7a_33h?lHo14 zg)CbDfGMyH2cj%7C`>|Rrg;U?$&y!z(U10>(dHKQsf9*=z)&@9u@w%y+e@*CnUS|E z*O^cQqM*!sD|e!u(yhXPi$Sl<$daf3sq@Iexafxt3F#2R&=cK z!gT-qto{oVdGUIxC0q`tg)B-Zy(pxGx}&svoA}7p=}jb3jEjQ!v6=afKI!2`&M{#tY$~3LR}#G#U2up2L{} zMGSX>Yjg6-^vWgeX0i;Nb0=gQmYa!|r0rRUshm2+z3AlehjfTqRGnRAmGhHY3`R_@ zPh4GAF@=nkRz;xMO3TPh$)9Iq?Fs5B@~)QIntSyeBy^10!ts?9Z@tK&L6xJd9 zNzaaz6zvrtr&MPQ@UD)njFUtFupwB zv+8%r`c@#asm}cKW^*x0%v_k3faHOnRLt7vzVFlqslue32rt(NNXnkS+fMSM&^u)8 zC`p{on>0pf=1id|vzdTnBLB;v%*ta`o_lzj21u+U-cTRXR%sxE%4k<(bU!orfsJ&v z3FLM2UT_*)BJm1^W;Z{0;z^_e=N&QXSO>rdB`*cp>yGnjHJt$ zcJd~52X&k1b<-`2R{bqLm*E(W{=|-)RTB*i$h4TdV12@beTkR&*iJ==ck*QlFiQ52 zBZ|o_LP06C?Sgs3VJ=oZQU0vK6#}f9gHSs)JB7TU2h~}UVe%unJA!URBgJ# zI~26)lGD4yk~ngKRg;(s4f@PccDZaL{Y=%6UKHl&k|M@Zc4vdx-DX4{belQ);URF? zyxW+|Ziv}%Y!sFdY@YO))Z|f34L(WjN*v#EfZHn6m)X@;TzQ@wIjl4B_TieZY}qY`mG}3VL{w?; z&O>sZ8)YnW+eLuW@rhClOOCZe2YP@4YWKN?P{c~zFUj*U?OayavPUo!r{uqA1<8h! zs0=rKKlwJYk~34F9$q6fQ&jnw_|@cTn{_kA8sUZ#2(Lb@R$NL*u>08yYGx{p6OeX~ zr7!lwGqMSury(v5=1_9%#*MORl2apGf(MQIQTMN35yE3l`^OS7r;SKS6&v-5q}Gw* zNWI*4OKBD&2YbCr8c{ifn~-9w-v+mV49W+k)$jjU@WA+Aok01SA#X$Sspj}*r52!- zNqOS<0%uMUZeSp+*i1TEO$KGKn7EwzW=s?(b5X^@3s5k*80ns2I2|bTHU+bWZ$x;j z`k@>)1G#JgT=F!8awgol?DqK^S4R*g?e}2rOYRVMUKKxSudO(hOLnnL zQqpxPNouLiQFYJs3?7!9f6!-#Pi83{q3-GgOA|{btKup4fYDu-JFOK~Q1c3KD@fdJ z?uABYOkHA^Fc~l0gTAy4geF<-1UqdS=b=UM6Xi30mPhy1-f^aQh9H(jwFl5w*X`Mh z=Ee5C?038GEqSVTd!67bn9*zQg-r8RIH3$$ zf8vWEBbOc`_0U{b)t)Toa~~<7c-K_=G%*iTW^?6mj9{#)@|# zku9R^IDzbzzERz~fpxFrU*it;-Iu&m!CAtM&$)6^2rMyV4 z$+e!$(e)!UY(Sc9n6hkr^n&cvqy8}NfZz+AQc8fU9lNczlP>5D3qzWoR55YvH94^* z-S%SVQ96pK3|Yo`75D&85)xij9Dl8AO8{J*{_yhs-KtsLXUYqwieO(nfrkB@%|OyI>yF+1G?m7>X&djb(HBNNw3KX;Ma*oMV)cV0xzxmIy+5>yz>l_LLH)VyRnYYce zw$?q!hJzX0TlE0+o5QJDM~sPrjVCN7#|32#rUkc>?-eN6Q0RqQTAl~`&isrQg)ass z+x5XapaYh{Dj`+V096?w)w2!Cnmh?x1WmFC$jEFY4;V)XAl3*tBS)V)3TbL)g46_g zCw9pl^!3OCTOcaEP!?==guEAw;VZ}fE6K-;@qD-Rx~td+j(N>)Wv$_mqFTH_wVZNEEuDG!0T`HXLsf+_E=X3lw4`_&d5&YMl%H733ckO){vZm znFLS`;5J#^`5~unet`V#*Y5In3yb|Ax z|A6b^F37!_z$_{6h{7l~<{u7{Fx*A*#zw{GD)6e}n6f<|)&7`S-txiz3Jm4S5hV&8 zm|Ncc{j_~`^pQ*I#w21;(jwi8GnH4efO;R|r4$tH~i;Bcmp^sP9) zjhJne@yzU&XvFNoc~i(wQ?nE`o6Hk~!;x(%xh7?zvigH2g`!v8L-vEN0DvV3?m( zSW(TZ%2AWf`rS}GGMqUj!8yCp#|fR--Vxfj=9}YD97Gocdj=S z0zkF-jsO>EcPTB1zRO$++k^bH%O`=UkHdHT^5?{$)ot<-K2XIE7js*4OjF)BsVjCJ z*KN)!FdM*sh=fB$p8*EzZmGJp?B_=a-90$FI{S$LLjBU$(lxUj;9 zIBszmA*129W+YE;Yy{J~3uyOr<2A(`*cu0IJN#tmUfz2jIWQi_h)_-V6o+5CjbX!1$lz6?QYU za&|O#F%~hmGUhil{M+J|*0<3&{a1%ONp-^!Qx*LOTYY}L!r9BbTxCjHMuUR0E(uH` z!b$*ZMdnB{b2vsb<&P6})+%O=%a8@~$fjbtfF@Z>^Q@enTOJ%VT)Rdc!wX|@iq9i}HaFZAeY6g8xGZY7h-r1sy_<#YU6}I?L zwvf0ePE5PKbK>2RiJOFO5xNhMY+kt`Qi?Oxo&@xH$<^Q;Nb(&rjPBAcv;XtmSY90z z;oIFFl%lDq$o&kYQ;aSHZHD@W({Y1hw<-I>7f_X8wc?%hNDlo~Ig;63RlHNhw~#R3 zA*f5D_Qo`4_ajY4Gr{mLs*(Fxh(U%oua_u3r%`H!TI)@R!!iqV8IOhIOzI@=7QJ=G zV$(9mEVL(7DvPn0j%_cOZN|vvNg8*PHma`6+oS;PDz%iOFyo0n0e%$<#A3r~$=I0T zDL*{AREUGx&C2}?I9cVL`UcPyawTqA4j-4%Mr-4`9#8GX1jiJkKGpHVr1~Rj#zFaZ zqmE!<|1JCi!LDG?1^Ys62xz(p;Uu!QZB7!C0#piy1_9=e?^s@-sd1gs!h$;Q`TNtf z3N4Elsgl#={#U`~&}FNvH78MLjjavl1x*4pNVr338>%sfHu>bxo2#eZN2ee9q#*Jg zDk_=OBR;8t6=pBN0aj)&Nj}pzqqUYW(tfk?bXTdKbNQFSUMCyN-!b0#3?Z;ijzx$M z^Eo6Eq*NO!Y8K;84H4MHj_xwBYc|3>+D(PFj7ejhECG@5@Pk&8dG<)HwwO2~j7KV6 z0$s}=*D;ek#8$a*sxVlC_`qFkM0%BQQ@v2H&Aq@G9XCQt^^x<8w*=MbZV)@aPrrn; z`6r*&f`x&1lp)`5>-|-4%l&W4jy~LydfN;iq?Y8Xx>Sh#2Lx@FXo|5{WKp@y-x;)7 zl;;_Y*-Nu3pcH-)p0(tP~3xO_u~>HpCdEfgyq7V-!ZZ{?`6v_b-vx< zuu|gm5mG6c@D{FYMLuzvG+A2T&6&`n>XM%s`+Qtj)5XdpyFOnz3KLSCOxaCEUl()M z3b~FYqA3FT1#SY{p36h%M^gBQpB2QzEdtM9hMBMRMu{|rf}(;S85&|A!|Aj}?fMKaju!y>_AS}#hRe_!&%8V=6+oPPtE zOOJ-Rcrf>hNq@lG{{@$H?6ikt@!A2OePLe{MBIWSPz7{u(I} z$PXzD;leHG?Xl0FnWt+Wrkrk*|e3P~YVF@N$y&L929cc=#-!*k)HZKDo8!#+t|?9p0z1KSDKclB&M6~hN5<9~^DIltXKR$+iK*h9k$|@Qoy9H}PSI;b(v>w`8(k70@sfa4nRweeiwZ-syP3zPSsyK_8Te9*(FQdm+ z84ZDah4PGehH72w=Q8bx;pK5juT67rJKb|ovD#COI^l6z0eBidn$!Y?T2;5sN+vTV z$`%Edb<%-Oq@NPZy<2Z3m;$}!9JzIuVK6;fJi>>m3q!Lr!2xXRq+l0LvZIR_PNYrP57E#sCvD^4UU2GVr*Rx`QcT}yQanF z3i~!-2Vkk4S%4Hd2baDvrM2g(&1jZaA1!vLi!I#5wX6g^&PE`0-TovM(%wuaPXAno z`a&j{ai=TsgKpc1C3|)tY#!4>SPBbMnchi}glCBwaNE(4`gi}JY0;`|m`s{HtaP@& zHxwCt#2&z9A7O+=v>za}LW~}G>_tWo$dsRX)f1L=+tZF5E&RBA#jUC|N9ZPa_&z5= zekCOsIfOh`p(&S8dnkE~9#(;BAh8qzi5JYT0nP7x&Hga3v`XFdRN|$5Ry#mq*AN$J zV)l~LSq}2d{EJ@%{TLnkRVn*sdM{_b|4!x73|Ux9{%S;FPyhfZ{xg;P2ZmMuA*cMG zipYNeI7{u98`22!_phwRk|lyX#49r%Lq1aZAabxs6MP79J3Kxh0z1E>MzLS6Ee5u+ z@od~O#6yMa;R}eI*a|ZB$ar0BT`%X4+kyxqW4s+D3rV176EAsfS**6-swZ9OIPRZ& zlmIH>ppe;l28`Kd0z(alw^r<%RlDpI6hv)6Gs?GIpffKApgx^)2-6jAzjZE0BtPBC z0z8!#C5AP${zTF$-Z^v%^ie8LI*rvR+*xc=>fa;`SRUSLAio?qL;jVFV1Bw4K>D+i zyEQ}vyG2HTx>W?Ul&MhxUXK7n;yfN)QS`foM!4>4-(PGwxW!^^UyKOz(v+1BejI*& zQSkV|m5=JF4T0k*+|h|3dx`ZKBVX7H4{5iakAxnD#J=9igW@LS;HE_8$lZy1l|$wX zn<8-$u=7&li+^MB(1y~Mz7lj7?oYf%1k{wT#?(Mep094qqnPv7*OYkQ#7$pkU5U24 zzPLEwAb<VIp_uUE~+r5)jt(>>Bg48_{)twH$QJDSBrUS!j{lX z)SK$6dfLWt)c9%Cml+sRp*OHXB?e4hbYZQo!@=6 zBPTpi&6&atD*#Cn6f@5<>79Mq7o0^E!NH)bD26g}?@qg%*AYeE6Tec@F?y9Q8i}^s zz`)l`8>;h75!kL!`&*_hsX1%2)(lWr|7!}@gn%MfwY8vN0=pMm3WesCRv5e*5m4z|u(zbYCpuxO9$bY)hkL|}mRj{3dlRgNK)#PJp#vR=ka^TZ(tKVI<>M~ekIfd2 zm3UDUNW*ZvS5L|SF334|YD>LJk(EqgPpVxtzwclUNaH70zWDVt^1+cz|F?RdF4HHn z@4~Gs`lj!0dWi2n#>7C@B$Qf7|t{1!3mtrO1H7 zi{=I#^Oa1jJiFI!j>PualW+ncHJ)TelW$bv2MqUG1xK7R z%TsQfTn)7D3}XYU+{?Hq!I&fqi4>DmryMiO?!aN!T4fnwq2vsuB^s6fPW@u*h-JwG zNniJFR(RI*?5HV=tqO)lv}CRv_eNEBR%z}Vnftv0+DUH^OCODH#&;{+aw^1vR z-c~|Mk+o?j-^Z+rR4s z-gNA5guTuab7N`{Y@eT&)!xF8#AeetvQ6d!W4BlO;0#0TxS_( zMm-A-u+h7-PjmOQHlh{Hxn+J$jh?uEtc8RG8tu->og@ z86A%eUt+P8E3oLXIrq#K(nCF@L12>=DVT3ec6Vn=B^B;>D=O%op+0BT;T)FHZ`I93 z^5|bpJC_kB92`alM40Am>Yz5o1gxkIGRYQ)x^+R|TCK)r;Qyq6+~S9Uy9nr^nkvc- zxw~#_9eBBJcZNK0yFZxUK4h>u$8;4k-KpNTblRgS(y&u~u&J;O!aqAMYJp+(BED*d z^I#F7vPOEADj}Pziprs=a{%qgz#eso$j`At7pN~bDw%&ba-+4pI}T*?w-z^_~DfD~Z3Tg+#M#u{s&uRF^dr5RFZh7<|WNEG;P z-_SzXTbHc^yD$r;WJqqJkA7^(zN`nzQ5V16nG~Zobuy)a)(T@Ik>V!qOfw;e z)?AZXjzDJg%BkIEY&bm&BczLuWY~k}3Zyx#)jxg1A9R`sz!_dCb!|13b*3PiA@(E6 z9HmG2R>-YrW93UMQO}XE4loI(*er9J*wDUd1se!pzdpoB_v6^lQl}+!6e5MS`+bU#_b*a5Pkt;o+lOV4loyn2P z$3;z-cX>$R{6M4q%b}aMBF}6N+0RCE70bB;XwHV~JLO&!EB)Cgo9ta_>>Os1HNfaY z4PNu7BGhw`6}cm>glh6i^)Ja{rpLHix?C?u;(e&GI{?!E7$9hd*5c^iL?;6Kwn z@qbBE|3UMF|F$Ok>7YY?CeMzMes@CZJQ?&|R8v5M@XvW}jjxhjl`gzl;rvy6Nn9$K z;1TKGpUgZs`vR!t-sD~2ar{58-;2k`H(MIWr_cujtSCpjue(R z(a7R{q`G+;8qD8D1e?1zWv+pPFtk=k#>f`yqZo)3KwCBgABgQbq%hu4q}h+Bdyh?* z#Rlr*$38^Ru%m9FUTQL2Xy^j|f%*4H*{zWFRsMbs6@u{JM{48fq;F;QFV%6Dn!6X0 zEAr2G{RmY8;Jlmws#%7Hl_TvQMbLnN0KGK=9)1u=Vb&#V27UwM#U+)$hn#hlXxBxO zM~<3s(W;fe-0%mVWtZ)oN|h-01@5z=u(z!V>)I9-IepH|_q6NR_DA>2hxGKt-QX;H6(^FXwcBndi1s%qn2sH-rsuON7*ARP6Qt$2XIy3d#cn8sLh&7#USTFn3 zQm-o6-Bnofon2V;oq-v1@Ye@NuH$Z~+th}Cs>F7=H#=4PKLp%-!EwR&0`a}XL=br< zF>&?HNr}9ahB-EA7a({^_6`taBwmB~hJG)p>8r^vq0J_+o`sOq<{s2~2t}W&1f5`l zj;E0nmt?YRp{ONhti9{4&rvt5uoS0CO@%+Yv>+}ROQAGP3VLu^S4fe{ZRoGviEXMF zhM=I=Eg2~^5PIwEq{~Wt?inz13!axZU3knx_)Ey9<)z<=!TnCPHvs1l^spF`@INYQ zY|J1RWri-^D9mVY5Z{u+bXg#}3rUwSXX>&@PN+017W@!L5H8CvZf0wZxQ=UrHJ{Um z$Z;~3t6ARGql*O1^YY(h4awy!h_brE6&k9B&5l;ya>jDyW5?o$q~=1iV!t7#8&QOx6P zhQIm55sij*Ef-G_?k^$AjK2j?=QQ?^=r{MDaGZ7`Yo*Kp1uoZ=&5|O)D#xAHL)n9_l6-E!b zVV@8ny;`XU#X2((4cTmv5unmYzUmJ>Hm+Kvht&a+j3nr!sljTHUZn^0w@L|WKw2TO zRO>T!>jutIzNI5U_KL}vd00oi6$aJqPeJwq)lIr(2Gt#52i@sqCFaWC)pS$pYoRCK zd*$)r6FCClYp+n>gCqVF>x)ghAbl+h${~Mc_sQGk@+sR@b(88l zcx?*Usr}v|kV!RPfS%HK>Bn{7tdEV$CB5Z@=uy4>^(o(%@R|_7dq69s1(X_8szPZ! zSS~$LCX>-}F=io=YcY~9!vqo3&dh9_Mosio`zO6i|$&p;-9%+~sdYNrVE?Q8rS+eHx z4O$l|b3FUT#2jb(WU<`oKAjGQUsoCgE1(c>3byBNPhKeJ7f4S-hBRqRyePY)im;>H z)hyFuFTDqx*ZgXo$hn+u>TGs~=Bjqr3bhPmXG)v8){EU;N*58NKU5;EIZl z9%|JomX+b6M#jS2`B%~!+`EStMD{|y^P=`xPbD$o6;|!((h!+y%7Y{DuC!NCKDIN1 zER-J?vZ$2el4y~!-0vWjNRoC|ARB`IX@M&;?ZpULcAIu`zlH9 z&JK#H);Ij~fqoT{59}OI#ViA%!lPYyd@kHg*hyI;iMdCtw2&eLHOd1*N%2Y!BG*H_ zu@E?VbtZlI{7B{C>A^b3njh=KdF!=rQ!)oIjwkP{t^I{2q&emQ-C1&U&fPC_viACTbT;(A3qRJeGINz^!0N26vQ~o|#pmjp-Zq46%+{X9n zLGKqhLh4`-(*oDHqHU~-45_+pe(BICF$*0jD&FW?ED=vn=t?p9X(%AH9+;6NcJ8JF zASkf}LfT7Z3u*#i$ml`gKIS>3jrTla--x##EDM{w{>Iu9qV!x95ECU*W_O`q>hcCa zswU!;H3R{}(A6aQ(B)lImTF$BzF;$V_?It*+8ZeiZa|b8n_DN4jUfI0jIA6Q6*c0f(uq~DxrNm!$~G=Uz=qP*)?qc(}|7MQZT&B=Um zr{Lj_R7QJAlwD=CoYpjQsUyu1)C9p5CE)%3nb)~WtP;@6(qGG`*qDT zS(zM>&R<;Z23V|80%3s!`0QpTt0Ay;*xLJeE|DP5@x?a!1)`g= z-1}G_LxiiO(*?R*{(yH#&yl|Seyx6*+ETayQtv7Htk3WPvI;U!@h-e$)gw9>pyKmB zk8#$3BF-ou%=`9_3)Q`0ttk$cymvULFS`Khmjes=2(-QY@eVjJ)rSD)z)1No&o+dz zrGItPZ$QuD;Nqt~U{J?9VlM0g{kx!4$?!?=o?um>#7tjMzrLfv<@pI&cp*5H>XPPZ zu8Xh&6y7v0pGDiQqd-~tBjK%-SO8$8kG&44|{09|FO5BoNkV6~JX>g{b#NHJW?gmM# zhbcS|M9fDc44(seG%$hK#va#4YL98mddGDi2qr;@CeiWO!!`DrF<%=_^*3JgoZiSj zdEv30G5`7ex`XP4#6cG;AQ}(|>CcCTGiom^pc*j-Mz1_oGp4iP*>N125YeWCw#L4H z*>u2Ih8jVRJ?rOj-7KbU7KXpYs2UZf)Vf}(lsM(oiB>tgqX2tILJitw_x z&7gq;`b}qrL{lEA3DaXDOi~HQ!^?xxjjVW|#Z+Ek&GKA2dYgO@zB2V*eY zx>@D06X)(FUz3xz99V3v*k7x|wxiFxv>=N$1Chfp>CErJq)gnf=P!u-QKrYnulzdQ zP56u!AH2^QVnuxTJjcQtlflq>PSm4C!$^fv4V_XsIO2d=O8|J`4bUDtjBchJ!14~3 z#mgUPYF*Z?k;Y)Igdx3yQg8L)M=c%}p3!P-0KOuXI+{*LXJ&w)$gzxeTyr`)h-Nc! z`$xa<>T2pbuU0VR?#FPEM44XDRw+cM6U1R2aLQpGHX40=4Er=lp&2aN#P1IA3|r+L z?5jaRyCgN)b(KuS+(x9rPLLjY&4^YY{0T2Ai%`f0p}sG*R!}{DSf7GdPJ=C2MT1ND zUJ@#y06`CNc9n?13R2KY1K*SYeV87wG%bjcIbn+AR8*FS<{?wWomTT5@`}~z3bFAJ zLR-wmE$iwwJ-TnVEhl{{?+??DJ?DWk~VaX-L3-RLtprT2%z-GfD{UVBR~T}zymA0 z6VZ;1Qr%5q#+Oz#3)`D(%WVWWS4BW6%ZvAtt!u25FO@e{X`)_LH>p&pFzx(wvNEO- z!2$Z}`iynmY2j&UCmRNB)9Cn3MXRls&PFVHzkzr;)B^BCMY~6lYY>0rsKT zm4}RV`Q7tbn)Aseay%@-I6ZT~PBsO?D|>kG*%(PGo=|gZ#0zsmE})xxtAvaCe&$1? z(7GyH&^jm!cguuMo@CPA&-lrdE&Aq8GIOuUK9jt{K0ldcvJJp7I`ZMx-EYj$)hl~) zFM!U~HxgO+lb$1cIK-nvz<5OPs(@d4tB6DUa3?-bJ98|dv-kIdtMS;9BuLc{a~_wW zO$u`rNymsAeMH9zh(|w=<*V z&&B{&O0Am`<$iBa)>pNZ6cO`d^3B5%=gmsH(HYZw6!U(c@}#)19F}`BT+yOfamJY$ zYOmy2m^k+ADH2klhAJMLq;6>t3)NREUgk*cjJHg{NBkVhDORNK;v5362&NN=y*Ef- z$vxYTG5Ga{SI&C93^Gsu9G-osqbC9PbsC&@xxGlF?o{!rs9|YpEE?P8ix#yS`7JUy z%ez(_Q%I^RwPrW%rFF(+mE}rp#Wtg@^>O7T(@LFA7j{LNrL=XGDyB-|3<*mqLL_UA zUZz?ulF$5O59-WWZ!d@hRxC@4d6?okW%`1$#<5w9eh>4Cyr#xe5%VPG@TBe#HA^O} z1&q{T_TMTr($f<()ah%TXapiGp}`MAC7>0I=Cx*t+bXy+gMyk*#(A~ft=&4YBdQki zQ}I=c;etc@sD4?l`eYaksPtJnx5OUaZ6u;7p64DUuI`omrWjht5$8+cqb6Hw75WNX z@D(fl7tDl2H)H%QYyX3>cL0*DZPv8+ZgaP7+t_W}wr$(CZQHhO+qUig`^@>y%s1~j z6Y)pXii(P=SQS<4iS=aOnR(rqe#b*BR~GN+bMNQSnhcMHxhVf6D7_zYs}@oo$eK9sZig1_lH0|C z&<1W;8dh6lutS+|02t0VqRfh9R+%!~9YsQ>cw-uGi!YMSo?19?Sty(u{GRqmTx8Zv zLz|nph}CNn+4a~dDzMog(j+NForDvDjLwub!b;p@dLHSBO0kjaI0CPZ)8B2(HNL&A zdr8Pw@u(POF1J*groJ~!1|E(GmnR3L6`P*3C;v?R zDw-pBC=u%}<}P_);mn-_cE}am&b1_WlqnWVzFS;*NhwoOb%+#0nI|H*Bw6_0R(=Kj z;7@eEqYkW2OvWkoz|yY1gZAJw8=>KShthS*ANzYdDT61^AK)>0H%LV4q3}hw?bkA$ zF$tz;<5T59v0Zd$)unmJ{vu_7eGDP6+pe(H&n^3E)g^rB?pn?GT9l1gztAUpR*+Kvt=FE~M zq5rZM&9v>ww1mzrK)vx*0;;?tnqA@Q;FBC@$2~=gy#jW$bAJUNIl_YpT)``*9nnkV zF!&XBK8(PeQfnScH*JaYqy{1bN4MwF=&g2)`!Kuo165*d^1Sc_d{I4>6V=>74c%g4 zXE_M`b@syq%jQx9VRp@ba!rY|MRhr!S3bN!1RT}^I(2gXE`KT57Y;maGA&dHM#`4* zy%@6YB0A6Z^?fg!$4Gq0auM47(jE$Y4osH zhydBwQ-S~vMS7)hg;AC=MRf~AHZu|Ue*bk=ff`!Ol1%=|W-a+~l)QH04q^oeMZHj~ z8$8jQn(n1#O!_7sg1hi;{v%?nd&gK7tfN3I{A0j zcg`ISk^Ir4G=(SvV$v}DE(nE+%rgFkT%cu5VR0Qa^H4-xPC*7Y*+E8#xvyepS#xYE+FyIIi0|5$J%mKAB58%MgleT%Zx42e^L`TdA~Ips z=NvgHNpYZju?*J>oNcmd^(nFUc+-bu4*+9)qIwU^g?1_4-&-`uZm&f7F^1?@3IvJc{gnlh?no$E9jFIfJ8i+33;o-!b2hD@}}{o}J4{l{44v z3Cd{3Lj%9^E43SBXmIvwsA2_8sXgRu=4=H{j9R(fYcCzOXriTZ51l+HcXr@)^?rK* zmc89=w8MW+txdobBh`X4rMvY#vuv0GIEO67sgL}mIw$pNW6s8Fd=t z@58{pFs^Oz&g}CPr8EL~QyUjk&}1qyO4;-6m0MRd4J9T2r5_j+YdeKP%Q+jnWNdV| zUJLU&d%m|g&3B83R^8K^WM{0at+=9UdVAzTnL+CqdcT#($38|-fQ|BJbHY4vk=ANj zvX?ek_oYp6t8bQz-T){|-5OGrv`IGd?>X*h(s{MvQ{j>fZbx<^-)&(j8(N+z^sftB z;V$0+Wd0oUR^&)Q+2bHfLt#V~jZT$UPUbkd#vD#zZJ&huG+-;T%sU~ONA?a`Va|T%I0yd%0*Xr3>p#slVg7Y<6o&Bx856S zg;7Q>mCFF?xq_m}VG5`(0fIX(V=yvQ;xjpwNhrLFMui8xdBw2aFOvI3t6-NG3%+d= z>1un%A{1+tFrn2nu2%`-hiqYhXDga3%{ZVkC@ROtTcA;g*E@K4i_G1&^P#Pl_9*m& zwBVKqZhrf4bhw@M)78cm zBMB!;A)H{6h6AjEv&|DGxYRmY|e_ARf_dMIvm*-i4hR#IU_#A_QYP@L|sHs zo@Ky_Bx6e2??_k;7vjibD#pM*T7`h9V&s(moOn_x^N|9{gkOtFY~gDqSo+7meUjBR zK2jiOsA%PwD|1*KC^m(-WZ5j2AWi;81kCi5t)KouHKt|R6m{m!!n|4YN3yyBo0mSZ zN^yj9>I9Y6dI&$!T7&$%3Ccxua0-&DoNJFbCV%1;h^-U&1Q+@47qrKld+QNGOrh{a z27PfD|L06XuL1+ZMc{_7rB7bd&WD%*lbypj>|K|<#2#t+qPXH zTm`5QC)ktLW5+G&4lhvX8DgOK)|mvQ_b^HuJ&=wP%Z6%;E+Bx|#|Q}vOoGR(jK}sD zk9x4A-V%Hs#G>J5XldT-W&|Kv(!mEi;J38jdK>L|Q7~<_no&|~Fdc~yhC~%VqQc2e z2|pva(YaxgaE`xa5=u=WkhtI|f`XRHhA6|>1`)hDgYzt9kByS$l*OQ2O-a#Iq%SLz zV^&-mn{^KrM6&BueyiV}>&)9rr)de2+DkV8##PSmko(<`nqPVr^n_V~UoIi`_yVdB zzcj4`b5QijKNrR%0AYi<`{NDb!y1^#Pv|K2N8<&wlO7-JDa5Yp?eM)pf>PbMq@)Wr zvki0Y1yLr2WfDb`RBPgq^VC(KH;ofR#9^i$TaMi9J6p5TP5F8<&ofnvL|`*(;urRO z?0k?7WiOd&^v);ux~R9Hznc3moOxE+O$lYV0Ku|hENFV~?Lt!QZlMNp1%d#^Rv!pC zfq`*V)n<`Io8N2XGBOjLYB}#{g#>o-?Hmb6$VyvSN@nI?3{y-pdNvcYe%&%CIeh?s zWfdM@$o~R)P|M>ElHW0BAMI=ozdH-Fle#Dvq-bpmPg-!rDY|1*o|1dvDh9{`{gt%n zFemDyrWMrywXJ+rV5r%UR~0T*75`i&rM4=%7}ulJyHu{rZw;C$r+nn@cLyLgh0d-A z(3SS5tW>ZK0in8bOH$vW>HIcipgUXYGUq49#>Ixff27cCfWz$0vR4Dmq}CBw<~4Sh zDe9adM$vVItE_)3FJT5Bgk}V=1g+Qvf5+hpxwh78gHe$<|r1^Nh?B&_~xSq+nVdY+~dc4GJ?e5EpV zXs-H~6poV`Kh5kok2qSUMD?0&WXKs7T0?Z-J8zti^WD-*_fo zhAqM(p+l2*(|b>aZC+?aK~^_VCZkP0>}TxdEC-KcmAx*YS?wTK?cW>PjS+NxM==Wg zg}e_*NcH%2(J=+WVL+;P)kz0c@48^4ZuemowCO=rriJFSD|#7D2oO{}$kCbL0#0%2 zQe&D2wwJ3%d|+L`bE=&9k_~(BOe$ZFap$YMGL$&$D0=mJ9n%He#RRlC3f=|WyrI0L zA_qS=kzzw8f_QiJYg_b?xA6UgBS0tT_Y$!9>(J-Q|m=O+8+wIPlb5i=-aU~kBf=4dD zd6Q8*EoKqRCcMNO5q%nez-osz1XT6PZ+r7r7A_{!vpDIfE$$yCUU66H>HOUO>u7aE zs*>|KS24COy<^3O^xXssCI`2iF%;A&7{j1UDk9dvv< zsUbj2HMoFr%{j!bRrmyt%jM|4UKza#}%Vf*_fEvi$*6J-h}oRdsdinr_W1-)p24zB*p9tfDdUa27+yi5W`#8+~eE_NyvNZgCP48jF8P; zgYS#IP!@sLe^SeCy4jwre}sC*A4Vk3|EzFISR4QEai+j{bL%-B#Nlt4WJN3eh+Uo) zVtaBF&A%PtbaaH`A~$h0I(5#|WARn>4Hbxy+Jn-$LdJWL+&({?oGdxCC?@gw`D44O zZ)fV$Yi@4u-zGU|!cfh6Eq?2C3Nn%TL2ZoA1+5g5O#q6$QGS|1C!;H{)PU?dDlSGU zLGKxOa;zm!C-Zghet4U7l(%LaEQnKF+>ECNt@`F07q-JO?%%X~*k}Yndc#f*iq0`hgW#iOvymYI0Ur}T;8qZ+%f1paM#v7e! zUS~+CMQqEbYZ%Ix+4iKAGa>>DLya7d_5zQo_zm&bP6F_75Qk^L7A%?p74r#_+3V6R z@m)%h$SZlQi)PpLLYyya^FulLkrPuM%+!YnWBCX|f#M*ph-`6S5IH3F;Os;ZZ&cDq z<~WF?be7SQre3OHq63A%t27ee4>e--Q*N)lFkAI_P@Yoq?Bd0s)IIqLY)xtXU`k>x zfQK0;b2n0v{oPhQju4$`uD>)Syw=X_l}YEfVF8)awhULL-sJNdq;z8~(wyAEW&sDx zxqHk8ufaTXHNnIUP~eE&k>D!g#IVt73wHY+ugJwtuy74u* z1qC32jRV4EWbz*0B5d5qGm7FB;V0Z>C63g4n6hW?!BfHU=hqZbuGx&ccdij#|lWok>4#{m^Fy>{`JdOS zjIM(Tuf4sYrJltP%2vW!U)Mt5hd5_vs^{onYW=T{?nF6taSUF>uPLMY@>8Y#vd&fU zJg$MqI>EOkIj}Gpu%?+k{%zvX7zqvMeuMm%YD6eLoHxL?e6eW>J~|~Z&lHB^r_Ag0 z{*SlMeG(r}i;4UY6e1TDhAnY@tyh=*e7>7?vlwq>&py69o*=hIE389P!iE)Fe1v;HN5fVGS&&jBzQk*Q}Rb%{FF5H zt;vL@*J)TU^_AGy%>+&9)+R@9XQHe9%Cr#w>Q$NM0~WAiktZl>9`I-Ypc0UjVU1rn z_FPNg@88w2iz;NHBJ8)vM$%1oe7QzSs;NxSieG5h->Cq6`M#YqU;tx=1hYym@h%fi zzWLOcEgsbZ>jW|mkR)qpxv-Z}J6iTzy?L3sZiv!nbZ3a;A~Hu3j6-^%FcrouBW^*9 zwOO;eD$2J8edza=ZDF&}5X#=B9O(;A4zyM&5yTvxuoqjP+FZY!ZYI`_D=;czTJF-e z1-$=(BE%9~*+c%p5UT&+n27&>tc8D77L`o(F_e)w^~KRuv4^AdNE-D~2I(p(SCPRP zc{V^gm}JdYd(~~{max0nhdPp5j3){eJ z$LuzR9V>9)451K&?27Aps3vsd_bU(1EDOA~g;@vOO2Ty`4MFO9u=`!_wEKPQp>9L& zzuUbCBGHhsuxYBy-^Uw`)=n5pSF5)!a6qfH$^u&=0GA(}B-Ixjj|ce?Bp(~$q^7BqWU|H8 zKU!?5P@+8*_63=^7)|h<=`vW)2%PZF(`Q0Lr0x5QLjWKIQZB9)OOB_ISy!Mx`E{lJ z1=1d&Ic*{{_h#6sNH^Hz)~vB7gCTbuUkVrOm(pCye57-0NUsKiFMeA#@NBB+F5<+s{(H7mQAPQx`OR z8xRz&uf&f&-?8paW&Q%EHCq$Lv~}lCIW%s>Wxj&$Majn9D~*{Yn8jBZ3b9-fuz!82Hn?&ZI2_JZYAy$kb_?7m*?J z7EcrbL2*)gJ(Wl`yg~c)vC1w>dR$LezB90-T0%EZo|KuQOirNpKJAd) zr+w2F#9m@j64vevMEx_$M}ESx!oajKsI7|Q#c-fWRsS7nAgMlxf$l`eoBx6_u1LP` z5wVEEAYNPN*iXKJza7=aP+z_r$z;5})SQGWl0SrU7qL5T>MpzjZPVq~an6pv29s{gIn1Rh z$*Vp>0p=05JN|HRiyOCbpgpZ@;9Xj|o3DNV!%Xn6t3hE>(=2$dFuEx{osGXYv`m73 z@j>86*-gsSS^3mR)HB6Bj1fy+E{@9e{bcRLU_iAqDzdQUqG)+sqNE`h1 z$3w4loJ+!{F4NdK!E7Vu6L}j5d=VnffP!j5b(b5(u}{;?o9PB`YLsrEsOeE8IUM8F zj!}~kYF^$l^i7CS$AnS+a4#EnWySE!?hNnzWe>=ETyc4WCXpNzZ9R&vLWR9n2)aFS zeT`FE>ZzLpjPr*qdk%A3<`U8cpr3K~?abpqM})l-j}Hz+9tJcw;_-BzCtzpYoNVk^ zd4xI@9~_|+Y_6S*Kx+?A$c)OqC718Wiat0Sl%qFMhix0?j{gw1XO9$zQhjjoeDj|S z8hS*$R7Ol=9=Sd-9s*OgZAC1sMC*(iexn}3CMYJdNZu8^S5)5@Bxo7ayS4fG2D@ns z(Y9t_4DB(20CAx~=eL=RM?RRc4|4V{?Qe z=>g3K7H^2nxwHm|*N+zhk9ET-=0ak5wZAxM<)DFY7|^q+@a_=>AXMj@vZG11mH%nQ zn9XfRt7)!V&u0~v+`DaED;5~WX_cQ6~@iQ$)`#bKdk&+uvYtZMGQ??&zRmpw zbc5donS&q;jPQE_7rh5{ONJKBM;cxKH>r!f)K=VDf}bfc1B4Nv3C}__D{B|kU4Q04E((6!W^q+&Xb=m`c#S!$wEEp4py_0 zDJO?v%A16hzF;#-Lt+DUyec?VXUS?%21=wBiJ<}TTQMa&n$+5wnHr4sni_Hb`tFO; z((Kg?Xh0p)JZnUc=-mE(Ls`z5)+Qr8;F0R92sj9yEJx1kK&wQ8S2S`)h+Qk?^jShBw0n z^g^Pht7xCZvs&|5W95{bypf4acXhX`O_>*QyEk183j48^Ws>JcasVrhs5G9;&2dyi z%>jCf;J1W^x5i(=Cvt|^PAWSdNG}XTJ@;UD+R!_#xn5!VD8@`C$I>Ipes@q*x>0`l z)z8=i*VF~+bxTYjaCr)lzaDau^|9V&q!IlGwQu0TKbn4oBljDL$D`d(xUR1D_M2H5 z_D)E{)YMOgPe9j&Ta=X`w!K8L8Fz1tOon!uWan9)huounS4Mh4dF)BRXPW~rZ){=b z8GKrX8h<5U_7;gkNu2?Vha=mHR?g_-tDJ7e(~;kBqw^DncZb0-heR1$Eu84i7(X`&aR*AQIwovW z>fz)N@L0uBeI%!;>fF*(y?aB?LspSl*h;#V3|hH@lSBCC>z%=##r4vBD?~% zIcaMD#Ep&MMR|QloYSVm4m`6&D~o=K)KUR!2dn`e7}AFYi4ni=M| zwlXp`cKoTc{O?pVGTu@effshzIQL;~Uran3$O8b$6lS*o0sT!BoyZd(zz&P7axA%@Nz)_qI zkD$LWxQoOtM=CJA^aux0eMxT|$TTV{XcUf%R6YWWWpb~~Wr+7tk~!$o(-O!M!{#H? z)jCw2taNz0WO)=*Gud3!7Hi9?DqB;9JQ_pLDASj_PC!c^M|om%q>Zz+S3oK5Y^V&l+!?6vHO@6@c? z%)vqVE`pRD|ItbFC1kt4ApdNC)&9im8NW=RUr>

@up^y4&I8N>~wvL%f(S2W%NN zf&x46sN${5Gh+I9cd>g-O|x3@x#@hdvU54zx*WtnC#5%quWk43w{;_G!4&;N;wy-O z?urjbDnKfp2u4gknf&*wBJS`YfdzBa#pf^Lo9ei}Z)MCk6MP}h0OYrd8`jVipqsRTq}lh>h#|o4yiA zbPQLKXatZ+L=I$?XEGfd7x*_lf|=3xKLi)yj}jQ9pD+OPrv;Mqe+~uywe$sD4D}uV z4@_J6*&E>)?K_L=^f9)ZpbIb0tyI>qF^OuZ;8LrA_T9JRowWUXNjyBVFxj7 zcFv)I!ZI!9%3&ro1=#}qZ!W@`!*%Do@xlC)>lS-KJPYY3@3mXj^ZUgyXXo8DiZ)0M z@ORv8NQ5xIiv%yy7WuvM3l7ZnaX8M-u4s`LZ2-*e2V%BIin4U@4b=3ps|#~L^v#DXv3GDk8H#;lK%qAV<%I5Z8dd3-sIMfqq2WY52;$Y7| zC@8Z_G%EJ3tOhCq_Ad3l4=IN9=Ee$7k#R%^@JPd7SnqL~*a3EWdfPj^Ft)B}bgnkr zBT1I)!g2ha@JU#wQW1op@1SkuaGVJcEJVhstebVvoHV+n`EI?;^p~M~tfk#K1CBi- zF<+3FQvDXkoVE)E6Bj9T)Vlo9rjgCj>S}EH&DnJgn49L@7ZaI=v&F?OY*>NLOQ-u43cR-0P{LGZCyKsW{^hNC8iDiqJ{~) zNqU!S?7Gb=jXSc_T>xTosLbq!#)VKVs^hKlReb|!_v(O0B(=A8tA0Fic+K)>Lc!(J zge-eb*cuWjJCE_q)D}kLQ`X73XAD=didg`EDAk|uw*rjJ1Yj*bj<;`v&pOnps=(g<^CaeJRd*q!NQ`O zTAcA*KCphxtD>M<0l)OpWo@|W=Vs)XFpM7C;96VQR+W3~AXoqC9@yN@7J9kuboR-H zHL8|U?V*D#Jg&`hR95a1#ByH}mfw|kcIP#b2%C}r_nxhIoWdo%k*DB;N)%#~P458H zR&1-?mh?}HxGi(-dh@nkK_H45IB{y)%qwup^p85vZeUpqh|G;9wr%q$_*4*|PS(bw z3$<2M;y;*(WAtHSM--PRyA1<)1Xe^(yuRRaZX9nR0oP5%Wg)P(ak|_q$^7Cd)NP#f zFt*;;hP)je2EkvO_Juc*@6Fd}(xbH@+`c?h1(9yjJzcLY^!{hs3;2?q^IfrF`+D{7 zeAjrrb~tUbxms|met4=I%jCVN6O3DEeY8_%NiNb1EvTu>AI1J!n@36jd$2##c}B>0 z4L;|^v$`6=K#^tk;MTA+ji{smQT)gaODj-((|WI%X2JbpJ46#0RZ&FMJeh+Z<&>04 z)cI;7Dm)CZ1Q9H0Ge@zDXKAsB9dZbg4?1joh3}_)K2k;c^(s6)kl-$}hLll_T0$(y z-4SgpruNv#}%R(l@3!%tj5l!d~Np>{BXo}gF5QWAP7*n?JW-N~>|I~-Sokci&_Ho87f;meu+(2@Yz45X{^W92m`3_^%9FadE5^cGO72ffn`$&G} zGOIPIF?FsLh^0eater8)<@~LjNIyP(W7F~ackhd7ase+Gfo@-RBG6$Q+CeDbE-eiO! z66k;0^Ze3P9kEj(yiZ!_vx)K5>+Jrl2af_iKMbiG*Z6y})9{?`w@LyvBpEEC99HEm z94J&4%248p>c%Nb+Y?Mm9%w8P;5(?F8nINf&_*-><^LeQ6{hj_UPeUhLmtxd+Vmgt zX+WF*G|x;d1!gF0D5?$*b6|tDV#m<_?(f{b+Jd?J92?)y8t>gZ+-KQ+Bj*PJW__xR zdf03Su)GBsi{L~F7m?zTiiu`Wk!YO=QO{H#)PP2?loJ6bfRs0oKxO3+aYm9`#}5V$ z`x646$5C08JvW-c>mV&jy+a+V^zH9IQ#Inj?BmB?I0~jhx7qLD!cSQ9{<) zCB(xvh>|7z&?P1A6fTeZ=vH4`HaRJenyQMrBMl$uNuOX#!uWTr0YsU$pvq9H4wY>t zl^X-E=|ppy073iT6Xv?zU&~*SOz)S{s$uTKR(W@_aAsUm!9UD9D`~`uK!3`Buc{%2B4{J%ioRlMx&#kB{e!Avb zJrlj#<)~p=4r6CfO9_3Cn1xhg=x7nk+LY}yn%fvBEBY;q4p`CSxj7WfX^CU5+@tJWJi(W&KcO*jj5x;xDLZ*AxFvIAYA@P8yW`o)9#pos(U zSgS*I-N9vd=^11lccI*yNQxzMgJ!_I?64MNHZL9-U_DIfm>8g{k^fj)WeFHM8I_z& zZ3l@3<|n0jQSo~R0*Qcqvf~?+vNohOl*bzy=)XeN;2a3p1~0V$$gAWoVuI=*iPkyO z;E~luur&+0{@(mshrT+g9pcf!^T48w$vch$Nigsv6ylw&q=E-ICa#nDgi$8vmBC($ z=yLuLM0U-^2^S`{_ZwTz$|kB|ZzUr`AM@J;{X1nZJEj`$4skl+fss?6#-GZt`JdU# zvVUW}%8!tF0rBe>`+r}#|FsnVkBs^MUX+ze>dHSpWnWVCqdl~T@Zci3NHq%q1q0&Z zjiRz*rIA75MSd&j>=Hq=uts|mK)cc}S884FYT9`Ym2Gbq-?zNU&7M-!u<)j1^s21K z7oJaB$L#M;cjw#E-oI~{yJTr2o((;6binRCTJm*%J0nrPf%?1jgigQI5bI~2dsFN451~NyCYYvfVfu5!YwE`!Uv%`& zB-2spw{|p}vcNP<;@k3}sV|3_r|H|Z4JC9~&KtI*)@JhM?U=mg#m3PjRVoE+M zVYM5uWSO==K5bE81EEz2?F$jdRB^ec45FWK&Dz+e}E=Op=h#{z^;qey2Dx+2Q2qzwA-MpAB% z6U&685w0+}tjouEmcVXOF$U)7w=8u*B7piVzASTr-X|xfrQR1uvc@IZr$CD4MUVF| zMre!R*v|cBT}rB>9#r~c4@(}lBCp$9)X`O$7f_9s)8|{>$Da!Go_qr=;4rtnr7TgXUpffMV9akHEvEw*Z&g!2Env6(!b;)$Zkq!j9UGy>Zopi zUQ<$5Ex<;BxM?&1+E#8>B$er2c?TqH!q^=LX)1lV=@=!xtMbm`$gt70@|} z8AM$V_n1o@=*E15EncO@{DFc)hEBSA@Nbk=GkNsF#}_mBtmF20k$-)eOP+G`q*EAP^>>5d@ea zg6^gb37{ol+=uYC3->5=jbqd}&J|19Oh}yYviQ}E@&>94`r85c>mo=XKA{q~2C*8q z1(8IqD#!fuWdW8DT^RfX)ssdyOzHq^sC=mmY``qcE8^g-o852h1`FBL)_0fHqqzW%Y(brO+X5H!1sl*7|2>*^XZQ^Um1qp- zj{+=uY~SxwTj1)2rmt7luK=kSptJDqqF#W3sech+R{=RBs5U1mcd@_EU~~8?dsmUjsf7tKBg%yZYVwFEDFu zWWQwnb~$%v)IaYXT;h~afPZz{4^@br zn($GS68Obz0BZLqKb0MyvEEp-F z%XZOu9nt29ll>hIY!o7Ulpi znv6Q&d-;x1Q#smNV37IAjmqJ`f>4;j)zs}@5Ggb8NHQ&r9}YcFk1=s0qSmfDIT zL}IzQfY+Hb7z3YWw>3^;vPtIw+@lL;+6f0j=R`K1?Rs$3&Ft1)@NM5zV1L&`Vbl&7 zswRx&Edg?U7fqYMBpWQ6jO&vI*KI5odc0(9&B?LUS$lNhs$&T-QLab-p|8suK`a9N zU;>Q)dneC-M2!FT|4RScQqNRUcScY|-Hb2FWK7ixX)w*zIKVgM!)R>CsoYSb9@Lsy zLJk9)H;@1=N~KM;fxCA80PT1w>bSwB_El6JKa7XzdPVs_qfTy_HegHLC>RgUxX-lj zs_$O^k~(_!_WADl_zRBtc0-mj? zs$_XlVRk8UA;TzI%p`NZo^_F0EiGU(u~@&bF!!jgly!a1es#9LBez7Usio}j;#J*M zYwchj{qF*wFL`?T^AP-=5n(>kT+$T_0iGHp4PM3Z+@Rs&k(ghDz;|7e>IBW%Q&>Q* z*|!8m`k0#8(2SfZzjS1JdAS)iL*a3Q>Tt-uHB0^>6;1Ac&)lXvA#A+^~TF&^<-Px{Arzw?$8;b z6(xcC)ary#!{#M(-LV!}WvwJ94Y}p+dl+)^9$xeZPD9+g#b-y4E)=6{dZvMSy(4bs zQqd@m1o^6YxMp0{hxGGmxj9Cv;|d+QcXE|*vQbI!0Pil2SOuAXlwDZl!rN-01kujv z`f06S5M~gsjn6G_ql(Z9v;Hz>hvm)t+G*Reo}Oz2DoZC~IJYFxV3=*1bcDI#V-ehb z`yS4?O;M_uUKUWRm9-0*%jA%+L}L(ouJ)NW*6>k4H0cLNq(fNgHv4Jnoecj0zTR!} zd#20Z0rVivt#5;(=aRdjZc}W37m&` zO8hf+O$5W$AK*8A8`$z*=vRHy=*QmoFlAg=(s#RhNTHVYC1}1K@hC|GVLZ=F6-*0x z{+sO$vPen^=y*Dt6A!PzJ!}(6LIqT()R5jys9m(YH-ka(Nn?~~Rtl-H*pP{zU-MQ? zlXus*&2qLymA^@KO>Y@ZjhbR)e1(|kVQ~2STn}zH$Hv*3wWt5KBjg$eN#@{G$fcMS8-`5K^IA7m_aM6 z`$)$n`bVh3x<&!)d?X1WLQ9uG9!?;qPGiS*BaH;RE}RifZm9eNEHWtim)l0DD^SyZww8iac z7r6e^#bzT+IQYWSF&Kq!LAalh*r_;Wzi*>jtu~LuXq%d^sr49_?y34lr!u2w+EXxL ztvGKYoa^y*IC%Ypz%YnJV8{reNW^fpBHc9m`O*l>0iqm+au0Ze=X^~VrnQF?&PU+5 zvDnPzI3)KOpigkw6k+Ys(1~ggta{l}hmoJQoMZf-VJ+IOf#vtk(!25;+d@FGwm{aR zAx2bT?D_&PU}I*Rt}$?_UtrnE;npz+3Wm#cQDminaPZX-ZsD&rZgNMlOP>~lPs)5- z1VY9g@uu8tU)@>Vy33Lo9Nkp)j+fdu6g^!Frwn87+^Rz~KEqIZNvGPU)wR*jLB$B}I$TO*f~!7t4654oLO6t8V2r?1+T_Q&0K0 z4682u*_{u6j(?P@{;`Y5=-T~Y%Kr<77Z}0&gZ+aQ{5EN9gm5}+3o-ZC$|VI0^CJnl zlu@4piaXoYaQOv8RMg_I3w0k1bN&6lEJ=n~1W@$^LZ*+5?6;J{!0RU%BNqm{<~-t- zYBiVcsKMtWrxI-wsbMy>B;oLhCnBi?O$~EZ4$9!UcL&30S4}6G<>y$P0t(I%#Lna} zX_$_w@IIB}3veH9GP|^0P;_>@eR7vav@g)kd8j3{^_~v_K#JRObGNy!PKV z%zyngxUd z^s@D@xs>D?9|0^XQSe9+5fMBr9-1rL2ipylxZmKI{+KWoVU3B__h9-y+tCNq0iyqW8C?N<_=wTWv36hc-;u6_5$-8<-iG^wVX{rs#%*o<0 zP`zZD%9FKz8kA)Pi`QrR2c(!`3^|x4*s*D2BB*E3p1pCB6wSJ(K~r=?GY2zKWbkSM zk97>~}>cv zb$Jz&BN$J`J1%`SPSlD!*ydwZh|}u@DspA$4$sz zuve=&^SCLUwSd_bGS|G?7q|}mlM8;PN?3s*Qn`LoL_I|_0v+g4G5lm(&>D&~sR6?l znI)Ws=bL^}57Jk}tm&JypgNPrn=57ljDoPx5vC%_rIdlHBI-9tCQd3ccs7 z8t-*ywH72aUrR7)OSDPqV2JeQ%}`Fj)8^<7+S({A|0d~}AU_#mFK*xIuPXctHbR_6 z0>4#tdv;L;zy3>@ngEyuC~{UEld$Xby%R!P6GeG0aQ`p@>*JR7p_5+YHPKN^V4fk3 zP=|o0bY4goP@xf7HieU5*Pudrp}QZK@B~{n6cMl7DMdWz@t^;~@D^eU<>!6(45Z(_ zk$+hp^uOOo|9MRR!MG0pHBKn;ANR0%BC@7!gZmJPZJXt>$m&mX8a!}cI&=T z^1$X1PVvlD`DVXD#eo%T9Hq`v^hcCB+%v=fj3To3%ZWn%=JZC_ zoex%j4J+ zbQX)n1VtYQf2U6; zl+lO7)ctA65@v(JWy3f!Jhj+syx9tcQ)P2qi3?*W-Zw#Ork|#Fs{k`fVV_!Mn!xL3 zIk}JIQwGd7Ve?#cLD_l3;B&IP`k1Ad;eT4RS=pW5A1i9B3J!lo3 z!WN4Denb)1o>9tu9*MQeIgR3$ z0rD%TiSRC-!526-Q_<1bGYn58#9j%95VT-muFHVK2w+EN#G8i;i`sA@UJgGpB~}7x zXT$xV`dKsMX!X;9Ku-Kvd`_&(SCYV;p<-2TVNbPS!mBJ-Wd&_+BDCO7!-ztt23Z4X=cs@kswD@}xU^1g^h~pu=^6pW ze8CszeDle6mmn7p6^EWdfD|dyNB$Hf%@?7eA4}|ajD2dyBKnD5ou30#)271<>qDF}GnvD)t$ z2fj&M*=&%VGF>YIAwtb!y?Ie|YWR?x(XuT5a+5#3i=W?qc_A~KjWxnJccu=Xz$PiiuHzL7#&Jt#VEx6v~-8J%V@+^q|MYi z{c+eNd4k(vCCT3b1G%D0UknFNZ?%lsqRm{_Bk#15n|;|H)9O&HOroVE-FG(hc4&ZE z(2P$V`Y^c7#KE)tx3Id<0tT%cp7~`AFs#cqf_JH!mS_Fm3^W1T!JXma96S=IrQy{} zb0%%7OB-G)J8g)5WpUWTd10Kg^gMRt${vh%)nB};`vmNAbL>TCRA6}wIE<1qWykbg zPcCUTMV-!d>owCDM3^BD{hCpJcQE*pH$gV#ErC;Wx|Pm9SnipSi4GEzX%cltZ8sf0 z4GJEGTyuxoh}YL_^g{rSCj(Mn9xB&ZpEqiyz-a5H?)=3b8E8s zNV4xhy4dT&cqJb_1$w&<_Ly*)afAyxX!#R8gU)gG)(#SXrbXZnoP4uq5;X(XFv+a6 zX>3lBn@9^3=&!a@Iy7C*kVuccxvO@qV6GM z%IEWSgV;mL3SA>lp*KOzvB5IVgDpwgX_;?gI5YK6==zNjtGgy=}3pI7Ml z*K=k&-d*&zJ{n?u+*PW8qBhLLy>UlMZiEIK|oHw$2rs9WFwD^(_d8L4@aT5=s?a8c%PT*VUVg&tO4QDy2SY zjm2bF%vg0dwTFqL)$eqaDox6HxHo5b zNFgp5r*h$E+lpT*h%KuH+&3V2#-tv2SyzkL$JGiwZeF>fbV(hQ2BwSr_!rt3?1T{# z3+p)Tl>z*Z!>MQQ>u0C#>Grq9WuFghUm2<38IZ<^qz{5X#CQaF zf*+9#(YJ9s#v$mL$-q)RasrGY`j8?J&3!QZLlA<|;QEREfPSG;1T6Zobq2^_0kt5q z09VRDG;Z8JCf6j{ENFc;@3BBW=)L0zw=Nv`9rTWlU%SG*pCtHSWjNhK_eeShOUWc1 zguBW=S8?nd=TBUyH^szUGwHcZ_085TFwz#|m8>-DLDz_i63t}Q{&1Hz4#&BBM00Rg zVBLmTo3$&AFIBXyzJFV$-LXKdTj9!w1s4u$sTtwJ%L#eIW7Q-qMV*+xeM-%y0(?Xu zYf$T);aSqS%JCFk#=-}_oMlbLI6SL(vsS@VW3P{axttW?Aj^|nTNjt{WwB<@*PDZT z83dbE=PjR;JkTlb_0}gc$vw%DL8IuHL48?t7bk-p_2$2S%@_`iYL2H6r(tbXtG6$H zi1#UpOr)gY$kAjz^D_2qA(d?Drx*fE7ciOz|S65GQ?@VtM-pB2z zI4+D&hV8ICIAo>$0u9M+c}S*w#r~(Y`X!*Ot*s<>_$|Jy`Jtq%-UyXuOq-?62R=8(;>I?z9KdCKML;#{YLY$;T>XZm?=UMn_|2rJTDP1Hb8tg|jxd^v+7b=!NmtTqBeh&ZS#8&>3NHz5w>{Y4R_ zO^gPq`R-cbRMDwPNbP_#R>)zaj_`d(XF|e#kUT~iLdsnipk{POw`}Y61ZAD0nZ%DK z`9$<-)~~Drk;!X=k_bh1nq3~u>-~rbzMYZ?_?z4aK6~P}R|Rp=V)u!VrbLFxIW+2b z>QCbRY0tN4TkELh&c0Z?EZk3qPr_Z~pM`RmqbUOkJ-FMoK2VOdHC4y-G}8eV+DZWk zX6jN-&=s0$n)ykYm32Cz^-9AHW)kRCfBXP_Rx{TG3mN7#g=+BS3*~Hwshl1}_t0Tr z@>%){i8cncHw7ld83d}Tbd$lY)kp&6w=djR4OnT|iOe!>@!}5DO!8*$5^bG9=g)2C zhntFe*FYJuTv6y}J@zbU^Oo(_A470wLp;z+iI}Hu+#FvD9GC*|JoXx#vUsEWFMWzs zrZu`29dr4^OWAsvC}BUpF4b3865d`bCI=`twM+)7OHA!s+~FKJo5g*Z3)bGBekB6l z{^OH$w2KEi*_gGoh!}k-;;t>d zONzdN&YtPqo8~CDbOb*JqmAK3!_<^zKpEMCm1_Aw;5Ap z5mLu5wB~x0{)K=s#@QHe4QB^QHDEk8EK5WS~XtNf1f;f+>NG|?7@i{z{;oEixJ8NF5> zqrFoEMY^>gJf2r0h7)7!AZa0;Q)Gm-_udiHd6-r+nLkdP8Idjb7YZHg0a|P*pi7*?SHZmWTU_)ek9rzu5jNMxZ1-PQ*8;dpg0KMZ+ zvg<$xcKwT1PCU?+SNM$wAHJ2tf2-A$Hg|CNMu7i3u;2Rm|Lb+l{H9sv<-UiSxL|KC zp<+^oL`w;+0@uOD5|ltr1!It<>CyM9qAyLPU7^`<<=sZwJj}lcAO#Jed;j1|xZP-) z_$diC9(R?o{+&~-z0B_J_6ANFjEe%X=ZqU66Q?A1(h!AWTU?EZ3$shuPcfd!pqaK8 z!fD0;=)T-Z(rPPKxoI++8v5w=@#2 zMjXbSXl5Z|#_JGO8fUn|tFn|N+D7@TQwqfCT14gR8eKfo(XD8)29;&w))lNX3C4^C z4_yvO`*Vokel4~CYWw|m?mdP`6}1AN$VtBqzG;7rd!*;vK*TA97s|PqHCZ{xFnm)~ z9s2x4@urFRS56_BvH!qM3*$k#n1pR|IB6|zmWY+93=<3xqmsN1=9s}qAI$)aN{!JH zA_;b-#~mdM`1_d@qW?<#VVuI_28>DS-W;HRhS3j+m07d#0Xp|#ZnIhhr8t)5s_EE` zT3JNF4UnQUH9EOWEO^G^5&wflY#veqIXg;kE-My3<3l<9gfNQkP1q**CvbxQNd9i4 z?}rC`rg%nf{cI18sklEK1$F*5M?}!fAVS$8bbE-G#XWNyeA8y{>>3X2v0d-+Oj2Nm zDM~hDkKQMEUONW4)V08yH^lSkurW|St2O-qg*X|7z@2eK@Q#PRzc^?S&VF!iHkZ9r zQ|_p96s8ueJgP3de8T?u*X4X7*PB1c+u43Z4}DJ|zhVoT0A8Fiv)KyX%2cjV8ZN3c ztL25YZ~Q;dWu@}E_5AmW*7O3qy%ypGR;@9T0t)F($+h1UowgLH!l=2w zK!qu7u!lkB2db9ff@F80U3Y&HLxo6uuR{t-k=~4>KaMap`91+%-=X4x zPIjb`(iwV6mt`gQh|&>5t)M7K(0ED|DJt@k5JMGy`CcbL;4X9eMpYv9y3t4yjy&B0 zXf?}(|7;DEY^&|$+8O=?lHh`ed24Gb-U*!6TTaZ0@pw}Q7YzJ;?~UHyTPQ)J#Zvh? z@zWJEmhvLkp>o(em;{^vHcBnExu;CTR9eB;(I!)lr!hG6E{)ZFyun7Nb=JW@0qs@d zEkQlh4xOnd+KSSjO@HD@I=o=|<+>iix{rdun$Lsk$f(=9m_IWJCWN&~H&6?b*q;D~ z_z1*N#2($~+O|WY^B2XDwT~$_Z>S36GLjfaX(W-3%cth0B?O@ffccd9nP^2UYXi03 z4uGbbTuq5S1&7(wk?e{h zVAQ9y(!U+Xu-73g-D=uy!XCaY0}{*g46Aw(uj3Y^`bK2@ecVX7t+Z{Sba#VZYI$;U za)t(vXQ(p)x&2Z1>e|kteyh;gzRHrGHZFI%Py~Mt0qoEdxHKWd^)3)GmjLTWKW3do zAjEvy9GP>k;}a@@mp%Hf?5FySdRRTR601M)xPFMIdDtwb#x(F{<^lxbF(}O2M7WWp zl2Z1I|46W47x`fC9WM8*U=}&;9?~EtEz$n{MNV}jhKm(Yw$~vO&R{W4Hb*>XipJ>;XH2Jpx|a+wMXI;lt6wo3Z)Ljs`DHXyJ)$LIq``b zD^gxc6cys%uUQ7+5cWzYV*7mU@Rfg|8&gPjCfdIbLD}~qVEcDktbY!{zmfonO8n{L7g&g|Bl-aN0_nVe5{2&8e+`xB zMjki8%CJ(Aq9@AD?tZ1GGLZ5Aq1*=~L5L@!tSX&ponNexPDz*N=h8YKH9L-P81rF9{!7(z-F7_b$_>=@tomyjdThM!y<6Bae zY{vdG=_1{p8)N}8ioS;C@(dr@R_)}T5C%c>V|b~c;5LhRi;iAu8)R}ulL@=&s@Zk6 z>}ySWoQ>vDwvcTPx>kHaVbZ+SX}@rki*GH~J4+^t9PC z=u|fHt=14)lle{6cYvOX)mZ&GBJ2{g$@KN8b~e?65RAYOh7N;tzih~EAExjN@1q+I z%{fZHMf2P&Y=78aW10S)9?~lu7_`s|<`1A++aoC^NWXxm+jurhppAHvH?dRhvT4g} zhq=&!vD%Yows`SWp3OsVWit8a_qg>5DDv6w@3>Lm9=CAtDXgJv-m&d;~GjW^oz$Nk(#o z1@_a2@uE@10q#}vxN(esT?KbwBA8PA?NrPEpYyT)cg5-dgKbER+m`sAk2Ta?uU_9) zg!RR|*tAsgGaqGH!bakI{!w92PLLRFM>=soXI*OIYUm4;7fv+@-Rlppk~yYy-;f~Y zcJ%Gk`t85CQyCv0$GhmhL<<5aHHdw~BEFM9lm%|p%#Hbwp&mQodTollzGque(8vY{ zR52gtrQ4dcCO!$xA&Ru#v!AX@CL$(HRaHtn!s|1duc@egD!o=UGEWK_r5cS7tNhs` zXU)qVDM>CVNreLwc-GFA*S^Fo;8zo42_DKC(|j8o_}K(;FZ+tK^h}zcEzqyTWWgS@ zh9q-VNo7ZrCv?L8M>F4XBPFc`LGn%7C|ap&BD@1pRflYD?8kcG=Bv?7FhDcF#Y3#* zBRajkVLtbCw0g{{;BLZUXNXE4Z14wHVE*azZ*o4JS@ma$C)d8`c`ZbJk2~_fGvavN z!>{FFkFc8!sb3(TVQQgHCSQ14xZrpu4#;GuWJm0@kuVUqKsRotYGY2ARIOEe##N}v zbX>=47@whw*!`#5H)A98{>QVNI>*K~_FtOT@KY!+UcqjB1B4c-kBRlkrvGYy$QybV zF8{s^o4$h=|CZeN&(Hsd7yXB2N>uui`3|dpKDi%`*(GRz2+1RcH;9hQ4`lzsvXF{^ zASDO;(yU6hckQ&eg3FKILw=zn1_~wR^}Q~zbJj$#j2DQXx|*2syq}!7`gpznAoJzm zJ{9JZ${c8jVh$6aDWuQe$D)R<=VV3+B8O&3?z7tEs@|;vc)&p7En(D+ufG#Db6+i2 zG_pH>tN{ti&V+3C6i?=zx8Hu>Rb89an+j^Ca#Z|_`WR}?UZ%#yU8jLIFGa^8Qht-2 zPIzqsHkga93Dl`Ym)3uh-Nbi}_SsrnFPardtK(KG0R0Alo=5;j>-W%a zv;YBaW_n*32D(HTYQ0$f1D}mzt}0b00pREwqaDs63=9t4-W0$vOrgWA$;f-Z?&gN` z#Y@8Jh((?U{Aty(@Y^H#kv>kR!#)il7cQQrqnK(M8+N!FX;TKysz_yWVeZyih+bxz zPFhwq*I9wiJQZaX@R@Fd zhm)M^g4J!ocM&Sr#Je(})eKrZfmJTtsBOj#%QhS~p?;xq0xat>K!`S6yqJ+fOHe7RiPEXH z=n0VtGLibuH)7tE89ep3(GVosQpm zp|j;a@eEz7Rpe-uw=-^hN9oU9&rT-Yo*rL_J%lQb4~8PawCJ#I-}SFFF?tvaaBG!b zTBym%9f;9t*5>+-4c`T6gEj75YQhMztT$#gMLkh}wXQgjGilvp^{t|I(d@IA0>GVn zVpcietfni2yDnL&wq|Q@girp$h%7qMbnk`ys)1-$xqmNOeHiRAOobh0h4dia@LIh{ zy#XGd*48bZ$YIF~Nt-&b2;LJ)iLy;M0aw48LMd|`3NK3}exvO%Kva$Hkbmypq|qc`#aotE2e&8Cg`toXsxK7lp#v2NQs4T)#v(*T` z4V-l$BJ&{B?HBmT8)3|K-ss)Yn$YH3|v82T4{qFo{drP++b-XdQ8sW`iIaxs@bhmv(W2Fxcau^uSMsEK>Rj z73{pi-93B=GkRE^q(gv}Me`lRD$4u##NtahUMW~WV<_G(mZgpxEkT>ktO&T}AiKv) zYPQQC9FaFTI5u-gy3R1+TJ&fCfwY)wTXYdcPDt(be=m1EX>Vna?{aVX*1{P79o+jr zI=)23ZJRl{?>rL)3bcdo`T_?kA{z$wVkc$8Dd{}$~`4ejC5hO@{QnXc#T z0QlFBFY^6Xn)J?tY@wU`ojVNF&?|( zbnfCK%xS|Q_1F^Kz7K?C~u(8lI(naxFtb;QU!&?z02`H&FF z!mkS)m6y@=PwvK@>EsMeD+WefGIOsvHuV@0?F+bwogS6kg5}ae=zx=nP;tE?I({Q9 zVRtg!inDjc7#8DG$VPEZA`5Im)BVEC9nv_2iK;;wK}ioH&CPgGbexUQ@(Sj9_!r)kvXCJ%encU1>SYu&bJCU4kM% zu&#jOS{6FHo~6ie5+zx|y)N0k&eb>APMu|luTQ!uedH$Hsv?C|)pDP8od%Zf@L%DB z?d11_^zWLo_?E2r{+*gqwzl}c2v(iS;|kx#LLQem@jm+B5D2$HA>`r^fywY7wJ~#Z zlu(rd>NV}eigu2Sg3_d8bT4$Y1!1Cz(0o0K*t*bc)*B~uYRT4w>&?@r zUBxz}*FN1|;CfKaECVr%Gk{uFjmY}Z+SHu@@koWD{1&W1mY!%e<_Q}MIwi={u_m2rB<#9V4J9>?*vl5oRZfXJTmY|e!7f;(GLTw$3dyXdC-ur& zs_ZQKr0CpVi2L-7ErFzqvnpB^fdXWKiYzKQQQ2%ZnB1O5i8%H>MR9pfj2#q3(f2sp zVrO!56^9YP@>1p*qBZ4b(z8B}iwWo#QPzJfZ2n5J5;l5WWJQI2))jQh@YnAnpn|kj!GlSHn`h1%4Pf10 z#$`L|cVl)t_`K}u(j}W>gTh}T{@E_S>wj}-5oWCtG&&=!2_|H?_mnV%zl1v9mRA+J zCMJ^31?>7-WTFszA&y6w3_lSx!8<+n4o@pN{Lvn?<(T0BQ29+UM7(g`QwA~LQZnP4 zU<-r)B?xOkj>kLd9>>fmqNQU{&&ZyHsS0l7`|r20kw*Fg+V}Ep%kOXy>A!Ju{=wRr z>gIY{gR!3yX{l`P-^*cF>v;4mcY)877@BGh6?uPPO0p)^#==jixyOm%O^2i+HnD$i ze?W{vh|)s_^3w|j@ozPP_FI*1=|dX1LRy)u(_anX@r5O@{4qT2{jrrkJ8^;;`Yz`p z>!R$W?6kPNC|ix|@r2;3ey4=Td0YGEQ?Ht>j(7H!;}2=V^6W0W$^`7 zI4ep!?~O!v5~B<=*F@yi7{w_Ts5@e*KyKL4voF&)g4EC{VF$Szr8e2F46~Y@w1hMV zB%|OUt0FB_LN@$5!IPUVer2bGG~Q`Jtd_L+EQLyuIkjw*8Ta0}ElPt!T7GJ#Kxo*& zonOLfp)?We+vTM-Y)^7ym3oj22{2xeP&!pdpt(j%`AtU70i5Ar?K>M$lchY5>M(Uj~|*+YrLz+Z9N3Kui`=?Fe|1= zh!)mB7k+gDHRK;^CKd1GKRWJjSI>*YMszDj=op$RO-x?XI{$YHU5cHrjt6NIvle|B z#L$juDFK31N_xp**g>|YiJyMW_!Wp>UXUE`c*Np>XD~WQ6<0EWeTxkBn;XiVq$xQnv48#Lm*K9f1Q8ZhUc3t@ zaByP4iMp@`I;U1fwS$bkGAwxxx!D;{Fr(r!oG;(WaktP|&V_b?=8BQmip6Luj5$0| zhc~53_*^ZlbQ-2(Y8FF)29@X0^xnMcQ5Se~#b*hLhQt+n2DLTSmsT`OMuM0oSz=k* zm^XohSF%XMksLI`ycclL8ia^bIX9+^&a4uqXvT>sPv0wq!P{{4E3DjB=sm@V$Y7%! zC+sm1RYq9hN$~{yN{e7VltX_cA)c|!n;*q?dYXczgf!fg(noPLrnnxesgD==To z8kL8^Xe6-n;aMKLfz8PlRF#MSv?4>??F%vaeY|2;u^2((FqEY{<}^6LdJYlC1ZqB3 z2{oA5)w({3mp4GtYs<#=m=-G}^`WExESws{F`1^KHG35pCaemZYTNP4S&coDVz1)h z8*Z79OCNUVzXp0;MeWe`E?DxliQF|%2gv+p-JXPDdv`g^VtVM@?JFJ?P6J_C73sK& z0ASccOU!}Lgai6b!cl)%Gh6~G=;U>AUOIwkc2>p3YGZLOhFEDwM3HA02;!~cRX5T<+xEU;Np547z(7REiT>>AxDj?=02(=YF7$%UbodGTeWgW)mhUq%ohVGsscH}xZ zFvAmi7P59!*J~lG8ifrnwf6T!fOnxnfy+8QVkBu4a81qdeDepEiW>$<4BTR0#DoQW#Xh48w zkOr5#77d`5aa;OS*H+0?*2SoI*}r^XC-_7qOqyh=csx#Lg>hkQ;q_?!}lL-SJD0?H4&BRTO`(T7`&1=fH z0g9@7?8b;wGwu11oSm{o@(2a)+v}dEcFaqdFJr`Tp%QNrqmIDFSa17nefwd?;NaEU z(#gt`FJTu}HP<`XFin|1%8^^}AmpUB1EQQ$c0SzBm)=_Eg<(8417DwupI)rljtaNr zZ!AN8cyEV!L^3VFlg#OVE8?Kq_gdBKK8{@L9YI6kM5O`k4C2vLnrurQ>zRO>*pd){ zz3B0|ccsUkB^<*IiL?N3Kcj2iHMHJbD41!e)8V1H5xSTc=e~^O90+yHjLh1Wa+A!h zsoiZ6;mE2e)6``%fiuL#d5-M={fwoxF9fU!#-A*n=IWKM&w6fl-e<0p zdsn$Tzxt~Hkl3`0vvVNwF?#PRg}gj1OfgXZX(wfV=*t!t0bR$4n!F}W{m&0LlNF>A&2Jm-taK&Yln0GU5z zg!R9P+|Jc4c&$~?;e0^r=y@EmV%*K6r^IyM+Jo+v?U}Zaph@_=ol40*wb0{(PeHbw z>xTsnVu8b9`43^L!`Rw3ZM>{%%-%P=J3nCihI4UopHu_=f*oEV;eU>t>SB?$kzDv;~WH^`S`elYG z*-6@0jA_omI-bj}^^@vts~0>)LPgL8s+ErVUw*UB zn`>FfTXiWa>Yw|TgrdG!mqU0}+vBytAJ2b>*|<^jXExZ(40s1!Ut^ay;5%C{%nu$2 zbZvhO{fsa>86G*RgW~X&k394u-+}H!zIo7Z&};6f5()C}?n}|IG45FpuWdi9^=+;x zLEm@I&%xhMM?DW5^0LP-2JU1xXOkf`?vdP!_h6`9Lce+3LqXD#@fSzqSMJfQsX>po z@MJYcqzFT;M4JJ6KWrV@<4Ke*#febLn_ z>w@cZkC(cLHm<6wz6*Xncuo@WbSZYya>K>a#F$Q|dc{UKB&?WBzW0e+N)Jg&82PLQ zj>?XA{Sm?dxM?5gAqP{{fM{M1+0cp!ZwQS$68d&|B}{jputRd}xdt{nA9Q$@l1OjN zwPBRPEZM+OjDqt}$}*WW&=}cSj4W?1h_)37eOx+ZRA=B&{?i+b>yYDNWV}UbYk=)Q zP>aH+hvg2lDxPoOodbaFV4spi`Gh}cc6QhgZ_BsdPLKH=`oZCekYCCWnS}93Y+G@} za!L0GzeR8iHDvG>isJs$IH~dIu+43%6sAgXN?`AKa`S4wTD&sOfq!yL+ooa`CK*a5zP0v<5_Vz--GC62C>eyW3Jv6(Yq3-K%NWL6Xy!!|CEm|)Mz%W>E z8o}p}6cv@1RSD1*Et%D)=A1BlM=CzT0YvvVP&fOXK}KZ{D8k`P?nVeeRZiT)*pEM% z=FU_qeKs+p%;7KvQdJQe#e{H?@5!Jesxq)<)e46sH(6w?SKJ)^FkwkxQ^6~{Jy>!L z?-0%cPaPB9Qg7@EGm^=Q4d9)a>IGPIM!an+Kj=s0)XsqsL{vM{mxvH33e!z(xV#6{ z`Ke{~DFS`$k{wC!l};Mz_P4M{A9wg2cg30(J!DExlI6~DOy0jNOTs*m^C+sdVS>|8 zKQbY|-cZxXWaaYAPh&a(6n8nMC$E#4Ax1dG1^7U`kbyP)eNt<$z# zeKqf8_zvmg@OpT5%}K7@-KjUNJ3r7^Rf>FD;loeDy{U_?lNQ`5X zXHyC%i3!D^8iGWLS`tcKhJXqJ60@d+&adg%I-N)y%VpG8B@euw1mA7gj8|K2kPH>G~2^m))x1XKx$48W}sSyxP{S^wVRF|HV zSk#xKrLp;$DhJ9vDqaY%EILEM2Ie>ubBPA(l^rv|ENJbGe@9V+j@`0`*N(IrXNb+t z205{qs|n4g|1uYbn6-A<23RGq1$3V8EW-~7xP9?syH(BlAPhezomNa`j4br9Fz z)=~FT)xlItaCuX3-KK2-mJdlf2&(s_-7;NWiW66eC_FeWNyhAkMMLJM8Npo?+Ozl3 zBevk_Vd?ByzGrXwCsVhv6s(Tp+}Ppw3y4LwYlS3-2BbkP8R^(QNOla#O~s?%vbkoe zBg7QnQr#UJByEJVsd2iM+}^v!s~Q^P|b?a;Rxpn}(?tsFwEWKETpFp4?3BvCi5gy4)HQYE#UD<7N|{(C=aHd(2(eQrshhDxlelF8qM>` z?!0>eag8!)0GMz9P1*xxHa$t6>2EWBNqBCD`#9Y24Ad)Tu`6xK*_p{(M;4Dbj0LQy z%O9jFpEv&AJWr7I^R~32?HCc~v6<%wf!D(hX9T6A8GT&3cqG%Ov}t_I^NJRnkCk?) z40aie{3tP3S-krhh($@gBH7JJs$BGY!0`02RLo%7Lxm;5!mS%1%yUC9v`4f>ieE4H z#l!OqX^|s43*g(cuhNd>V;JW(jq>3?_#5Zu!R`cQIIF)&sZ$kIb0@Y*8LZGeMsTds znrK>jN8=W3HoVhJ8%0!N;w!@&QL5YHfg-HJ%tTy__Huju0)K2$Wl{|%)5`w*z1p=m zqk(I6-12zJ=u`GR8QMYSslPAtZ@0EflK#cS$XoUTvUzAD5C{~PM{Op$pD8|ftE~PX z{g+?P+@KCOnx(#?cP%8e!)k;X?=ysdA>^SgL=k26OVx%=wa~L|(d(mYv!{8dcze6j z_h|LI<1^Y z5rl?QRzUbq<^7^<3Nrw4iZW@%LvB%uj&Gr+rJ~GIy%hkFrYABRAUnS$q%D0>;?e0F z*YC*NTZCx#;`B%J6dANYbnJuKuiyJ@rPo1!W(yoV9-N|E*bi?ZPSQpCp{sJ6NZ*CU zkKUycUA-@@e-CT-x2UC~bWalsYqBGg!6ArFWmEw1t)0(NT zZ%ah9P*p#+ogxb4pG<{n=s1{w6yf)5Pnc7k->i4J$D=#oy!(LeDbH6emaBR=LFm?bmTzLCYIaUSX9i+(Np3Ech~* zZHTPZ`qMW7@!C0m)ySk|8>=iz9uk3a={c)1BmX_(iy>YbGwBzbB70ITRD;4)n5Re3 zv3feudeh@Wv$Z^3LRkfij>W8`O&Xe0GmItv={wtBH*eWd&MAov7wPat zRX+eoZInHV$FwzpEE#?ASl&^}UDi!0=un=cDFEG_WE^xJtRnhKeVAkBcPLe5t$F(B zdMxkAZQBM_DexyTjp?KgPItFnTep?d7nJi;%7+2_B3wz#V@$6<-6N=m@0Eb_ma<*2 ztl1m5s--y1ew_AvXWGOBMlS{P^oSw+WJ3-`l?LTUxly?Y@u^I6d#dM}QeckO61;u5 z*oLSY({aV(R;c;E4J-16B^vd3ZXp@#!TXInjaahq0>{!8;$%ZPqW!!dTfeZcQFyZ1 z>`NnKReAcFyh{VoCo(Ecg&r#L7$AT&J50!dWuZCSI$7O;2*rs6tQS_bbKP5x$#Btj|uuR!tp8n*%I3T z#I*o#zgxZ75dLNmV{k-117H-Xi89zDKYCfrph%G{*9i8aW)#fi>{Od&bOn&EF~ftt z+7Pq>z)@g8x%{iNrNriHjL8#Tcz|$oqk6D3K2kKbzn0Hlx!8MjN0IXyEo3x@M3g3*q)7 zf=$>mM3McVz#U|myVoDXx{f+xFGNmwCa95_dZ&z|Bvtyn?%{DPH&dD&SoE3s&_z0x z;~M43AnS-z%h+87s-#;(dqrM5{(uxI-x``q{p*WxUWkEWpcdlud)Nt*NWi7ZdDIrC z_*E;|%V30~wZFY1*p<%OpJEBchiO-F5;>!XwzZz1kddp zLZ#w8zx>=scB@Ztd0c#j?z|9PpBNz*-EK)g4%Ib=AD#i#u%c_fz|}vELP1yJH;%_G zBIz&kcdB@=G(LXklqV+FuusvJHyD%Dgh&vGat^kil{edhO2WkgZP$cFd57ALEfGEm zA{ooH`(!1zw_6z}?LjLUIq8nv7yXTl)rjW5#`YLa&C~01FLasqF-bD~i?@MUFJQU& zSK^=jJ}|QE;-6WsfAZ7xKB+J(n3l$B6d_yYh*tf=XlZKuwE1eZmsuk&H(f!fH*$*- z=8VRBrHYD*9hKoEhI<&FNX$4HtbcL+-fc8Vrj^C=axFkI+|CN6am>_(t&OL%n-LR| zXL0(#i=SzkCh-Z&b)93uyM`NMyhTR&m(~3<4n_DN8BWx=fa0lu|1Wo@HZ_;#WnRA` zFqhUtg=`xdz#g5)lATxmS6KhH?*TGIn9kY;$7BRg7*A5X&9B*MBPkOrMH%aA`I`Ybng+8#5_=~W4X{{&s zp|@|-*oP4uBv0IA7toH!!d(J7dy@Ny_DjwVaC~P;D|)N5{HHp?{K9H-kn(a+Nk${B z{~CaG+Xi)9`xa=0zdbJ0|5IlAA7J1gd)GgZAo4rry6_u?XS4cB)X(^@9Ed(@ps{>e z$;(f|5Hm3q2K9j6W_=e0u=dNMOQhZ68_T_L_>>Y5@dZ<#gj*R+J$2&S-1*dXk7=Ic zjqk;++de;1`r?`E$jeg1i2Mzpa9gs94gq1K#1G6!EvdaUQY3boUDqWoRNM3Rt;Ks? z|EIDufroPId>lu~1>khSb`Z}t=!`zW%eR6~<(n0XDNNTWf@b}bdxZX%T;np@o~ z(jpSKP@+_Hy(&v?mP+^bo{8~rj4|)&GoP_^zP~ePd(Lw_=l4G;fL^t`kw|tiVN}*L z&USsIm7Jk{c%)>R9*x(!@`lVOub%65yrN#sRP#t;S$u}Rid7@pCX|9Mh#q$0D>wVy z`ks^`e)vp6hryw}6~U=;H&Wd3y($#i=Gfb3f0I37m4Co6CP43!Z(x-N`X5osp1tms ze%c3}6kDxdVi;xvDg5Kk=TLkvqlYWfL@LvboWsVW+U`h~6rz383{`x@j1I34O>A9u z(OF!w(7xw%ab7W5$HpM}K%Mf9$YGm+jk=D;r>mTjH9CcgYjXwbLtab1OI>AUy5g{C zP+qH{X$!n|DOCvC7Z1h zLb#ijLmCEVemlBALG`lx+>j-CJM z{h@xv#Js&KqkRhBOy1ko*g1^9E1Qrp(!v^?%anZ^SMoN$#p>Wa#eciXlWFTD1ES($ zH&V4-ltR*P33%k}#G;=mJh;o#As5=>+aU21_EK|k|9@jb19hYPwg}ym-xdxYfL#h6fHhzqHN zYkcGRSE)zjf>t}WM{V$3mj0`ekRsBM<`vXf`EFyewPD2G@^lO3*a69qCC@P{(GljB zE`En-IER~AWiM9AR!j4{Uk=#yOt;C+#-Op<(;EA!y|FJxLO9WFXBeaS><3EcaP&*( zzo~{Dmbt3xpYxQDABzsC^mB-j_Y4fixsHDJ@(yo#wk?L1;9ELcW8OHntM9o~DYh@8 zuPLcd@fq&(3&k|dQ~tzN!->&}k}9$L;?Dn7wRQCA2?Hg$*v-@qnn$E{Tf&&2xYXs+ z_LD(>AN;Ua#b*3^n-u!hwIU%`r>>7{oU5eb3t#wbl-7!T;3rgjJ92pfS?_rEApy7Y zS9*>cy#}|gS#39hFKYTV!#^#)X~5`sPNONB&!GZCky=_LR?Jg)3KK5)P-{=pn-RD7 z|KV4UFm2h_XU&_LWA-qv&zCnd!%S81{Fg%;N=8@A{_{GzSaQPzz=BLBF>Q^P|%BeNnwjwq79i}r|@D4J&`6WOqN zeY4?>G@M^Cmc%VrU_17)(9zUH(3Np8iJwT-!F6ng7(=exsw5C*3 z$^`UBU)w+AjcY3CzPctu1(Qyh&@|3*@)ERG>GdpMP7qb49B)w7x`l3AJg7h}x;0XH zOs6_OLo-O7?~z)8VTm_**C=p9U)bW;@Ae%!8vjrG)&fz`lo;@0df-oa--Bn=Is4xK z#g*H=;%p+BqtiVPugD@`558mx$YcUuh-p4BSDQ-0sDU59vNdxwQMcM|u4!j8JDY#` z79(TupPA21fk;WyiB1KNgrKIg*_v#(GB2B@A%#i?(d?zypHcFT)lO%(98W6yOD8?n5M)czS{wx5WqGz2>X%9Wh`BayD&NpQEt}Go42UWTnwA<_|%>>Wwvn$^e4>v zR$*TaG$)R%LWU<(G(D&=EHM@W|V)P*a|Qn z4hw+b3E`aZ&|L|Ph28KG?7aw1*qPfsFcbDhMwm-!oR~lMl;&Nk!8XJQb&MP8{HDZk z@nIuXL@4_N7sa1zs|pLiwv~uL@+mF^IG9+%O0bI^qVyq&3ni{R?O;vVhz!xpO5sA2 zlPwu61)H)UQWF_mNO7=eft6tY3qjn5ACL*xp{QoJiP>sQd;1H>C zumXmzaWkg(sYz|Yx`GcxA$*%sF8G{}N5KsPpCLiSqRSQ*W8W6=(*p?eRqY(+kLsBF zECF0j_>T|>v%g_sCZ}r@ymgC^g`4J*x!=fzKLNa*i0Hg+o}&Y=W@mJx1uo<878fG( z+vDkl-FzEfaG9BzS*t|m?iMT2se)iLW5(_odEUJ)I~zW5%Y{PefPe47&D?g75rz66 D613UA literal 53319 zcmafabCjpS(%#s%ZQHhO+qQRh@EhBgp? z>Zg@tLBU{vfS{m&_+)0Jfc_Sc|Ni+~p#N5RaW!FjX$1*JP#~p$5yWK0DiiuEp#Ha_ z{qKVE!V1z7;;L#4@)E!0rzYiO=^5tXW$9^Vre>Q|n3h=gjvuDz$E2s_r)j0>fMG5G zW~oQTI@Il$Onuu)iZZx>)|pto~gF_MbAAF2-hd z=KoJo)PEKAbTM{vGI#kux>yC7Srq*hUH)51|8o~HM^6VkM`JTGW(HF`V^>%IXnB|c zCZy0^D|Q`P55^$aRY2}9LMLJdK4CjiJ7{U?%APD(#Jz$cH0Mjc6Mljzzq*%0Xd=;p zek>CazgEt)N&gCRdHFk4! z`Nt-dsMR zJx1BH-9x?>MK=kh5CNm!4$fTh{hs3E?Rq&pUA+aG@UkI^34(?N2eqZ%;%JDCLE})> zTDieT)or&WK^X0C{pkxgj%l!0p$}+RQbgd~D$vp34wkw3z)a^Y+bce5|hG1RQW2IkII_4D$g$sGMweA z=M61{e>e|4)+~_f6z0gL8lYjc&LVxtDZpv#Bn1D1pws(*J z0joK_aa5u_gr456fU&;B_`kf#f4AGyD=pW`zuLC>x03v4t&{$rru7e<5|8=y*RbFK zf2Ph)(2%=f44zExyQ^S8g_Rx++E_SbcrV-pvLFfj!%%oru%X7&KHq-(Z4&}vocW&l zKtTl*(vq_)LM5G3oNCS_Q>`0gh8j+==~}9UG?5Z(ZJQ`3XJ}X=@=yBuGdGmKga|i( zYENH^4rpa1mjEbL>L>0BkpS#C19zs39Wv|B$x-cO(ceWUs$oJ-N{}5P7+bZAMaQV>D&h#E zeM=s+fZ4oy}@s6i1yE1HEu*D`dOY1@5j_K?}wEQ|^~O0x40 zs?d%Fca3*Ud-l4XOikSi3I>2^4O9jxPmOyO?osDThf_lt8A#~8Mj%Pl6YX~d#RK&q z`6x@MSji8_Ld(J>>ApX|3)2{GjMqArJT3?;%%*xQ=D7i!F4nl%*(U3&bY@)TyE-SB zwqt0`8_%P2r!i%HeG-hV78`JLjeWrfZCnoeLRVj41=!jxHcDR-3Iubhn7}x4V92A3 z<+5%$ZNs*valApY)lrt@b+EObNCCO?TcqFAXD)y0^E^#r^d zrNfVqg~_^A8lur5o-E*jf5_k6G?aS1f(`=bT=`U7!MR_jOr9Q$| zdBq{Z{r1FzbieD9dcR9g>xosmsouZG88k}q#a<=Gxs4{q=<_E>>2VnMVkF9Ojz4Sn zmjPH!*D}%VL^SdPISb_;hGE@|`Yw&oZNDq~;D3cjS|_3pV_6R*ZA<<@JLLQ%BF^9v zO-w?YmttK2g~c>7)QzVaH=^Z=g(Ooa45a2G!yjNHXh~AkF?(bi^iMluy!i_92^C5x zhv*FnPK)Oe9e9P%PG1cr5rZSq2={=Clb#_0bX*RgU{Fy!lP_NM)uvJF`l)I{p)=-( zKvsNnFWn(UxWfGiqkA53xFQ#EDOLA){x^ffJJ8=81_uIq{|gOR|FfEkdzsp~yIOmg zOIX{P3!9pnySmC7I~ZG<|I_QIXvjLDn&bVk&!n*Kv?mrKRbmK@$ja@zBDtq$iRA-pipFl7L&}q_pz|biU@5 zwJkQVLT{ zPz{zxULmGBGL zoqAfSE2=2CGDQQzUHz4nHFBp+E3-W<+`w0>C`D_c*`*=7#LS(Y!-4v(+h%x!(d^Mg z7*~~-P2YafY)Pa*mN_}w2Dx0(846{i&;c(K8`XvWrpC(Fht3oyqtLtpfGRi>EvPo9GBcrlR-WxS1Icn5>{G9<82lREUh~2W|k6`mAWl=-_XWrss|Q= z0R`-?detC4K^bhu{=|Ccdoz4$8y}4pGc=<~DwF8z2F=;%F)YjwDu%K2{-}U%vP1K3 z65~Y~@wB~$5p%tvssO#jdmMwbgnre4ZsJ3ExkkgAw;O646Tj0&;sTcISl1!ENGLo< z=SPy%N;AN+otfUeokCIAOr?-kdYMT( zRYo<&gwjOXYtNCW4)D9I1euDmmoLsfz5a<_lS0t$Ewngzg?v)konJ+Bc^N~1ny@UM zRApWX*xQ7FEj4IfMvdg3!q#V4^=~TI^uaxgLrm*!Pj;<)IY}8b>QAk#lKCmI!jRz) zam0u4sU`UeI)OCeaRsz1w!;TSLPn8u8js~6DPnTT>12OoAIM_9Ws6fr%gh0=L!i&{_Te1Fu zg7uBN)Hy1nGjun{pD76aGW|Z7ujG}phVbLf z@d6nxfhTA*UXpcpD7ZaDL+${Hzhzz%#IOi|Hy?EOfGVJW@o_c6&}tvUyKVdI2L21 z8?g^%kvRE~DdmX!jgsmQ8MT4RMTExVHgYR{A5;kj|K#>z^OM2w%M`^U7X6YytRp4zF91ZO~Xud-p=<-_^;q)3f@2>;V*c3 zgZRIK7tMdfPNI$u7S@*TF2-)wjt>6>FG==_sKQ92e>P87f(3#C3kylEiL>+fSfLTs znbqOYrTj!|ol;4UW4H9#?^UfynD0Xg`w`8vdvx=wH-|V`n^=G6eO>E)e9X=o0-fAZ zg~_Im8*xP8MZ?`V3yx0nalUkT_fL!9L|OBh%{|)--d$;M*6W8E*E?GUu)vSPMAu9| zmBEGXyhonv!j+Vlnex~dNwb&Hzx1#Mg8~Y6)PDD88*15k#9=KMUL9JY#1-x=v2Hd5 zlLNe3TBqZ+++Qkk9oJ%?T78!qyI(A-PsU zs>%$j{PSEXA=#B^DYlMW(Pp_%8nCMpt463GC^>V>FP37}ULG#Gcm~E!egrkj&bwmD@t~R=i@Ox;e^j{w zbM8sz5@v~3HO~IVm|#r8mq@e&hmLefrZ!40WR6zSh=NeIh~^ta*F#UkI`XEk_#t_6 zxn7@)lpU31dEl&vdO&^=d+*@?4wm7Xte2icG(GJ!;Iu?eaVG`4JK==SiALm%ZKeXv zB7BJcw^b~G(}M{0hw1Y`S0=s~j-?2!qXt5Hg2=Tv;}%o}i6}`Xz8bDEAFQJYVtj%q zPWpE-qLgx=9JR0t%a|*Ur^5fH|@dnpApZ$$GcL-4u3NX|Aad+8oH{w>S*5_(pD>#^()Nf8XntzLr&m@Ar>5LE!FiNB^_o;vj0m3#RiycRAYh`(LCnj&J!! z8VV#TT?Kpg;I1$y{#FCUn9AG?QVmqY@`P%1(q7fblU`-Wv|1?#sar>-n6?62BV8)p zl*1n=@4}=vd!pc(LGC|W*L3W>eZFT776wR$ALWiPVqCK}{OOYyro^aD)&Ln$ux#?$ z79;a=mg2JJ?myq52idZ1L2CQ^BLjUWHu77%XPBO>JZ$yb(psL98G^N)>01id0oj-_ z4wTkrV1QFPUSyfI4G9@U`%N95n$3bWhmrX<4Ere5(K*(pOzF01v<=iw)pK+%LaJh0 ztpaS)k}yb^#cI=Hk>5I*m)(GI)3c4#z&Z5Ill-`i;jUQE2H%6J4OQGnMsXp6jm&v&n;d357K+nQ(6vv zeun3ksqs;zRknv?g6YJ)WGu5t-;@y5nt`B@AjI^s~L?DF&G za44;@)YR^re5Q6nRo)_I3E%*$m)>eWd9$r>Vc|Hjz;SlTU#okof8wG(OmQQfpwa-Y zN?}$Zbw~={8VQF7u8sauP_;IKz$kGNo}VA2k4|`qik^4Cik^4)Gm`PHB&bf!FUAoJ zLUBh0ggzxrONhQC#@+#~j&}2t<5I~R*z9uB6(*b8Bjq_o%t@rP!6;3-7ca=N5DA2>nUaaN!p2JLRhHlP)75wS&Ddeuj#uW0_uY&Nq-h?)f0k*UE78HD1zY&@k26$J*5XiZ^o9$sbu5<6@2J7*DN7RU|N(9 z;V5kO@~_#tctp@+avc#oaLL&{fuUP(DM54poioWm6?!11K;c+;tN|uvJ-XiDEUCRV z(WRQ}L3Ymc;15YJ00H5EsOZ-xaWcEavqYGri`Cw08>IUdJ$m2AIDt=5n9?f3yx3z! z>j|C?Rv~*>Yl45XAofhbAy5v;d;(}ThF8d?S|`}Zc7P{><;Ewso8Z9R{80y<&j^12 zVoTl}_tDFdzU4W8KR2ev%QrWc4;<#(nPhwfq%*hRJ2SwUZGjY#P@MNz+sheY`lulV z?tR>lQ2X-KGQ1g#J60K&lHM4lDH3_DS%9br5&H@9+xQK-SL(~m*UDC(CJ2LH#g?ia3m{#(fyrntT`SHL~@0TrIDB-T_Dw8aeGM&ON&yP_#-{c%E|0{Y6P5N+LP(mB+OB|hiau?HN6~7E&&_qc z<<9#}^W*#b9exio>Rn0`2~$X1FIk#NGCQFvS#geUeI^xy{T zAj{S%T*HO*b-IDQZ$EaU{@_7f*`R>uPKAGx0!LSCY3699DHJbPbVu1pNWoGIzWzME zyOGOrQBkbKmU3rnt!vpZ61#m)fzowu1)6;=|1$xll+U;zH9^G z$pVMp9$+?`%Y!4xGPI`hZHFKxhl7n*njoSh!W!e-&bTj(gQzT36fP;khj9RX44uO= zIP&My@!e9d2&8R>Ho~ShvVrmSML=FppcvLyMj5;hbx>nx0Y*;;Ofzgr>O0$XV@FD> zbU0tHIS>6{e|XU_f_g@>$1N1b{|kC9|9l_c}%DkPu0l6B6S2(eKwT)OrfFG*g)C&0=du*T9325r7j z#}L@$>XfR`%I}2C3;e1MH1oEXj2PRO)<;)B8`7&l`~iEmg_kpkE^|{f39M7ZVEQ=o zaTYC<=4q*=8>$IyKq|EzJQ=Wtmy5V3vRSf2lG`e&vn1<9-<`Gqw_w8)y1-6VjJ+Tm z%7fmsb$9Um2l!uA(&W{e_Utc|#6bW8qWI4$sbuVCCG6^IZg28m2W^VRn<4Hh@*f5% z9qnp+I#XUFDRVhgV&KZ{5qtTARN7V)uw>d{1rdy9jLYzp#;(Q!O`i_=TU!2w&KLir zm4vN1#oxYv%3F8W^=0$JDc*!{r+qUyf9KpzWwrhJp1u47;)L)gdY>;^G`V(Esb3;G zk$MmwJ6BUV`C49Ei$;cd$Y@MKyBM>u-rU1PX@9~)9FRrhFzke<%WOCK~kGU;n0=E&tTXd-7x$hika+A1r>B9G zNp)P|;kMBnoiTBeY0P+GD=zv8`)a<;VUBMH*n&?g|0t97AU^Dx*lK)oS+8ex?d)P6 zDd(uLUYu_@3Rpe3w)*At^1C6^&is=4heh-1w8-#^xTo74eGfu+gwwvAe;qnF{dBWi zIZPlL9bwQ81|EzaODrhE;f7fUOh z$_TF!T)D6mD;ylMoG}&jtMzzsC-KJ(Me*?DvNJ(bAK6ckWAua5bkmlIP}*mDjZse| zy>;@3=B4_=(GsH>#BpEW!RuCPKcrA5f?-P{dmP3nX#EZ0W5%H2i@ekZA)S?nX>lm- zMB!KOngL}@Rm4%&21h-q?4MAcY;-{3a)Y#)zuNl=6_pb1L zNatzoMSGvTbxsZUwCH^+Ou^ba7h6Z9Gyz5XZLc|zySA^O-{t#?uT4P=h-(zn<|ET0 zD=slX`R`Fw(Fb)wR+7K&F)}pf7T0p>v}!x7uilzG3)QGkP&LNo?dq9OOVw-Jq5Ie* zhMudU(+76%JmEd>GXa%iewthE9GpV%>|3S}!80RKn#QcS<5{hdKdij;QJ5n2S8~n1 zO@c~Nm~zC1eRgQJNz#XOm8J4xj4W0iur9li5&Nbm#|OuMo!Id0EG>`p;9SbIR$o{g zbJr!39!yNoVg=}W@=#HqD>+ybw+CBh;W)sGPJZVY$2~AZz!DB>O=@)a)wDg-xBas9 ztx$G)|MQ65M`_mcVwa;egOB(2Gp4fX4GcOVcdxBZ$wdiAt5{{`l7T-YX>|nLjEoQ{ zoUG}4Cc>=Myiuj*-OJR{d5~c{F>OAoCpeDha2!{+X?55v%1LURxUA8m&o)=iLiZzu zfDjFEFCxy!Bmex_h>zdhnHOX~%Ff|$aC(K(bm~9|WQJ||s_vF+XmouxLfQ@letTL8 zFI_8GZ<%ut=O6Eq>}wZ=M|gPAlZ`&JuLeI+m3u)R%RD1QDB^`gSXlff^U5^B74`GJ zzyELvZ95%Hs>D!KcW?rE07S4vB*Yu)E4L)6*TYDf>?b)91rzq#CnJAFwqx0Xdh;sM zLkNZ*aa-eO z6?5e8;_5*mDcr$%=Yg#Ba-wXD8j|^hV_p6OuzZ74{jT-jigCu1gfzV|Yy3EWqw|OD zePRBF@?j2(yAy+a%NPaun+@#_Cuht|;CV-;^F7-zY%JMyXRGMqq_xB5oiQ23ZCk`#V>~-&uAl04CTs>I z_l(;6p3-}N$a7I8C>HO{(1YuUGCQMMbKLljYj{e|4$pm!7yzDR^uj$ul3J7o^JX`i zAHF+QBJXUMPuM>GsoYxT?q|NW*Jk+VWGg{%)xM{{r}EYC4J9=2yC(kp+r2E;PU|-A z-+SsSY9Jt@|9nxXvSB1qY_zD_qti!?A{D@NiS#)*RjFCD*z z6o1D=bYbS17=1;0Gm|J*qZ1{w+^eKJuTdRmLa(kYJx8@>P_`7yvCj;c z*@xd(K(og3`-`A%IJ59~*nEmUGR54g`)|ORgNLAc6Xw8`hc0i`@ue!6mCkz8>@bXX zzePeZ$D@aVGiPOse^lh9jk|V)`=&^^->R*j>ESehyuZcf1=c_cA{I@FVT z3pL*%1NYQGdyX>F0DG_M)#j~RXGefuphIWhHa!SF#`c1P)3LL;pu&A|q;xrplfA~V z!%cL%v_&p-I_!!N5N#TcWUZonT1j2iFd2)X)>tqFq~rJp8%y{z8qezWaDFvV9!Xafbse z$I;BM!o}zvC9)JYPi)(%aAiyw?C~QW{?g6H<#uH&zI~AR-!*Ker7e-?i3@S_mxt`! z9c$*g>D^EF^}pB})}yiME3CQ_){0G)_>d6K6X<;gl5gG0RxenRX1WJbIISCb;7H4ActAl!Hu7bfY*WL! z!ShEd1JwPlD`F9Z19qO5p?aSM0)^Y$NrIE7VS2C6mSWE{kJoy<|L-{ zxwAKEw7Vt~`0=Bk^d+n;Rs5Qo-I|*zmm!=h#qb&X0X}0g=g6Cj;NxC2$SihVajZUF zG4bXh*T_GHexj)@ZtcfcRcb1doe*2J#x-YgnhY_;TNYAVvGbaCrpRCw=`$skMoE`a z!dEq5<~I&S;zo-t$x(ohg;ysmwL(prVUV7A)*FX#;`ppdCrH!cDQasIZB(xgp(<}T zUP13bsoB0d)7D1fAORFF zhD4PxDNC1LU4uRxOcGuMnLvZimTFk#>~@te_OAvt#IN0x%d;hB0#o z4jN9DyLW~~^-`hJ&`mu&9h%Lg=n0!z8{3x^P7w~4AG>WbN*8`V2Fdglc&hWrebIbn z2NWz2@fR()KVqlU7TBu$gb=8oOY{;%kE%IM6wX#QXE`XH`@B~VbgB3LbX0qz*eSX@ zJvy{VaopEc|K{6`ynY*!nFg(vKJynoW_(D?7q3l(I$LRRS1(sZ`)-`@ed7T0xCzO2 z0!Q`{-rrR34el#^(0o%!dAZjgW4JL79`LOCWdH7*c)1HmxjlB2a?P7~i9$gv|0Mc? z!~HdP5L1zEE)iolV9|Nyr%OrSrZIPtMs{ku-=45!;w&pFY;$fQw`l60p4uOPn}(-R z!(Pg1I2~z=FLjhTALY-pP)0vBb6F*k!94WC|Ks>f<1Nci2<|z4V)x)nj#q(7EYlN( z?m*`;Njm>w@Y6o!hB*C<=!fL7q!Ic}BP~6vS(!flPC>``T*095{-Uf2c>_oPlDmT1 z?PBMnK48TGi+OsXXuHwUmcMjaT_2@M_EAi&snZQMreNBWzW>yAJAw;C#~+7oo3b0P zUcKa(Mh-#PM&?pYW=4oJN+Bs8YAShVZlKk92t@SS)xu;;tQcSAd1i_f`LKZkygGfP zb;ocips`YeRyuWvB||wWQVEcKQ#~wt{!qK(fi`C4?h(UbBXleY9ursL7fz`83Z0UN zHcEIBaJ3?u(ZrB2_d(`g$tNVJ`UWLf^04^80hKqO6?7!jg)IwN(0__;H%D3N4EV*M z8gLrcS?Ih(oO>*rR{2SHi%cV_E-*4n{i&bQM`=VyfNyIZsZ(VPY@Feua7j>k+8pau zsF8H$Yp{>0_AMZo9I>Gsil;hfUga^O7LZ_wQelvKl46W8f#E~bH{q+K8ZJndYA`8> zYfxYD37Wz2acIj?`ta^WgVHL>?~MZ9pz9cp<)h+MI^LmWf}$Wfl!4Cy;rp0QKA%2- z_sfvSgoBe9nd;um9qu@1Lhxu6{X1bo@FcJNQ#An8lwX0o{2>c2uWwjT68l2uyZn*( zkH~(T`gckGq2{N;$U@NsTgnf3!rzWyysVNureF2%_C5|WGx#Wi-LwwgiY0>ck}!WX zj(6{$X!>S7N!oI~bcNos&J*G#r`xQqAdjOh?O%>x;f@=VD@x?$AF_W$YJySWIZxmz z{7|u8AL9)=C#5*XYbs0aB&cplvL10e*SZlCn2!D3TGo`eWSP7Ymz&pPQo+|y>#+Ex!ACk8vX3s1%#su{ z?*J<)W*C-}dhI$zb+IYgHL9LR!a06a%3^H*jq0=4s5~;(xoN5Q6D=E0n0!z{VR^=Q zBjUUB*^Do-5iX)^Kg*1e2K044n4aVX#t5_+n`cJB`5eIAc}z>9DJxND?Ynl*)qAz1 zNufNQ~Ffu26!asD9g$%O?WSUO;x%RLl$XM< zE!=a8X5Tw^d@8T|Y)t_n@Z(@KD_T6x3=~9&L9BEF|;;jPdwz(Ry=d7`z=Paod%f1Lbg2#Z|-avwc6DV-0 zU#{xng7SJ{7AmrDNo>H3Nwz)0j)LebCzGZ!HHcq_!M(zn8yWpG}Te8z4^AB?%ow41q{F(G&zlez^y`>F5pvOX#W0!6W(`rlD(yLLEI6#^a*iZ4Vnmxtz|NqNN=?%>ujQrGp?L*SC+- zd08THQ+2_(Rh!6Flod$}FwW-Qz%^SKL+M*HD4;WBh6MivYW@waG{$Vsd`XzXeF5F- zW6qOa+z!=4=+|WZy8%{3AVYr1BYbDvXQA6lHRs$H6AB4L6+u2E@vzv2_--*MlPxj% zIdSz}kVHtYIO1S+RsYkb*YEv~NQ4E?y;40;L6Nvp;NNf(U^eu}^|k@B%c^b^gPe6J(yt!m1fpwF%d3?q~6qC-(-`f75{V2G4|QWdJdP zZ``&8yV0okcS<${@HhobNo>QtK5};-M>%POUoHeZ24{LPGG6kRok~CYt#Vwy-1+7j zI4w~3fii%f{Xq)nu_W|HgjaFa72mG}=JCXDgIn;n@3pL`omOqfsimzBJKXC7tN`1% zJ#69}akk%lcAdeIahb=j3~0%RVm>aG4b6K!s=5l+@Cw;NRFv4que6PS!h^c)1KB6b z%}0V~*`PD;p0w)xiBiK;gK6VZLVVZ#u)fqdLYIcZY{AR7M%c9X!awac*aBHgIcC{q zPV9igFbGN$o$GL=gSj9aPIejMlae%yxfJ2+76RH4e%W?5%Z@%2w-1nCLQoa zI$b61brhDnl^o&=r}Bb&4!~+A82mu3e>DDt2Z@&?8c?qo` zHBcYgqDQ_jWDOOGAaRag%a!5_1_3D{&2qXWJHS4RR?*>Ov1>tRhf2SCVHUbdDR0207HV35bE8LkCS30!Dh2(PTNp zC6e9C-zy86XaF5`#4PP9UUcjO{~ARQF2Z-?HWGf-er65S^Fqz#{3XK~vqrKz zaJIXBtL)(nVpAm`_B3vjfs8P!#e+D{4(5_!ZpH| zW)DcmeyTr>rzJ15y0@f$6CPim{;F?k%KA9J9rSd)M{L# zn{{La?*2(={_3nL!DvC&&1kG4L3?7hHP{^uPWNCe4S;0Ep48eO{PN-3OALF`NV z0{}UX$T0)QFi#uNc1&?Jtt{E+kbS3Ts6D|iFTC~=p5OoosPQw{@{CzAS6kMgRMlX`b2A_q$!P=QQJtD_GEQRHyh&2^kTQ?%3 z_UQyr;w1r|CU3w;Mx1_{oZ4Zh4$C2jz}TGEUWo1FX|!Wh+?o$y_O3~BC+tmtj$NO$xUOA>sxS}`G}x0SSh%xOZ<$XU>74{fGt@!#~)hE z$TV`Fs{PI1k!%GA5!F(ALAHUp>BaK^%T!4GLRdiYK(|^;x)b{u8x0bSD4dS+jP3^` zD~#br>2ro7zEvsy2y!^aZ#mmQHMSo(_j?JoCi05fD^e6#{`BBu(^m}|S`tQJ@KoF^ zlx;3_wZ%U602bWvfEIlAj{V+cFb-odP69xH>Mc9K3DZ05sdn`nsET`Vh2^T+2*kp2 zDmxbjrxbsw;)(-yql@lL1q#C-0`s;Sg1v}J!8+OAo_CZV3=*<27#V!_o zx8}2$Y*1R^qn7C>bs9HSDm|ZVOo~a`7Nz=Vb?uR{#u}2ZsoaYDPhQbF zsMY+%&bx0&k>%;KNTZ)R4dh$3&K6Y{a#@WF$R>4-k5}-%S+TYScxn*vqA1LIj&OCC|vnTg>z< zl|)*kaqLjJ;Uzj9fNHEzr$f;qw6Qf-v0AisnzDc;^(04seWs z>K5hVP>CB4!v0Y3Mx0C+B$zJMWDg`E{Rm6Hi$2+(9>f&)!{(C5r;P3 z!`(5#A)AaudWVAXQBi4Zn_2vEzS}KwWvIUI8tdBIjV`V``#Czw-sENW4Br~n(WTN` z?;i5u>=U{-@MZP1@NTm2M@}K_exDARU(k)|jS{UGkbRfxy~Bew_%s9c`J^Y_YqbU5|sUH^hIvlb2d)BU}7S z`X|K#0;2lQ_YD7}c#3_762;|?5)Ar6VH)YNq3_6yVEliR7J z(yBOP%XSNyg)8GXY}#vAA?xb|P%uQ>ETo33s6jF?Z3)cVQ1cUVo-P4-y505JKLgezFDT zQJ3#7;NoN7T;t%M0A(hyOk)jCPfZ9o~1E!g6juG87u$dp?6rU_#;c7vivxLKS+^T(gk zTEwQMoRBDR_0drrZgI|P;Ik-xCZj;BzGR(>h=o>-qI`<=FO{HZGA;Xk-RjL!YC#^2 zhPZsiEQjNkLD1AnCKn6v7Wy?j{icDY>CMN_|M8>+7$_fDwI4dyayKL?K{P8Jad#Dq zmF0^`Pu(iWfG*e;|2f?PATDsP?Joeyp5UZZfxh$uKSgh8K{_|}su%q!V(gxKo%_Y? zzac(qDNljbGcwHGX}7Ud#;&@XD8Obyvb)sMPQQS~o;0=3=M$w+@;4E9$jc5<8x$ySom!H`U1mqtI>V?cEbb?) zrM@tCAet*?uY;Buq)U`wf_$-|rhq#8Sejlm^FSdO@T*+$EEN+m=vPWNo!Z>Or-;f* z-DW&$muwazebX*+nybh&1$sjpBC_^RfY%j z>hC`(GML@ewfP-^yTqG%js69qRp~>F6`fl0V>@+bQsuAg0fRjHPF`F|jVP)ozeH)o@c>U=S~5d*tTHkjJ{G#-cM zG$Zx0!zEq~k!gD+Gzfb#=+sy=-+_WE+FPo1`Z_wA_mq4^2k!0C!+GNR1f%g5@|CYq zPM_)=m)%+O(lKdPY^)^*jU^|z7by|vR7C~6INuCif5tYQ!2YOme3Rp{i~F!8 zTye0Bx5uPDHs1A;^k$%d~!`N1M zea{57$Y1X#Nb}c(y^tr4-?bBPJW-o6qL;#xE)x*QT)_EqC3(mvIZW8r_`|C{S`VLU zPJs2eptr$%Pxd@rbeLc%4A;>BmkiW_sh6n0+@UjlMpn|uCe!q()X-2;$)dXSFH z%;DLx_;m#ID`(}dn3_0bL!eD(dtYek8*?q@;T+fiD^itUHHv@gg8|f3tJ2SmS)S zD2~8HMvPFnR~(YN5dNM|Ys{V`ds)%-`n7tzR;187>=kHC*93Pk(Qfk`r6#;t=-}Em zKlWvf{kx;#4ZLJX*>PaQWY!eC%)7)x(Z(Vfvo$yJ+}q;#3szev{^40xhKE&jMei}k z>Qp@e9t2Gm2cws|co+M|S?H!wzgHxK;g5bgV; z1`J7zztuEdEm;kEC5hmEj#etp=L}+jm+x`B*wg1sRl09Xv`$>g!DB|$rDM}@=k_^m zRiID3JP_cV8=in8#H|QSdzv3TU0_CsLX#8fh+uBoMCF(f`eP&&_f%_!RfyFsb~0Oa z&Ga%p!^&9Qh=h_CxNmwHW1PeZQ)8;YgbwYI|8H=)AoVC*-lX-AeinnKt{JKlTZ6VB zfyKjTv#Gagc2XYN-GSFK;gL&qIALdop^m06KTnA_vLJP796~}Lri^OM8@+*n<4);d zYweHZo&ed-A7!ph*H%`5{xDt`fI-{DHLq>!w4$+YOUZ3Z$!lwD;vs`kl{2iGGc1wi z9MjagqHWu_nu%CoTr>+HJ?Nh&aa#JYn15LNax;a$8Q|AC1!+K+<#q^+yIkhNZ{Z47 z7DT1or>o5lhMFO7LGD=-5EemE zDQ|XTXSfGzo^L6Pe&dg!wF;G<7cL9>t883>FgElXYy!};EKyR+_j9Ph?&e$xFDL$*9(o&;s=MROM zVsuKZ_Plvxw@IDb60X`@7m{k>Lfw!W3V{&-4Z1vt^wiXTNavVj3OMdbGtiTF9NvZc zy0k338WwoCHFuY~1AoTVgOjHtGnvj{!Q!u~g+E-ZL>H_?I~B z#a-K|?>W_(DcF0x_1*Z>5Zb)IqUL)*A>}@VcdxT@F2i=~H~!5V3%8-yE6wbFq^+4m>s0Z;up{jgB6xbZDl$z0eaKRL#jHQXM&N45BZd~I<}vf71| z4L!xVgkpYdDp?b!i-yT$_j-yqYz0e~a=q3%I)~lk@<(ib_YUWx514rkYt@aIc*t9i zy@d8$TV|tBS5UH+yf$%n2Eo=q)IA5q)b&>1V6ds_%ztC-9iuC2w{`7QY}>YN+jdg1 zZ6_7mwr$(2*tR``iYlpmdDmL|oOi9g&)4>k(c1hm+Gu08@u2tnx%<^qN3-c-YU!B0 zQ50ZeX{Zd>#4lHHy+m$)Eg5he6fn0T#l2o#xYU&ag3s z9E@FD)%X<{3x5U1)c5 z35aRvN7OqfY)IndlRrSs=A>AUl)FNukazdG zoj&j3c{O);<=&=l*B8-4=BJw56oIrgWacM1y^zV)e%z<0~t z`*i8<5T&_SwjJHb4v{+iRR_4x2u6&l@yEtgeQ@&>@1%GO_EezxYm8WO zRqwETR^n!*GG~9^fq{Kb&ikGirZ6$YAS3=2ETc`FRr&eI4Xl>XxlbJ9_-)bq_nnWm zseV~xl>mAIy%Z6Bbq5eH1-gF42V*Z0k$DH^(0;Xr2z`j<8=m(_Y~E&G*uPx z4V4Xwt?%xx&!_#M&jOn!q29udk*Ki+hPk|e0QIpwVJt~;6+0Z=Sz1FPnJ*)Vz*3fC zDI5d;Iw-!;%b&%LAqQJ=%ZNw-ND33gV(lkE`TA^02D@);3Yo9gNF1{Mom+6{elDgmkDN=#qrtPw#<<3yNS z9xEZ)6uEB{#@~TG)x~?PBAm%qK7^k)`x4|wifdC5lQ#uO6}J&?jK)#^>glLcLX})= z^nE8UtC0RAp21fA;0FY^x560RhpM>Y!Hco1&TEbo7KU2q0vd|}X(GG$adUKbmB*lv z!wra<6s8nQN;qbX)B)yOdjCPRUC!NI@^OGvC7zU+@eo9GI1*kPvjzKa8#<09Jx;m% zsa<}C!VV|l>y~MUo5{p(m`z$Rt9I~JE6f2pY`al8?AU#B^&%KOQnnn*INN@SJi&0IG$AACs+5Xz1;+-4^5CD=k@ zw9CU{%HMaDGAklXjXL^U+4=A}YUb*N+@qP0gcH(pWn&kc3X05#k1BDDP9gE+(v1rs zv$l}sK0*uzw=ZM0(8%I@w7h`y5 zyE{YZP7fZscqYN%@M)d9Zt2MtW#Prprlw#NLSH>i&6{)gY+aZOD4Wvgmg=7_oJ^LG zM?GZIilm7rf~H*`po>-+HFyM+GrzNg*d|>MHzcfR*&tTKT$es%YVr9(Bt`2HTjju? z9w=T#b}-=zjJKt+B;Kv3j=7#BzgNz>k3vhx>t$4MuyF9uwOLO-7Vq6?mD48Ga3ZM4 zk1wy!T;Ry1Q{;GaGGD5&J60GBhbdAyuiB$TiRibT%0rOCqvey9tcvQBr)}r5vmtlpof0L zUVv;yl`kw5gQ5;bmoG@9j9S!86jzI!t;rOTf&wXLxU4uQ@M9UJ-2|Ys-C~reL>1OT0*w1C z5wBHA23Ng3LAw7Bw;4{!PmD$y05eBZT@P`r*F5P>WpW>-%#GE3s1;szp2RBGOgyXGOhm?oavv|^Z%lr!xHP6syRY# zhWZU8wah`w_DIW^Y}Y9VB$tn4g6ZS&hi_1Jv-DJB?L&SFgJ+%ksg&Qke)Jv!3-1t7x)Drff=yU61!6$9w$@7f-Qr|1HX&QC*QdC{ z_8rY%&WwP&I)0rWOgzYrDLk{N02gbm8MYmnP8-~LvGws8jUwN;HMZ)Q7(S=}X`gi7 zE93SH#c;J5P{+fmSCXg;*Kw$dm0PPmWZ$YSLSUHJ@TJ6KFm4-6i3wg;YrM)nKY!uU zpTC3Y{^|9rUBX3nvK^uB+yl@4%tK{Zr_dYcmNM8II`s7NrKH?HIJnsj2 zpu1~#mp~8zZD8Xeql7Q*esUf4mMk#~5Bo6t~ zuh_+HtSNB^^)U)gjDhbi?`WqP9UwCz>IHe7aV=46dmV5Cr@cz|vp|k=2UANS#1`p#E$l-Q8^_X4<^1c2>VXeL zIq{jvr^PpB2+R&P_x *}2%zD=NG9hRbiksY5Q4rsZo!56h;h;g_T}eoVq`S)qYs z(?mF*YRY`)oLJXk213z z|M!W}z$>-3cja{%-8n23<1X0?wCM{+2YjbG!5z2rcnE8p##>+>gFoRhCnufONpKqT zfzi;llu{Cf*Y2Jq8~`C|y&&Jo&(Li~&%1(Nqk_wf~cjgF&6({d#oDrf2 zOg#(vl8S+DH3PTr(6Y66rBPem-?kwxa&cYTj^BsG>j-8=Hc97h`XDWSO?9NhX~WcO z0Y851+NXMHwCOovAH%}L4ii0;m)FN4OyKj2ELhmur***@Z0gv04ykGDJEf#P>y{jg zji0)NfBLSCu5YeyMxl$Y?WAi9fTVPKg40#pUOtuH=qfPVSLR6ww(kgza!n z?|~T4MlqR|x<3(7f8wqA{E_p*;kHlnSj7ph3bBh|?U>ey7i0zeTz)uSp0rk^KM?Pg z!;4aSby$~=aL@mE8 zA(lq2{}*tRqO2o>^F`;IG232tsd8*--Oy?F47a}AIM9(1LIx#j4nZgIp_EM|lJ8uH zOOlKFlpat76bSSasPVFdE|eqstYtX=rgvVO?8EQ}>K>`$nlh+?L{N}>oWh;;?S51u zf3am7k5kQK+&zoTBUabyu0wwH+p46I1Kb<4m0uyUV`tn96t% zEVPbBMz^h-d1|qOcTOn@-XoMNsU-_6@icL-Z23ut?5DGq@cK#Cm8sLJEp^i zMe)6p=BagOG>2f85omwv^~bgaAiZV+sniTGP*a zR`%+Ly!|@?6+sJLhc82}V1)_o2E08o!fW>F6%TH^4}*jbiQ*%U{G(T}@S_>%bMz%V zI&D~n($tda5&|uePy~&snK3Q;Yfwydsxe8CT{FI+X*Jq|oX@Q2DP{H_l4lzwoxwdX z16fHAABwdeDE){-XcjQjsf7kdDjiqt0Ac25n5P*P){^ybK?-a@q zjR=2Kb1XlzrY;s9ST1yAP0ILEIGY<{=)~qF(s;K`)&W{5Jw?Yxo^{&oDI0S$C{^2@ z%3pRZ_-e)aXgYDJtu~Z%2WqOk+BNDr?-=hGOQ%`eS4iqp46m`zzjqG3^G>}_CsX|M z{K5L&-c?MEL+U}e=C>HIbxaQ_9n_8-Wk(C4!N%0G`$4GrgAt-mNQ`EKsPP9SOnqcW z$JAI4QK&NkQfLT=Dn_r1(D+JUYMVN1p30r4kI)Fl9oalDcH#9Hs*l!)2B1Bivp~PC#UbWR^8+Kt0?Vr6w?056nr`wTNbfwZ2 zIDRf2;i>#SxFacYmsi-L6N;45~o|!D+8^+O41eXs#)19PKZxIX!bU*wVpGoE!F3=bX|!3GOwJgp4Ctjyng@+LlEa z*5ffQ?V!_bu^p|)b8~UD9-V6UCXE)YJ3Q2OUX|`NBYlymLEYwvF_$$a?qjrGgLqu8 z#)wZ@YGUckL3&7>yPYvlACvoqd)tCOU0qU!`3xsDnLSzj(AvN}umgo%IM|d(O(nU8 zOb2d`ebfJ_T8(Noij6sG0>>b$rBGrsRB$`GQ6oxZ%4s)ByKYy#oRWXTlgsL4G@o#X z0yRBpXIyH%R+?+d>&eqK2;gMHd5AScD2qWpn|inLvy%_FGz0#QbS zeu9kO(R-0OvmN5nqj{{|p{r!oR6~4Pz@p)Pq%4QyPQaURwB4LfV7eaLo z=Aoc;id?CUd#sm~+IG~50nlnXuiSMn)#b7KH*6=5KB*Y4#%cpq>!<5;m9JyoWP{7L zH&ioOY4)Ba<6sy!GNv|TG&NzVaLLle!2#9{t*TV&R=P5e8`?M#D|K2abJB0!6S9R` zRNBbw)ecH3a~l_R_32C;Dx)8s==ad{n-_b^pExVyplWIoP?wd=sygheOGr)VoBDVN zq6l#=BUY5o2EFag+!<|Pz>^Of(mKft?-$W1Rk|}57d?6ND^Nw!vY%W`Me2Ow&<1}_ zPjg`rRg&oKE7b9GRAqc(Ft6|n_BU=V9n=e+K;lPnum>u1HgOjC>6}; z#>#uN^y8zAW*RYE@D1H_NO1ALYhhk&vuuq&AG-B!??eEx8*qSg;U9F(h3Rnh)mZgH z7~c8rbJFrN=?h%^`gXG(>D;k8>*xE7Tzr$;1aN)M6%%pa)q0_V&c3VO9&iH* zwBc}kHVdu?i?JBP7H@{fYfqxt7UK!ur@yV~+<9Q|BtiNyixYu~&3Q6bi#mXLYP7oH z0Kh$(wCDyRBcda6fwvm*CUO6ks zRjXQ}S;pLB2}u4v1n7_6sVOYaSU8gW@5tX`QlLNaHG{cTi&+ zR45RgL|hdB)660MJvwprc_B`g;kGPK1k@wD3xOpP@i+{?|5NRoI@U>*X?k6%!P7n+ zzesF6Je~&>fl0Mr?zP+$@kDPXsLx)qCaq+C{c48fr$>91YA?mskQ?#Vq}v?94T>J& z7DK0jhoFnoORCwisf_}wVii#?;CUG3ha_PxqRtT7mcgG9g6$YUrW$fyZNHnrE@<$3h?%oBi%76l&>*CIcjUn(!PZU+H zeJF`QP4ph+CvY>HXt{X$4nKNsb(%f_dN-%6Fr9Q%+}tftCfeJEQ2+Ahf5a7sA#>mH zzv2npuj?;x{6CTObngFTCDQ$a6z}jwx}kUYKP>gH3}IGUj-IMjjzL;>LTXuVX5xsN zdYWcpO0EU$Z)^anFM75t1pw6L>#-4E*VpMJkddpUjR~ETsj;c0gUjEZ$u`~qKS+oO zG}qH-WOPF*jHS7ytNREMdx<0^ZRxdiyPEzoniktQHLEPfvrLCA2mw#$;Zh_pu-ad< zvS9CgB$`GWOjHEK18e|qK*5rL(i(U+CKwS`7?;BC+k($RM?IwDMrYfTD9vi#{Mk;x zHu0zGZ|=gs-t_C`{!e>>uNdne4F7-e`HgKX{|&hR*X{A+kEy(0%qo>HW);(azg@`a zFITp)i-^6g?H7tq*3!=Oi#zG|1*88je|Czh-WPcul@A0ail#N(wq|z@;kd|UlRraP z5^~-`xDsh$c+3=Q)z%;lR;0*(aJP_wb$*y&FOGRfD_$|R`O)xnhs*o6!}(-qTfpD{ z54b}(2?*5H*%}+-K+#cx>}~;C--Hr+S|7dq06C{cS(kI zU;alccPJ?ipUsP0?LoEQP~{V|Hvt7pfDmKu!3&oTOLx7d6?{p<^~RfLuhdl~6W3jy zQ(-41v$giAUoD?`w`b&{De6_aWbE7cB(P&0qZzJt8G4h>Q*Ee)nv*PRT~AnTrd$M} zl2K&13yrPefwfW#*7VDKwBs?)bWD4JhSvK1Qvv_HxWMj5$=DbLWzU1=d~}Sh5%Xgm59Ct~soaw8HEZmMw=7UnGFe>T^>gXwvv) z`+Zqzu-`Ux%5^nG6zaEBI;Z3TK0H<=M>=BYQa5?%HJND0j&X zE^IAvcJ+3k-$L@J?iMi+2G}&sZQ>wEdk`_192j{%#sq`ZWa4zOMi9#r`#N|26~_ z4V}Kw?f)f(hC~bf)c`{5)1pNi#_hN>+*)K-5fxNy0A<*%oX!$h>X!pOZ$KEbif*R^ z|APR5+0NyM2kz-{*di}WErnKIT^)!Vg-li+bZQ@r7D2%0XdC|YU zoJ?dET+)zIUQLS@CA@ra>Y0Kh81Am!G@arSi$`>xAS|U9aaginNK*VMDRsdG;$waW zwhJ8X1CHsP_ZIUG_lqvW=RejHWnn11@~>(4{3ZJG{`YD3-~X$erL(i8owxEfo@d@& zmhW&!Si~kYjUZ3zDim%pcg|AMH3u4c=ndW3E<2(VKbwy3PQfIPJsixp)AW9d^_z{4 zV)hy~(|!^eB2>O-uM--9f`h?atPjV*p4smXC5x62s($_R6mD3VhR!nev?CZQ`|QRj zi*L;7S7aRO+%8hd0nk%PGc;@DV~DIGr z=C>sBBEP=^D)8B-82nuvI*x0CPd@98X>eQ6h`=djUewDap8%?ms42c`84Wg90#tbf z<0{(A<^g@A>~C{G2^Sm4!g=XvAp<-k5~+YinDP0;0S_dkf;;)vwp{_A{u+nfVFHMP zETtH60)r7hz#bfGlq}sTx>ZDg;~3Lk@Gu5{H#z+>iQ?LAiVE@ zBgjXa{FCpd-D-rbtvFqFvYvZAZ#V6C9>-=Gc7aguruq?2;4rP`8}g0k147AK(z#RB zGHsN`B4gD;f6$$e8)Ols<_Q?g{j}RQ!mN-S^IGPu)!xBTYN2A*cC;SkN6c0IO<4{W zwqP!Kn*+Mw`UIlD9nPTB>1GC!(*{0>#6S@u%-EN)Aq>~%OhbgPg z>_N}9_w3k7k%sl6+frKW@Hv*uhF(OMAF?5l*-m)X<30>sj*Rrh$WPKILV6cjg@GK~ z`Piw}wQknnYqS!o;3>qud!E$r7UfDIDp|!uOuhX5I+EBKy!8o$75Zd4ge0UA(fEs@ za$0cXgn+EAGi0q)d9-))(P{;z!j5fw*-i>in(&7SutGzvanQc!_gK??ovv7Wu3p%q zie*0hMPJ0q!y-`fcr!`8)9HH0A;c1q~ySV3#Ijh%&QWSa(pj1HSoCGD*px(FJO49p!HQ-bT6qbN2?m2Rn@ny~b>~DYh*Z z)X#MqSjHFlR^YEdP=TR@N-9u&C(MMQl#< z_+1K1F3q3uy5hi;uT?1Zs{{?Sq<2cSzqaFU^KEji;#;y(u(5DR{zIGw(v{zI-=yeI zc1+OsutcdOE@Ww^;lr5 zn9aA(usnOZu4nF0JM!xJwwvt@A(|S&rgDa+Dk9;m9T(kJ`Tr(L|MgV_Ff2aDAb^0v zzL;PCs})Gb?yL3GKbN6@Mj(INgts-VJy4I){Q69iw8%k1Lx6s$mu1GAI3s+EnrkL1 zEDjaKk&SNNFm#s%=U~~)SO>itk=D81)}Lcn_iljP@cJQ*EZn`MUtjoZrBLDX$@7iZ z_iZbUlqG>~aHl%lgc(sX<;bRy<`CKLivo^GG^f0^LhHrusw-3clA7Wh*5X*hc8ndd z!awAAZZi_VWMpOclYD>;Cf5D!cd%J(Gx+n3k>gGI{!+8vpOaoN*`7s4xHg$RVPD64 zQ}KfK(o41rT_ah)1`#2GToed zpABA>xQlz-$&`-1_O3&fJJx|LxyzGuMp`2mTR2+=p-tH&DxmI@Pw#XCztmY+ME{9Px%@HaP0{N6rd|pVU3%uEk#@AFK4UJZUqtp>NXk5%1V zID>Yn+rc>36L;;Z0NWxLl6&{Z-M1o2C~@TXx?FL#fjTxS*P# zXN=_soIS(`AE5R7qoDo92F^CJq}#!lt;9QvMQFXAmb$Yywk4)p=s8Xbxgl_)y)dd9Bagm8Qq-l z7W!V`W=vjw&Yyy|RgV;n_-Jv=XdZ)};6rOVQhoy15&_TJF}L*<@l$pjKe&6{FO9V6 z;I|Mm`G_~m($_m-HaAL&cvg>nejfrpv9ICo#6%CHTXwVZ7lr3?!FN zhbmY&WO2O$+%b`1^_K8I9ZXEmJgc$kV{$`S9pE*l^6y7REvw}TB<|y&=mVdHIqAsn0y4iU8!4%w}w zWIV9dlFH3|n=~mHBT}3-1*T@U9k?}qQTO&5R6ZzcrEXeN|SaMyfuch0O;v4^v<|(=ddMF<82U2rb)ZPu-J0$icQpm31&SzK%}Q}=C|Nu6GO!5d5nE?|Aph8Enj zVnDWEtMSr{vC7xjrngpcgKkAi&V1Q)L#K8c%-7T>>~O7PPuAgslv`=HsWLJzFM>5I z*W~qTcs2?us@N74p*H8LMet9OPTD(JJd=vX376mTz~17!LI?r0qa^pH2hF}6{ftPr zbAb#CdN|UuR^v4+c0KVk?~I@k|)1`_liB6G0)pufswx8S_f zC1~a|4FI?fax0el?HaOB>Sh)Vj_uyN3i1v$nz>pU-Pmo&a>^)~ZvAK3Co5=Co9So1eJw+!y z(e;d5`N{}P@k_6_ohWaR&qm}*6etE0CfwMpf#Jf4qlg4B>%5EAh&B%E>r5putP zIGnhoL=9Ctq|soNRORr@Bs5bt`8(jdt|VFx+TckCt)B0g9{s^wf zJCgfkXBRmz>;=f?%C>1#+N4*8q0xwAO!oeLVaX|UYKD%RG?^WShOAEAf%wJV11!-E zHta--`8(LG))u>yb*}XWINk_Mm}cmH(G%Z#4NRgl4&w^gDfh{Dxr>%)Ry`*B9>M_M*rvIBB@ z?yl+Cj<3GHQ;f7!8=o>q&U${mvC7vG^u^{*V!StVj%Axdq%pz5j%B{xW;B!jA&Jw^ zokkZXBM!`dz=Z&7y{FrbePc5pm8^a`m0>BCxc0Zj$(8I#ow?hL!jB4LE|h~9YOi^U zsqRQSQq@Po3SptNNJCihhWrC^^rH3=#^>3^0mfz2O`xSk!cgPt`-7K4L~&zAZPdVk0;Iwlx6vY#QYmH#8;f-cOd^0TG^Rw6|w=4 zIgmdYy~!VGU8+|aCE4&ob4U7iZW(DRh9D47nXXVn8%hy8#S{n0F_!$z z9i=vU8y(D)M;9f3KZF`#jBcg*Zaj0qs^%HNi)>_L=Ezt5{vR1AvDbul;+OuF0r%g! zGyI3*{m-oPUwW^)j`N~A;-6&9$p$fG*x`MA!T@8GEp*`IVnxU{LCJt(DUp1!1~m!Q z1YNC@h2K3NFx`(e$0Z2ODucySE^osk=5G{lA{%}Z>L%-rGNnloGr7yT+xG5#eD?(Y zpKmw;X?M1`Jd9+<+_CJkt_D0iXZ^5dA&;dVQ)CVx4^Ugfbax&yqnl7$q147g;{35Q z7Zri=tVBH|#f2WUqxoYF5|q0!1BjJmjw`4LGU8IB-pD3ZM`x*8sdH?85+s;#n?q{A=GdK(3E)+9L~J1ull7OHP( zr8&1CHyWcl3Tx0|>C!kJx5`_Zi!(zUx0lGb$L)~kk+zp|l8}|pfufltnwG&taPZR; z5V2aIGbynY7R0$tvoGT&OiLV=_=N$j5T7h9nfA}4d!AP zSJxH9$p|a>I<)qK%+bc7<4x7Bt1l7hFJ(`t0ozI<1XDKGDXkLQ7%9=^J++eHI+(s35WUIg}g);B=~<7to)*ZL9E z1N{^(A#OnpeRGf-{TmwJKz88wi=eQ(v4V+D`5uYS6#R;A+@)zN&vM}=^pjy`lk$sUCRb9cyRh9J9=d{d-zXCUO%00Lt&4i)5T|#aAM&ytjzM;Q);h~U z)4#cC`Hhkxd&b`rS@}uu5bH9S<_iDh71`WUX%-M7ePCJP6KXC^Xrc+1YIkw~!$Zb5 z!U<^~eu#*eVhD$=6|@|>D)RsH7O}IDaOjL+~Q?I=*EL6wuAW~I(`6FklR?YhA_ z-Z_dg`S(`78pUNdkQxQaQcq}7Zj!Yw7$jE`T8hWjDVqB-2yeEd-Y?Z@pX$cd3~cp+ z^XG_nda z;0B9JY^xeWLSqAjwThB_;srRplU$tG`25H!_89fW2PCXNQ3C7Y5eH9trlfr4&q$WK+3Uc%`l;IPX=Tmj>NB4ch4Oc>-W6?rw=YbthdQ@|S*n>-|AfiKXx|CCkCZgaQ1u?-u0c7cfAzr)*|&I8V?@>0 z>%8WTq=$QT#ZJTgnIvIIDM#Ev<~2xvl@?-bPOQP#2^MU^WcK7g@GA8qXg%4)_wxq= z>Zv&B%L`y&=~~;WP%Vvnj2g@LBZ8df!MC$)F@}jCwqJ~fZA@%Ec*rg|b1;b-V|Kpbak1uZWH^Kj3`o6}xKaK|4AMwrc z1{*J@`5C&hf1*fy17iwvUgA5XSKgNRDirnC%tAoB${E>~KFKsh@qu|cbJ z7UVe5#zrG?skJsonyuZam(0IZo2eWRjOG9Z!N-@-Wy)v|KuB9^*vR0uMJ|gSI2X0R zn@iV0p7r3gvJb?@T!h-iNu5otP-WM%$?$z&5PzGI43|v@lk=Dbm{mrdvRy*m$q9S? z%+`=GSCzrAwr?6a&L$5QPLhKn@~sPg;=aW-ZneD2Qg(ZB0ZED9rrwSodYrjh_aK+# zF=9AN0oo?_x%g=o^Yla*O6tP8P_J97 z9{^0_;xgI!<4-GXd5SjQ^*For<9yZ%*m70JqFq@6AwCXAsx?JdqbnGXVXE{-_fQ*W zPmc+DSu}wQ_^}u}QZ`=H?mwVinS#Tk!ej_|reQs$HbTtgg&*1vGzgb+}rq<)p>9 z(*h7n{_-(s2^Mz84y8wN-ma~+7gA^d^gD~+0YKAjk3h*841#>4^~r6gb~n;1d&M^H4>`Z;#zt8Fl6kI!p*@gOFJa+f8}4hT%dBn0p#atZMw6TF z#4a!@cbtL_9mrk5V54NCEAS&%Ci#XCqXY274{JqI+0)f}xk0t;;`l^>hD}~ajQT}0 zoCLTXaZji>DXc_SVXnToWUSF|2ij+TV!ejiacs9>N4MjdKJ}Y!_netvroq#1ls;}O zM|kfwyFwL70@LoyN8U^kzZs+S>Kkwv4*a@jdXW+H_|QLEz+rUcXxM(bW2Eg zr*unqcO%lE@E`x{{Z#b3-`#7Swa;NO&oi}WX20{!^J1=vM=o-hAL}ol)_5>0v*(-5+X_= zv}!^Wmx-iPA#->#S2Y@IcVJRlFnF);4AcZ>7KyfI^aeCDuUp^<$=#QmSiqw3A+Ebx zqQWfEaxJ_`=0GJgeoLsaz5}2Ux{5uaxx{nc7g)Zk3?e?Wp|)Eyq6~(pZSAnO%5Sz2MxdYjklhS?V;5V|s}m z`U>6kG4^%&LJf+Jk4(ON8$SgGE(P=RH|avp`Kanjj9U@6&y%i`uVyl+ z$a3(ra729MB1D%d@h_|1Ln4aC7+h+uMt3kt-M`WTMq3pC6X_FR09qDeX#qX4Tr&`j z*IG$7_F!SGII$XpQkPDnE|`eTq$9p@bmX2Cx6Os>+eKB!lkA=kyD2fchx>T-(#yi} z?lP{ln4pQNB2Y7UkxIT^^CGAl^y{wco+Tqs7tt;4vP)!r$9dX4{mseo2BpUwRX(U& zyRx)U+mKM?J7OU+2)i?{Ul(;@0<7llfJGe)U{S~QyP@l)t(B>Po;~1Z4e*ULF|hk- zihtrTnI0=8*U66>@DU7D*q!fXSI$ufC^m}2CW(AFO%5sMwGej#qeT!b2-Ksb3iq!cq&kgToU?N7UzjCQ7NIJAzJPTM>{_MlO zAf8D>caufs=N({KW2O*DqG#(Mt$KN5Wb8gUD;Ve>VOo0GAv%1ewl|MgD!iAxHyX7^ zHY7-S10IQd78wwUOC9t&ixpRko%@xtFNnK0lpdi9&Zb$;-IkFe(OOLu}$uUzF&WH376 z!^V1fp_4zFnrsmtK6=dKmoY2^4W>|yVuuHlk6!TXT^Ncx)DWX))cS?`fekpFhtTBf zJxSn{43VLbJyYP6WDy#u_qR?Ig_loUkeJL>>LdZiOHhCbM)dbK{izARFVux}>vI=i=(yO?=&g#+O;poN`Z9M0iu%^DP!WE z5)*-!I&)n>sBoloB80$3$%tID@zknEu>Nz1od#)T03gFh=GhF(cdJc|x2gYFU~E+4pL| zw2=sf)!En)n5w(b_xBHlxS%83!G^n;@Xt}ijP7!EI&}HP>+5bs6+Y%%(DMh{%SGTJ zN!KEmwre?HQ!d_-yf$mRC&?MSSSn%b{1CX;hqGtA20i0 z4gv#wnL|#x1a}xM96`u|$|w3QYkd=$146kCuG<}4Z@8`OOehIVvM5MAiq!IHdPMGp z+wksD>HD*JU#fDX7XhSlBwfr5jaXI6yU9q!S9S7`G}|_DFJzq#a6$?pda-KLsnbrX{``O=iWNQ6%WxB{^Cm;75}FAE#>etm`+e6 z-rRFcN1-ny@q+i5?47(E1KL87C!U$KwuP&|jz9rP zxUi09=DW0$XIQRG(o*}lcJ~!K0%dPs2yVu3p`E>dF}myf;`tWy7PI;$aXS1bOoFIs zlNV8wbLEqy_@|r9+t;AC(x{;lTv}am9-6cyMgvBn;nJ69EXD(q9`1F$%=XX>VOz)% zQVvDBS2oEt+n=HOL!oaKq5Y`WxfOV;h2?539q}`}?6wrL&NS1}?P`0^?bQd*S+%ol zB4mf0vt?^r#DmezT7(PEd!VHpnqC^BpEqL99@tkhX!hEn4${8ly8yARkzUIZ) zb0;c~UJ=25ohEkZoELS-Y8ib(jnuf%XC{0q<-SDOK5Ob;D60aw>7Ys2dbttmeF2R9 zdS{b-eil4k-R0c{+pTl8>aJ~i{U*O6g~BNS839z`HCQVj^XkO?ye?BkCDt%9!!8>G4xyJEC-+-z&HBGkrv8?fqG-~~2%3X%`sP+McdGowvI=rIP@8JWGaFokw2 zw207pWD-Qtum$xo{_u%C7C?>ae3sBIYG!17_6*CS;3Z)36jeqT(V> z)Dp=f3j+r8`N8L!z!_kMl&JGc1WOjRq{BVkI29nQ8SC`JsCBC8^2PItZQiJq2sjH> zelgUnHN4o}462!oGJ;e^2^kpS$r?iFv?p4qun?P4Nt$GNhe=BgG3ZikFtylCTy^T> zwStiHG$bR2#_3pagQwkD+$;G0*b2NlR&_?g?h=ya{*uJ>d~VSLlT=bkJ8#W#&3h)y z1FzK(T30Axpn4y=3GqOannN4nG zgsA7T&{ly#ana_ym|T60nlI?M*nQ>)2lhdZK`n+u*xIa# z6$noQ)>a8uCTi6P!Wot|UovEYc4`t*#*`7TV>5TRy(7yaL!$-8_EYU<8ZR9W)%(Di zOcE9t^xC!H&1fEDHJt24fm?oEH42iY5gPJpus-3%o_I}9D0y5zK3Xl1Rp}twK+G4G zT4iv(oIf=HDJd2LeV@`3YO^P!>FgH*CmA;zTu;XO;x@Ui>%fV!D zcxaKLR;9e{OBY;tR`P;_ynA3@yw3EHjR9#%A+9o>rpllLjgdyF-?`qgwk}kz7Y?~b zdL+0(nTmkvH|Z&YP2w!RBk)+$&1)*fh<%o{?U_U z5SrbgLA$_e+n3|9`jz~uTV$TYuZn0fdAkI90<4hsjs*p+!tF&;<-4FFqp-SjUSVR| zV=P;Y2{cV+(T`bxFAF#^MaX^Do<=)83hl~InAZs#&m&9`=EvcTPqIGMRGv!8d!6?<@Gzo5PH$! zg!zS#PybVwd;c2!Bo8=WXOyXX_gXn*y*UK@Ae$e-W;r{sruhj&ynF0Ad|fcxFw zxiG!oczpnQ-)CMX-9x@3s37la-2sEYu|vp*Cybag-==B&vLXJ&nE%_1?n%63ZqSJ>Yx0`&bC&e*67`Em>rf1Vo4<#`%lPQ6t5KFO0 zQC$k}4RZq9JnmtpHdMs6hgmK<8v<|dEI0j-fWa=-X~T>en3H~N zh`AU7o*I_AxL#@KuL^rcRi#*MAi7NfUUKXn@tXYxPF`PdAV1HI%|TlU2Y9s=N1-*8 zE_Fx}&NB|FMIkVpOcQ<-FV?t!*AGmniep)-(|Tk1Hr>bMs-RsA4kA?UT$Itt*_vx_ zK)2yG?W^?%)Ekz>y!ADYop)ll`}=sW=)bn?NA{FP3LrpT*|b<^m3-uSucXH3I!5Q^ z*R*4ljXuazj)ig*3vIl))>L6{oyXViuz%Uib}CDqv(RpOj5 zNo9_N4HDA5$-0UUIxvsJ$BSp_hWdg@m};%F!??Y6{4>=-=&<#w&D&ZX5p<=91m)H% zDP@F`WHggZ6tnK?^DZIGG>(-^DXsZU7rcTS+KE82^*tVk$#k9-3_Q%c)5qN2C<)`CsY{Z=Npb&Pw+<6 zkT}a??7T$PjwQ+c_%NO#{1%=KEB|fFVyUG;Mhr;YWxi@3$up?-n<=x8ViCnA`~GUX*5+Vb)+D>&xKgc7-o@-*@=R<(V12G7M5yKg&FG3P3Fr0r;GH%i~e^imnx-S=KR`>(iIlW6;^JX=ZM*Q%9tJ8G%fi z(CzV+FD7$9KmpzB^q&d0R;oXj6L$@24;@ph@kw24vq z>Q_V;@5U?tz|lyvaSae;Scp7L{A9-1INoKf#^;g}8C#!Nqy3qu6mu!8JTk$UDk9fz zpZ5YbHSMGTA{ez80;Pm4PHbG3_ApPgVlvg0>J+naj5TF&xs_!D^9*QHP@G&n@D#YB z_#Kpe1~NmhVJsqHYx5pa@SGUJWFn)HS^B&8wnKwall}PEmx`gKD*N@+5lWV!O3!%& zqjVo2@2ZZ=*B-krFdO{~4+$?mg5WsuZL?o02q?@~Zymf7%-806mnb@Wtst+U=Iv%8 zE#yKF(KFq5>~uZOkuT)_%GER9YU~DEE?{+1$OwOf;!8#+6c5W8;`a4qF1Z?4<2vMO z*!l)O*CApAAR-aS1{DuWZSUdr)ffxn(X$WsA}{x^x9Cr@tBYIN43H=dAxn2=zuauM z36|1*$bqSNuSmxwHQvMn^{V31t%a&-K&gWivw zN?BqQjXlH4SX?U{r5i+xQ{odoucY}B>oM|voLTJvD#0~$dnpj$2emadBxX!yKOmvP z&gkWzkC2y$xIbucjveX#qB+hNK)# zNt+BYttD}87n0)*i>Z-xd$QBK;v1mjbuklqzR1-+V*)<8*|XxB%+-9H8<3_LFFE#e zf_>!&n&n=C$z#sg2jqJm@d``*E|q<=n-z(;eH&NcROOV}uElOYqhM>qbj0@fGWg)D z+ip$W8-Or!g3XWc#!W}uASs_UzSh(fwj_>%xz7MAC$c^RJ9OP|2@FMTyBfDm%E=rJ+JFAuMupOB3aAVD zii4`vU!a986((Q=xs({cRq^3cORL~757m~bo0 zIG!iWQ5y<8Z<%zTtY$Lwg|FOnpNT~+#5$4GbG(*Z=34!9)$FL5;%&*BWS`EVCHj{N zalpn?O%XgbNI2?<;wMHZb+16j7B!t4TdCy0UE;VujB7g|ko&JE6etimlL1TdlVd;~ zi9sg{HqVQ%O+&(9lvgjSXtM)c)lvhx23Yz_l4`LznrfW@(O&8E(g^cky)T5GJQLu zdq!877FO~0^fn?u^u;XgIHJ*wLCfkyDOAr zmPp|=w&3wfm^j}BQqq{AXD~c>Ch6Ja$<2FCKNNDen`oR3p*1C^(vfV~>Lzh(wne8| zT~!iQmybct!XuwFj=WbB$`?N5#CD{)=ws#2 z@E_r`TnPBjGbzCyVcsrU8FPAMwN!#GfWEZ+O7j)xYDbLk*&PS9SA;{Z>uFaVFvidx zUk3@qQozUb{jBmmFTa_fNYU;rHjz`)|tPqP58@{JqcF%y0jN|E#OvEa=a+Owi0 zevoxzaH0#hg<<9y`MCLBLh#-=9#d?ZG1U(i(fFf)SGlhv#*urTuOmCWKN5A> zG6!5iUe;G(=mj~_tgq-dDz?NFt3lGYr-0Bb0f4Zw=#G3DN=7OL>0$VH1UkVzk5cVU zsz-y*C(Itu)k)g67+Cf5v_*u5M7L%vZ=cba zcIlS}zpF-vCiG(m%uIhrzJ-rDt@!66#(Y6n;5F<`c6&ezAN?N4YuNoP@y0IjtWNlz zoNj)Nz&r5{U|6LBY=kra3sV)TfFVFn;4e1_yT9yKrEmY=XS(mP9_Mfm9EURaBaAOU zOni1uFr&OX7J5h*aP6$B=rZI+r9$5>~=Z7*^1-6Kl}0 zG25uI-5KMmFAbp~8%E@{Yw#wl&kDHjI=5-ZrB2nsrPv_O6h9m{42ztIeB+SnP&cl< zd>-c+hQMM!1Cy3Z&#LX@wszMNr2i(XvLPGRD@_)CTdg=)kTwjV_YIv4QwfXmCQMn_ zY;MtR-IC99!sxD7qdtGUU1>V~T1bAa0`BBCoq$V^FVUj}&QOB4o)kB*U4at7h; zERAabU$t9rJ1JZu_}w+RB`c0#mO8 z8vAF}UYWo~y-UKbBb&NRowJ)|0d@`-6|DRw*^7#EYO-5K_r2-E$84RA(wp*q$DTZ# zVYh z_`;#eGh=-RV@UzP^P-C?IuRwg3XCFx#uyx*mnSCnCY8GqiE+V>G zU}_r(rLRVlP&7kiW??Ij&WnF`5)&1kIUd1Nu?&LM7Hp8TZ_U(zYMB~O&VXfT&#B2N zLIJjCFG~#z8#8Ny{V{hNVXOlTTZ$zoDbFj*hts(Ii7%(vxZzPOpwFiPHWU6;pZ}}7 z|Fwtk-3vtFSoWLu^CUuDe67}CB4vuN(gK|U)dodyFE$FvGZa|xN4R6v1aqg<<(|EF zH=qx1g$c*IAwFe?JLS^|E`r|J?XGa!o$&0A4xjSzc|Lo;F;7^Q6;H00A0wa^Xh)?u zkrb4tLj(tBU{W+en{Ta>p*3Osx(g(b<2n_#v6kl{Mg!g{b;fXS(b6tir^76$Za21C zx7o2_kU`^!XEv3}f|1lzTZln_)?B6JwBFJGG2xU$(DC!Z()>mn-6mx+q|>pt!0Jml zZUaj9?WWFh&KHoN$LeMot2HUSRvev0+;vLl>U1Y;`eE!#2>!1*A}F3E=R>}p6Ifi& zoOKDi3rCmw>Yp!IzG>#%4-`0yG2z0SS(GAjH0jHtWP*+bjq!mI_RLiaR3N*lhX0fL zS?s|*w2YPOy{A@7&GuNI8}+bMaHI|HqJ~(N{iqOczq=`@Q*|t;%u)P4US8lf)e5THhCs@Fk&nfC(k%F zhoe;O9Mh)SJ=mYq3DPkuOAk6B>zdOabds_EJ>}4ww9mKjuqX}SlyY@CgK-hMTay;T z7QF8s;0v6BM`Z$2aK8}>9T8iDixun4PTp?R>xOSyOYu!jC!t^-W565X?+Q=x zxv0gDCcA^_{B7KOD7af(2semUAH}<8iEUvYa`Vlukp0+k=XDViB60>9V#nflp~ins&^2{mL59A{Fl5yHh-pZr&Gc4REdpau{l(jQa|Noo)O>j*84ZO} zgLkjwFNoQj&G#Tk6-Pk3R3&(nxt889q+~OP2azOuZ1aaCqP3!aT*%K)6nE&%a}}#a zD=k6C%6BbM15+?l!==T%D^o5?2IWNMg{lKt$k$c(4?|fm=h6$DpFNDL8@IirJ|<_H zK!=fm#iYetq~GObgNET@_l-s(%+D>VDRi090z!?qP zI(K1g*KHqE$U-Ju35Op(2itpq6oG^1r)Xi6Opq40H|j``)^%{U-Z)d5V&7#imC(@s z)>XiQ81)R!fW7#weUD?+{U*-&e8FNr)rYbxxc>RZm{k=RN8$~1`N4xk7rQ*}cgNcs zURs^nD)cTz*0@*Iq9e5LomewEjlD2Dd=_H?;bbsH_K!|}|?m}GLEI>4}T6=Im=sa2b8i{rUBDw~@LI8D0QH?6XwP@<@R1_8?65QXsISiK^QvM7sM`vJ)P-viED+qwu78}jOn}H=Ry@2XeJM&Q^xlZ z6>d(MJ%(dNXF@Vp&XoK1A1OF7PslI~_a1vVKSe?ITJhALj?v2UEX&;NWcqy-1VJD# zyyWgA%6!!pnX6u>e2q8dNbXsBXt?+JxUea z&5SPG&8#j98V=^%!>kz)aBUo@eQ4V*5^)sn2m48N6dz{j@u-*;NTn=>W5X8bX!Pp` z3YTkz%rM(_I9N79Je^>juMy1>>kUs0+qUat1s~<7L#_ca4^|a0T zdPqlF1YU#qKoRYs;In^HHrqeNs5IL8aG2G`AMZN{iG%{v-5Jy^6#D5Hu}aK8OsqmU z7#%UsDts)!8ZFWI`5V}4O0dNA8{6X>+Y766kf2LkwPwjPEwf!8DRc?j^j=^I%Qcdq z_SAP&pWkL7?Y?~qb0Y|@H~CrK+}G`Rh7HZ77784 z>^5v}qau)BHFTA<^4Y&o#s83wX0H&sOILen9on$TGtswtfL5s7HL@ann<JHT}{UjfdIXap0>z!Qih022xj ziKCH$C&4r;V67SjZv$z>Dpxq~2;bU^nY_{RgMJ)nEAG@XV`=q}o=6=S^ULuWcs}9e zEsF$8EbC^w8EONMC%f3bkyKSbR+j72jpv z^c4!?qu@;^E=>1P;hz;B+Q&X_#9qeJu0s@X$8PG_jz#14kTasGJBuQjsKk+;i|s|M zIXKbmM3Zxpw7n$2`8=@9V(5-#ZzR zYC?r(?Js~vW+a76nPU0iRe!9GQQy3CG7}|s2K8kVK}I-&l-C=dh8h8Vn$CtE=Lm*xiFWwvTaGjd>@mu;C`nyMY-t~# zcXbt7J2$wOb!M42IheAMfpC`^PNT{>Pv`f)94NJE?hGLNO8CCt5sN8G`!3@ zCC&X(K}*{)NB&$*<8HFQ2K+J8VrIyLS<}F(vdm|HuV5X_Wa{HHm6kVl1@e^lownG; zjRmms&#|l4Ge{%49UL`xg9%+q=I_7mb#n8r{4a-ci`QilucGAkR zB>X~ckHTm)(IdT4;RZekCV7_%H}|Uca>F(roFlFIEEc#+>%&?Ey>q}K-8ub`;(p$N zd_nTL`p8AgQ75j}QV5EsNMkPj!_Zrv{dx22_vsmCFK`RO$8la2I2nO<+4lI@t3T%v z$$4oU6=+pGL_;jShEdF{hpaP|z06pr?gh@^fvu4j*<{WUX5~-t z5IVwRf_UkaN5MSh@`dLWg!mD7*;VDcLJ9D?U=EFg2|7pnFds|M*+tgP2L2hsZBmcd zqclidL%3yBpK0QRG7zDvz&2V%(D!eweqFIrfQrLn0lfB%z8NEaANYUr@Ot8;7a=br z)y0qK0r0_|Dlek=NX!B)S}sE+E{_Tf4Yg9g-()VqUbP(mz=rSu?)) zQhnO0v$K1Bh||F{if50PhMY#K08<8+y$Vxc{^3hJ)p|Q-**wR#0F)b^oQp1SIW!Vi z)R4ayc5-2(AG0rxM0U~uE5*_@6oRCxevKkACb$i*^A&Q2n@)ZJJxgltlH9BPc1E7v zIC-{IMpmf2g~sYbyj-@nvh>~{RFOp$G~JL_#(N!Z6c^w&?WQkE(qF}IbFIrU)!t!{ zHIBPNX|9&3`VSqCrk4Akc)@gzIBxi%--gpv&nu?#8^3W#p%X-*OFf=1F*swx#bK>@ zt+W`V|^S-#GwyM7jgs2>z9fouGlCm92rOiLITzf`jh& z`v2?gw@2AR0YwFHO1{e4rrKB>?rq(ixF5eZq(Cu0A`DVAa)?Dd+g!bj>g2Tk?7VrA zS2kbvW9Mj%Uqa!PhS6Q#<2$~bNjoP!Nb-sgHu1LPj^BT~h~=Y8X8WNusqYft-WGVp8Uu0k0UfQRoHdeajdu6PXr{ zSjX`hw;t>6`1I1%K2V3&Nd2v1&nu^5^&-t_1+{8rg^1-eOXGT_;xaWXL3+R;0(!<0 zIoGb&VjMfmY?_9qsRDy3&DdR7I&-E|k|_>ibV>urgUJT9O{MBhN$e4^Swo20<0q*J zb@>_&&100T9!!)tf!S*FMe5~dpsDAiSjPv!ve=Xa{LR6WF6e;*lazBs2D=3FO(xdv zqYPV-%c?cTapma)OCXmJtV&7|l0|Pcn&b!U)$>~loo>kCJ*SHx_qo1|*E8e22-$*P z0!!IJkWpv_x8%e(jiX)-x6x#4OoA2jc?OHHDoO29Ez7;XYg8ylo&nB$E|hrq3gOyiFk-sm()1wVP8{{45ID6y z+K6Gpob2RCyo%eR31rAA~+mK5M65yn7dxd@UJHmsrEx z#T`5Nm{@BaLLsJH1=kEhQm)*Z^n4<0ulATSfb7Zej^w^MR}SW3@(O|XNJv|XB_ zKIrb%TyT$~ejVs!2EAsuuqDXOnTx@V(I#4TS;%q2PunvLIe-hVQVOqRC7t79GWS~v z;|zK*NK_4L3xtwJwqQ)ji9vXFL>LH)=Mldpp^N`R(onw}AyLA_O zIs+rd1audp)B&@R{lK_X`14J@T{le|cg>!lsq$z?qkT^I3|jevKC&}SZT>Xv9;yQ* zTyN*+Mnw2sFbyIN440V_yzVkz*<-&D{5poj0dXgP^Q`^?7^69VAEOmq?CcFJ{*6r` zJ$6X4iyt-c<6N;tZQYFNw8#>xAc}Bz07f)A#w+@l`<^NIlQE1?^B(~=N6Qi+^cs9Y{t-%l;VzoL zZm3T@YrzPAMS2-2)Q!tF{?(~n7?%*WDvNA)Nm_+>hkPc?VhtD`x3M}rGlUM|cq_`1 z7!ek@)=AS8j#!vuBfA1|C<-tuj)5+;mB&DXSl0N=eU!bZOpt3GXSAv@)j#t2yPTF-D17v56rjm0k5jno}u@)|BWjz=5L7j?ix2u5Qyj+tX0uC9? z*{H%!rbc;dcTdj`*l~c8q~6i1gf~E=vGW_GVQhn*20bCQ&TqS@@n&n!PNuh~0~?{u z;Vv`=+@I&DLl^Oy9jQNp{@SE;XvV$}faYul7>k&GZ_=Np-S3Xozb!A{Dy&*fyhMGF zr9y?V>sV4`L1D*bU^{SU#*`sVNs6|BGDL7|=I?5X*RWfpyW_jv2qWjcfw%#@aaqjk z`+=HFWDs1Zox1O)Ev|ZbJ^)(-^@(CHvN6q#=9q3`Inqwiu|OuPWL)IT`YX2D2r_Vg z7$Ylj|)oL;JM^S!n|UxHb|jF z1dV0>h_o1Fp;ZU)wq1MQGu8g=vgj?Pf{8`{PF45)X7j?mJ%uf>*b42_j4-M78^Opl z?c5ifrtGp%YVTuYv_>0{G(Ks9)fG~dK%EvdqPOuqU!nCzqDs$nKHrL&kZxo*gBuy+5pK{ zZM~faa=9VUJeMZf^V9jL7$U-jQiP)^SPBg%x;w{waso{JVcuz}EElhNe@oTpdt%JPg z0jxF#q5f!p{JmTK|F+V9S!^7>ntX})AgckH`%Dt7n_Jf)i>?L?slu5`>G>;4Rgv-6 z+1=QbP;uaAXzoC(AV&5tlWo52hDU7(ahym%qe`WAGHhm6yE$IF8#z@sbGARY-@_9I ziXe>yvrHhPjr#_RR|(JuT1$0QcrR))Qww$^d2<8zia6WI`3K(v<3oxwOr=^)2@(#D zrB6g?k{b0FyO70>6vyPYRT7yMQz%Ysww5h^ZVV!R2W0*cPe<%+i)26Eo187b= z$KDlnj&*{aYv9m?o+)Y%#C2y*RNHz=uqn3DL-QlWpQnF2qHTkkuvqf`a_s9i{?RG680#{BG3*Uotxr(AdQcw!RV7jf<0tMq!^fTB) zqtEN#i8vQsMM|us-UejKNqQL;cio)a6N$OsUT@@S!}@;?{(Uy~U8p8Oh$L zcf#T`+jAQD=?ss@7%epATbcF6^Ba-9^_OZG#!G#-;L!4>4%l6cOvEdK)nFFZL190k zne}5LOV_8ug`$L{BOH{)s%+ed!dTr;TONYjCz>KkVI6EaTyfQEc`qTuMGGZ^OpU{N zo0;pSSqYNk*l(veh_m2FsmO)o_M^qiOQ_WB9?c8IJAfmKNU~e`EL+k9xD!T`)l;47 z^5s=%7ETplGY-(SM_M>8A5;!HDFj3?zHV#m@pQQJ@{R@Db@lAxj2yBp$V{%tC_)GF zcA>!rIITa3yJ0MtSnP1s1#?}2Y9|Ol3~-5yU2#N(dH0O#6JvFuHI0aV^#*qiCil%; zy91WHp*hgJ@wvNw$ozCFpb8(8Pt@-?-cSu;le~ERp&1uCPW)h1h3y!(VPn_(h*NzY zrl#5ebdF{yJ)g;q}UPgXRUH z8mxhyXGN_g^?;SW=fn`48#HYXVDyF&rl15Fx!5=$9Z<@deL?IR+&Rlnp^N#<%d`iP zqBU_(>ywx|EDAn`VMzXqjn}_El?abrDyV=#9&j`Phyd{UuDlO8>i*BF``bTj?LPxX z1p!3c@D=RYx>pw%|ZfGs`06^{lz4Y7m?%!9951`Nf2^yf_YwlnNI3*@(Vs0Ry zr)OYiC!=GjWAu02gr|8QhSL`PriXnCu+IIOcYHul&_Co|<*(2d0KzQ} z|L45xyAH3$0;+@u@GLR>opHdu#^(<4kI+xsQydWb!Ti5vJkN!pNg0rFAVBSWd;b5v zYJ3*Z{)jGZW%OTbLHEXlW)DyU*nl#BJLL5DRpVm;2)przTKFYw+@Fiju~N5;19-%a z0HXlm-++L7jZZQlzkk349PzW)F*pA++H!|zeoT@{T2Y>@2ke=86arhAE3W?0TE{dJ%|5jp+80S z$IdOT0-y>4P^tfh1l((Uu!a7J`qxA89s66R|6CDIW7hr+UE_l)`$ydG)%xFtpQkYb zf8bpx{t@q&rvGmd1E1E$)A(~gSRR!B$nwu4&eO0nKj4&K|7R-vJ^=r5I{Z0*-?plr z2AcT+SPKCBZ((PiqI^sB?UDR;eG3Bf*Y#~4d;R8@QhpPpd7AiXNSMEq*Z4&Kp7`%g z|DP7$PfV##;h%>2_yLcl_gmh6g8lxg$oPA2{8n#I18V$01=If*sQ(aN<7xh%1}^x) z1Yz_qn0|Kq0hG@A=P(9Osh;Y_|DZZI`6sIXq9Xqk{;2@^5BLzXe}ezs68|KJ{*>ye zlIjntV!MAq^;f0+uj+a#M)`we#PMH{{IfLW(-J+^?)yOoz^>cH^^VmfBpDrtL`bwQ;DJdz&3>J0XSpeg@1g1={pe`CgdT9T*E8$XEbihm>et-JoyA}It&aY@J^r*1Pd6feP?=Z$6V?BiOP}t){eT^=`X|`$1I9n>#yu^-Q!D)s zCdB&Rn4Z2r{8V@Uqd-qB$3JK`8-Ant3HEz|{<{6c*!R?g_yeD-`Cs7wcZ1^7`g&>= k`9U<+_Me5}f3uOilmY|11AU7X!w7^35RxNm|Mu(u0OSm=tpET3 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6cb04b42..94920145 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Tue Nov 12 08:51:53 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip diff --git a/gradlew b/gradlew index 27309d92..2fe81a7d 100644 --- a/gradlew +++ b/gradlew @@ -1,4 +1,20 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# 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 +# +# https://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. +# ############################################################################## ## @@ -28,16 +44,16 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -109,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` @@ -138,27 +154,30 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=`save "$@"` -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 832fdb60..9618d8d9 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -49,7 +65,6 @@ goto fail @rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +75,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line From 35a7b8d5a6cce946efb79af6017645164e09d8c5 Mon Sep 17 00:00:00 2001 From: akarnokd Date: Mon, 9 Dec 2019 10:24:22 +0100 Subject: [PATCH 021/203] Upgrade to RxJava 3.0.0-RC6 --- README.md | 2 +- build.gradle | 2 +- gradle.properties | 4 ++-- .../hu/akarnokd/rxjava3/schedulers/ParallelScheduler.java | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fe19df02..dc84c487 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ RxJava 3.x implementation of extra sources, operators and components and ports o ``` dependencies { - compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC5" + compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC6" } ``` diff --git a/build.gradle b/build.gradle index bd476631..955a6507 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java16:1.1@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.0-RC5" + compile "io.reactivex.rxjava3:rxjava:3.0.0-RC6" testCompile group: 'junit', name: 'junit', version: '4.12' diff --git a/gradle.properties b/gradle.properties index 3d5e2319..d74bab4a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ GROUP=com.github.akarnokd -VERSION_NAME=3.0.0-RC5 -version=3.0.0-RC5 +VERSION_NAME=3.0.0-RC6 +version=3.0.0-RC6 POM_ARTIFACT_ID=rxjava3-extensions POM_NAME=RxJava 3 extra sources, operators and components diff --git a/src/main/java/hu/akarnokd/rxjava3/schedulers/ParallelScheduler.java b/src/main/java/hu/akarnokd/rxjava3/schedulers/ParallelScheduler.java index 98433444..bcd56fec 100644 --- a/src/main/java/hu/akarnokd/rxjava3/schedulers/ParallelScheduler.java +++ b/src/main/java/hu/akarnokd/rxjava3/schedulers/ParallelScheduler.java @@ -22,7 +22,6 @@ import io.reactivex.rxjava3.core.Scheduler; import io.reactivex.rxjava3.disposables.*; import io.reactivex.rxjava3.exceptions.Exceptions; -import io.reactivex.rxjava3.internal.disposables.DisposableContainer; import io.reactivex.rxjava3.internal.functions.Functions; import io.reactivex.rxjava3.internal.schedulers.RxThreadFactory; import io.reactivex.rxjava3.plugins.RxJavaPlugins; From 4b3e04ed4840f1cc5ab84c55d8145d2dd573f4c8 Mon Sep 17 00:00:00 2001 From: David Karnok Date: Wed, 11 Dec 2019 14:14:02 +0100 Subject: [PATCH 022/203] Fix link of filterAsync --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dc84c487..161d9aba 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Maven search: - [cacheLast()](#flowabletransformerscachelast), [timeoutLast()](#flowabletransformerstimeoutlast--timeoutlastabsolute), [timeoutLastAbsolute()](#flowabletransformerstimeoutlast--timeoutlastabsolute), - [debounceFirst()](#flowabletransformersdebouncefirst), [switchFlatMap()](#flowabletransformersswitchflatmap), [flatMapSync()](#flowabletransformersflatmapsync), - [flatMapAsync()](#flowabletransformersflatmapasync), [switchIfEmpty()](#flowabletransformersswitchifempty--switchifemptyarray), - - [expand()](#flowabletransformersexpand), [mapAsync()](#flowabletransformersmapasync), [filterAsync()](#flowabletransformerfilterasync), + - [expand()](#flowabletransformersexpand), [mapAsync()](#flowabletransformersmapasync), [filterAsync()](#flowabletransformersfilterasync), - [zipLatest()](#flowablesziplatest), [coalesce()](#flowabletransformerscoalesce), - [windowWhile()](#flowabletransformerswindowwhile), [windowUntil()](#flowabletransformerswindowuntil), [windowSplit()](#flowabletransformerswindowsplit), - [indexOf()](#flowabletransformersindexof), [requestObserveOn()](#flowabletransformersrequestobserveon), [requestSample()](#flowabletransformersrequestsample) From 108b63994ca7c82273478a7846efdd0d29a11f35 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2019 08:47:21 +0100 Subject: [PATCH 023/203] Bump mockito-core from 3.2.0 to 3.2.4 (#46) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.2.0 to 3.2.4. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.2.0...v3.2.4) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 955a6507..bf948945 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' - testCompile 'org.mockito:mockito-core:3.2.0' + testCompile 'org.mockito:mockito-core:3.2.4' } apply plugin: 'maven' From 3445978c0bb0efac4491df81af55f90003e33b15 Mon Sep 17 00:00:00 2001 From: David Karnok Date: Thu, 19 Dec 2019 15:06:42 +0100 Subject: [PATCH 024/203] Fix DispatchWorkProcessor example --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 161d9aba..192bff98 100644 --- a/README.md +++ b/README.md @@ -595,7 +595,7 @@ asynchronously. If there are no `Observer`s (or they all disposed), the `Dispatc `Observer`s can resume the consumption of the buffer. ```java -DispatchWorkSubject dws = DispatchWorkSubject.create(); +DispatchWorkSubject dws = DispatchWorkSubject.create(Schedulers.computation()); Single> asList = dws.toList(); @@ -620,7 +620,7 @@ asynchronously. If there are no `Subscriber`s (or they all canceled), the `Dispa `Subscriber`s can resume the consumption of the buffer. ```java -DispatchWorkProcessor dwp = DispatchWorkProcessor.create(); +DispatchWorkProcessor dwp = DispatchWorkProcessor.create(Schedulers.computation()); Single> asList = dwp.toList(); From 2789d38d5468ee00508e7656222a49c170da5c15 Mon Sep 17 00:00:00 2001 From: Roman Leventov Date: Wed, 25 Dec 2019 11:23:24 +0300 Subject: [PATCH 025/203] Fix DispatchWorkProcessor example (#47) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 192bff98..71c21a6e 100644 --- a/README.md +++ b/README.md @@ -628,7 +628,7 @@ TestObserver> to = Single .zip(asList, asList, (a, b) -> a.addAll(b)) .test(); -Flowable.range(1, 1000000).subscribe(dws); +Flowable.range(1, 1000000).subscribe(dwp); to.awaitDone(5, TimeUnit.SECONDS) .assertValueCount(1) From d9b29833ad85b17a22c596b1aacc048ac18e65f9 Mon Sep 17 00:00:00 2001 From: akarnokd Date: Wed, 1 Jan 2020 10:06:06 +0100 Subject: [PATCH 026/203] Upgrade to RxJava 3.0.0-RC7 --- build.gradle | 8 +- gradle.properties | 4 +- .../akarnokd/rxjava3/async/AsyncFlowable.java | 10 +- .../rxjava3/async/AsyncObservable.java | 10 +- .../async/FlowableFromCallableNull.java | 2 +- .../rxjava3/async/FutureCompletable.java | 4 +- .../async/ObservableFromSupplierNull.java | 2 +- .../basetypes/FuturePerhapsSubscriber.java | 2 +- .../hu/akarnokd/rxjava3/basetypes/Nono.java | 151 +++++----- .../akarnokd/rxjava3/basetypes/NonoCache.java | 2 +- .../rxjava3/basetypes/NonoConcat.java | 4 +- .../rxjava3/basetypes/NonoConcatIterable.java | 7 +- .../akarnokd/rxjava3/basetypes/NonoDefer.java | 5 +- .../rxjava3/basetypes/NonoErrorSupplier.java | 7 +- .../rxjava3/basetypes/NonoFlatMapSignal.java | 8 +- .../akarnokd/rxjava3/basetypes/NonoLift.java | 5 +- .../rxjava3/basetypes/NonoMapError.java | 5 +- .../rxjava3/basetypes/NonoMergeIterable.java | 7 +- .../rxjava3/basetypes/NonoProcessor.java | 2 +- .../rxjava3/basetypes/NonoRepeat.java | 2 +- .../rxjava3/basetypes/NonoRepeatUntil.java | 2 +- .../rxjava3/basetypes/NonoRepeatWhen.java | 2 +- .../rxjava3/basetypes/NonoRetryWhen.java | 2 +- .../rxjava3/basetypes/NonoRetryWhile.java | 2 +- .../akarnokd/rxjava3/basetypes/NonoUsing.java | 7 +- .../akarnokd/rxjava3/basetypes/Perhaps.java | 261 +++++++++--------- .../rxjava3/basetypes/PerhapsAmbArray.java | 2 +- .../rxjava3/basetypes/PerhapsAmbIterable.java | 7 +- .../rxjava3/basetypes/PerhapsCache.java | 6 +- .../rxjava3/basetypes/PerhapsCreate.java | 4 +- .../basetypes/PerhapsDefaultIfEmpty.java | 2 +- .../rxjava3/basetypes/PerhapsDefer.java | 5 +- .../basetypes/PerhapsDelaySubscription.java | 2 +- .../basetypes/PerhapsErrorSupplier.java | 7 +- .../rxjava3/basetypes/PerhapsFlatMap.java | 4 +- .../basetypes/PerhapsFlatMapPublisher.java | 4 +- .../basetypes/PerhapsFlatMapSignal.java | 8 +- .../basetypes/PerhapsFromCallable.java | 6 +- .../rxjava3/basetypes/PerhapsFromFuture.java | 2 +- .../rxjava3/basetypes/PerhapsJust.java | 2 +- .../rxjava3/basetypes/PerhapsLift.java | 5 +- .../basetypes/PerhapsOnErrorResumeNext.java | 6 +- .../basetypes/PerhapsOnErrorReturnItem.java | 2 +- .../rxjava3/basetypes/PerhapsProcessor.java | 6 +- .../rxjava3/basetypes/PerhapsRetry.java | 4 +- .../rxjava3/basetypes/PerhapsRetryWhen.java | 9 +- .../rxjava3/basetypes/PerhapsRetryWhile.java | 4 +- .../rxjava3/basetypes/PerhapsSubscribeOn.java | 2 +- .../rxjava3/basetypes/PerhapsTakeUntil.java | 4 +- .../rxjava3/basetypes/PerhapsTimeout.java | 4 +- .../rxjava3/basetypes/PerhapsUsing.java | 5 +- .../rxjava3/basetypes/PerhapsZipArray.java | 4 +- .../rxjava3/basetypes/PerhapsZipIterable.java | 2 +- .../hu/akarnokd/rxjava3/basetypes/Solo.java | 235 ++++++++-------- .../rxjava3/basetypes/SoloAmbArray.java | 2 +- .../rxjava3/basetypes/SoloAmbIterable.java | 7 +- .../akarnokd/rxjava3/basetypes/SoloCache.java | 6 +- .../rxjava3/basetypes/SoloCreate.java | 4 +- .../akarnokd/rxjava3/basetypes/SoloDefer.java | 5 +- .../basetypes/SoloDelaySubscription.java | 2 +- .../rxjava3/basetypes/SoloErrorSupplier.java | 7 +- .../rxjava3/basetypes/SoloFlatMap.java | 4 +- .../basetypes/SoloFlatMapPublisher.java | 4 +- .../rxjava3/basetypes/SoloFlatMapSignal.java | 6 +- .../rxjava3/basetypes/SoloFromCallable.java | 7 +- .../rxjava3/basetypes/SoloFromFuture.java | 2 +- .../akarnokd/rxjava3/basetypes/SoloJust.java | 2 +- .../akarnokd/rxjava3/basetypes/SoloLift.java | 5 +- .../akarnokd/rxjava3/basetypes/SoloMap.java | 7 +- .../rxjava3/basetypes/SoloMapError.java | 5 +- .../rxjava3/basetypes/SoloObserveOn.java | 2 +- .../basetypes/SoloOnErrorResumeNext.java | 6 +- .../basetypes/SoloOnErrorResumeWith.java | 2 +- .../basetypes/SoloOnErrorReturnItem.java | 2 +- .../rxjava3/basetypes/SoloProcessor.java | 6 +- .../akarnokd/rxjava3/basetypes/SoloRetry.java | 4 +- .../rxjava3/basetypes/SoloRetryWhen.java | 9 +- .../rxjava3/basetypes/SoloRetryWhile.java | 4 +- .../rxjava3/basetypes/SoloSubscribeOn.java | 4 +- .../rxjava3/basetypes/SoloTakeUntil.java | 4 +- .../rxjava3/basetypes/SoloTimeout.java | 4 +- .../akarnokd/rxjava3/basetypes/SoloTimer.java | 2 +- .../akarnokd/rxjava3/basetypes/SoloUsing.java | 4 +- .../rxjava3/basetypes/SoloZipArray.java | 9 +- .../rxjava3/basetypes/SoloZipIterable.java | 9 +- .../AbstractDisposableAutoRelease.java | 2 +- .../consumers/CompletableConsumers.java | 22 +- .../DisposableAutoReleaseSubscriber.java | 2 +- .../rxjava3/consumers/FlowableConsumers.java | 34 +-- .../rxjava3/consumers/MaybeConsumers.java | 34 +-- .../consumers/ObservableConsumers.java | 34 +-- .../rxjava3/consumers/SingleConsumers.java | 22 +- .../debug/ParallelFlowableOnAssembly.java | 4 +- .../debug/RxJavaAssemblyException.java | 4 +- .../debug/multihook/MultiHandlerManager.java | 13 +- .../validator/ParallelFlowableValidator.java | 2 +- .../rxjava3/expr/FlowableWhileDoWhile.java | 2 +- .../rxjava3/expr/ObservableWhileDoWhile.java | 2 +- .../rxjava3/expr/StatementCompletable.java | 15 +- .../rxjava3/expr/StatementFlowable.java | 25 +- .../akarnokd/rxjava3/expr/StatementMaybe.java | 17 +- .../rxjava3/expr/StatementObservable.java | 26 +- .../rxjava3/expr/StatementSingle.java | 17 +- .../rxjava3/functions/FunctionTagging.java | 57 ++-- .../akarnokd/rxjava3/joins/ActivePlan0.java | 2 +- .../akarnokd/rxjava3/joins/ActivePlanN.java | 2 +- .../rxjava3/joins/JoinObservable.java | 3 +- .../akarnokd/rxjava3/joins/JoinObserver1.java | 6 +- .../akarnokd/rxjava3/joins/JoinPatterns.java | 13 +- .../hu/akarnokd/rxjava3/joins/Pattern1.java | 2 +- .../hu/akarnokd/rxjava3/joins/Pattern2.java | 4 +- .../hu/akarnokd/rxjava3/joins/Pattern3.java | 4 +- .../hu/akarnokd/rxjava3/joins/Pattern4.java | 4 +- .../hu/akarnokd/rxjava3/joins/Pattern5.java | 4 +- .../hu/akarnokd/rxjava3/joins/Pattern6.java | 4 +- .../hu/akarnokd/rxjava3/joins/Pattern7.java | 4 +- .../hu/akarnokd/rxjava3/joins/Pattern8.java | 4 +- .../hu/akarnokd/rxjava3/joins/Pattern9.java | 7 +- .../hu/akarnokd/rxjava3/joins/PatternN.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan.java | 2 +- .../java/hu/akarnokd/rxjava3/joins/Plan1.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan2.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan3.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan4.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan5.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan6.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan7.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan8.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/Plan9.java | 4 +- .../java/hu/akarnokd/rxjava3/joins/PlanN.java | 4 +- .../akarnokd/rxjava3/math/MathFlowable.java | 4 +- .../akarnokd/rxjava3/math/MathObservable.java | 4 +- .../operators/BasicMergeSubscription.java | 2 +- .../CompletableFlatMapSignalCompletable.java | 6 +- .../CompletableFlatMapSignalFlowable.java | 12 +- .../CompletableFlatMapSignalMaybe.java | 12 +- .../CompletableFlatMapSignalObservable.java | 12 +- .../CompletableFlatMapSignalSingle.java | 12 +- .../operators/CompletableTransformers.java | 7 +- .../rxjava3/operators/Completables.java | 27 +- .../operators/FlowableBufferPredicate.java | 9 +- .../rxjava3/operators/FlowableCacheLast.java | 2 +- .../rxjava3/operators/FlowableCoalesce.java | 6 +- .../operators/FlowableDebounceFirst.java | 2 +- .../rxjava3/operators/FlowableErrorJump.java | 10 +- .../rxjava3/operators/FlowableEvery.java | 2 +- .../rxjava3/operators/FlowableExpand.java | 19 +- .../operators/FlowableFilterAsync.java | 10 +- .../operators/FlowableFlatMapAsync.java | 2 +- .../operators/FlowableFlatMapSync.java | 12 +- .../operators/FlowableGenerateAsync.java | 2 +- .../rxjava3/operators/FlowableIndexOf.java | 2 +- .../rxjava3/operators/FlowableMapAsync.java | 14 +- .../rxjava3/operators/FlowableMapFilter.java | 2 +- .../FlowableOnBackpressureTimeout.java | 4 +- .../operators/FlowableOrderedMerge.java | 5 +- .../operators/FlowablePartialCollect.java | 6 +- .../operators/FlowableRepeatScalar.java | 4 +- .../operators/FlowableRepeatSupplier.java | 19 +- .../operators/FlowableRequestObserveOn.java | 2 +- .../operators/FlowableRequestSample.java | 6 +- .../operators/FlowableRequestSampleTime.java | 8 +- .../rxjava3/operators/FlowableSpanout.java | 4 +- .../operators/FlowableSwitchFlatMap.java | 13 +- .../operators/FlowableSwitchIfEmptyMany.java | 6 +- .../FlowableSwitchIfEmptyManyArray.java | 6 +- .../operators/FlowableSwitchOnFirst.java | 12 +- .../operators/FlowableTimeoutLast.java | 12 +- .../operators/FlowableTransformers.java | 129 ++++----- .../rxjava3/operators/FlowableValve.java | 8 +- .../operators/FlowableWindowPredicate.java | 6 +- .../rxjava3/operators/FlowableZipLatest.java | 9 +- .../akarnokd/rxjava3/operators/Flowables.java | 80 +++--- .../MaybeFlatMapSignalCompletable.java | 10 +- .../operators/MaybeFlatMapSignalFlowable.java | 12 +- .../operators/MaybeFlatMapSignalMaybe.java | 12 +- .../MaybeFlatMapSignalObservable.java | 12 +- .../operators/MaybeFlatMapSignalSingle.java | 12 +- .../rxjava3/operators/MaybeTransformers.java | 11 +- .../hu/akarnokd/rxjava3/operators/Maybes.java | 35 +-- .../operators/ObservableErrorJump.java | 10 +- .../operators/ObservableFilterAsync.java | 10 +- .../operators/ObservableFlatMapDrop.java | 6 +- .../operators/ObservableFlatMapLatest.java | 8 +- .../rxjava3/operators/ObservableIndexOf.java | 2 +- .../rxjava3/operators/ObservableMapAsync.java | 12 +- .../operators/ObservableObserveOnDrop.java | 4 +- .../operators/ObservableObserveOnLatest.java | 4 +- .../operators/ObservableTransformers.java | 40 +-- .../rxjava3/operators/ObservableValve.java | 8 +- .../SingleFlatMapSignalCompletable.java | 8 +- .../SingleFlatMapSignalFlowable.java | 10 +- .../operators/SingleFlatMapSignalMaybe.java | 10 +- .../SingleFlatMapSignalObservable.java | 10 +- .../operators/SingleFlatMapSignalSingle.java | 10 +- .../rxjava3/operators/SingleTransformers.java | 9 +- .../akarnokd/rxjava3/operators/Singles.java | 27 +- .../parallel/ParallelOrderedMerge.java | 2 +- .../parallel/ParallelTransformers.java | 14 +- .../processors/DispatchWorkProcessor.java | 18 +- .../processors/FlowableProcessors.java | 7 +- .../rxjava3/processors/RefCountProcessor.java | 6 +- .../rxjava3/schedulers/BlockingScheduler.java | 23 +- .../rxjava3/schedulers/ParallelScheduler.java | 34 +-- .../rxjava3/schedulers/SharedScheduler.java | 6 +- .../rxjava3/string/FlowableSplit.java | 2 +- .../rxjava3/string/StringFlowable.java | 5 +- .../rxjava3/subjects/DispatchWorkSubject.java | 16 +- .../rxjava3/subjects/RefCountSubject.java | 6 +- .../akarnokd/rxjava3/subjects/Subjects.java | 5 +- .../rxjava3/subjects/UnicastWorkSubject.java | 16 +- .../rxjava3/util/CompositeSubscription.java | 2 +- .../rxjava3/util/SpmcLinkedArrayQueue.java | 10 +- .../akarnokd/rxjava3/util/SpscOneQueue.java | 4 +- .../rxjava3/async/AsyncFlowableTest.java | 46 +-- .../rxjava3/async/AsyncObservableTest.java | 44 +-- .../rxjava3/basetypes/NonoProcessorTest.java | 4 +- .../akarnokd/rxjava3/basetypes/NonoTest.java | 12 +- .../rxjava3/basetypes/PerhapsTest.java | 50 +--- .../akarnokd/rxjava3/basetypes/SoloTest.java | 46 +-- .../consumers/CompletableConsumersTest.java | 6 +- .../consumers/FlowableConsumersTest.java | 2 +- .../rxjava3/consumers/MaybeConsumersTest.java | 6 +- .../consumers/ObservableConsumersTest.java | 6 +- .../consumers/SingleConsumersTest.java | 6 +- .../RxJavaProtocolValidatorTest.java | 22 +- .../expr/StatementCompletableTest.java | 8 +- .../rxjava3/expr/StatementFlowableTest.java | 18 +- .../rxjava3/expr/StatementMaybeTest.java | 14 +- .../rxjava3/expr/StatementObservableTest.java | 18 +- .../rxjava3/expr/StatementSingleTest.java | 10 +- .../rxjava3/joins/OperatorJoinsTest.java | 4 +- .../FlowableBufferPredicateTest.java | 31 +-- .../operators/FlowableCoalesceTest.java | 10 - .../operators/FlowableErrorJumpTest.java | 1 - .../rxjava3/operators/FlowableExpandTest.java | 4 +- .../operators/FlowableGenerateAsyncTest.java | 2 +- .../FlowableOnBackpressureTimeoutTest.java | 6 +- .../operators/FlowableOrderedMergeTest.java | 43 +-- .../FlowableSwitchIfEmptyManyTest.java | 8 - .../FlowableWindowPredicateTest.java | 19 -- .../operators/FlowableZipLatestTest.java | 11 +- .../operators/ObservableErrorJumpTest.java | 1 - .../operators/ObservableFilterAsyncTest.java | 12 +- .../operators/ObservableFlatMapDropTest.java | 8 +- .../ObservableFlatMapLatestTest.java | 10 +- .../operators/ObservableIndexOfTest.java | 4 +- .../operators/ObservableMapAsyncTest.java | 12 +- .../ObservableObserveOnDropTest.java | 2 +- .../ObservableObserveOnLatestTest.java | 2 +- .../processors/DispatchWorkProcessorTest.java | 10 +- .../processors/RefCountProcessorTest.java | 4 +- .../schedulers/BlockingSchedulerTest.java | 2 +- .../schedulers/ParallelSchedulerTest.java | 34 +-- .../schedulers/SharedSchedulerTest.java | 12 +- .../subjects/DispatchWorkSubjectTest.java | 8 +- .../rxjava3/subjects/RefCountSubjectTest.java | 10 +- .../subjects/UnicastWorkSubjectTest.java | 10 +- .../hu/akarnokd/rxjava3/test/BaseTest.java | 8 +- .../rxjava3/test/BaseTestConsumerEx.java | 9 +- .../hu/akarnokd/rxjava3/test/TestHelper.java | 141 +++++----- .../akarnokd/rxjava3/test/TestObserverEx.java | 2 +- .../rxjava3/test/TestSubscriberEx.java | 2 +- .../util/SpmcLinkedArrayQueueTest.java | 26 +- .../CheckLocalVariablesInTests.java | 2 +- .../validation/NewLinesBeforeAnnotation.java | 4 +- .../validation/TooManyEmptyNewLines.java | 4 +- 267 files changed, 1564 insertions(+), 1696 deletions(-) diff --git a/build.gradle b/build.gradle index bf948945..5684b7ae 100644 --- a/build.gradle +++ b/build.gradle @@ -23,8 +23,8 @@ apply plugin: 'jacoco' apply plugin: 'ru.vyarus.animalsniffer' apply plugin: "com.github.hierynomus.license" -sourceCompatibility = '1.6' -targetCompatibility = '1.6' +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 group = "com.github.akarnokd" ext.githubProjectName = 'RxJavaExtensions' @@ -44,10 +44,10 @@ repositories { } dependencies { - signature 'org.codehaus.mojo.signature:java16:1.1@signature' + signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.0-RC6" + compile "io.reactivex.rxjava3:rxjava:3.0.0-RC7" testCompile group: 'junit', name: 'junit', version: '4.12' diff --git a/gradle.properties b/gradle.properties index d74bab4a..f92b7511 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ GROUP=com.github.akarnokd -VERSION_NAME=3.0.0-RC6 -version=3.0.0-RC6 +VERSION_NAME=3.0.0-RC7 +version=3.0.0-RC7 POM_ARTIFACT_ID=rxjava3-extensions POM_NAME=RxJava 3 extra sources, operators and components diff --git a/src/main/java/hu/akarnokd/rxjava3/async/AsyncFlowable.java b/src/main/java/hu/akarnokd/rxjava3/async/AsyncFlowable.java index b20b45e0..9b824d66 100644 --- a/src/main/java/hu/akarnokd/rxjava3/async/AsyncFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/AsyncFlowable.java @@ -705,7 +705,7 @@ public static SimpleCallable> toAsyncCallable(final Callable>() { @Override public Flowable call() { - return Flowable.fromCallable(func).subscribeOn(scheduler); + return Flowable.fromCallable(func).subscribeOn(scheduler); } }; } @@ -731,7 +731,7 @@ public static SimpleCallable> toAsyncSupplier(final Supplier>() { @Override public Flowable call() { - return Flowable.fromSupplier(func).subscribeOn(scheduler); + return Flowable.fromSupplier(func).subscribeOn(scheduler); } }; } @@ -1510,7 +1510,7 @@ public R get() throws Throwable { * @see RxJava Wiki: startFuture() */ public static Flowable startFuture(final Supplier> functionAsync) { - return RxJavaPlugins.onAssembly(new FlowableFromSupplierNull(new Supplier() { + return RxJavaPlugins.onAssembly(new FlowableFromSupplierNull<>(new Supplier() { @Override public T get() throws Throwable { return functionAsync.get().get(); @@ -1767,9 +1767,9 @@ public static Future forEachFuture( Scheduler scheduler) { SequentialDisposable d = new SequentialDisposable(); - final FutureCompletable f = new FutureCompletable(d); + final FutureCompletable f = new FutureCompletable<>(d); - LambdaSubscriber ls = new LambdaSubscriber(onNext, + LambdaSubscriber ls = new LambdaSubscriber<>(onNext, new Consumer() { @Override public void accept(Throwable e) throws Exception { diff --git a/src/main/java/hu/akarnokd/rxjava3/async/AsyncObservable.java b/src/main/java/hu/akarnokd/rxjava3/async/AsyncObservable.java index fc567777..aac79a11 100644 --- a/src/main/java/hu/akarnokd/rxjava3/async/AsyncObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/AsyncObservable.java @@ -649,7 +649,7 @@ public static SimpleCallable> toAsyncCallable(final Callable>() { @Override public Observable call() { - return Observable.fromCallable(func).subscribeOn(scheduler); + return Observable.fromCallable(func).subscribeOn(scheduler); } }; } @@ -673,7 +673,7 @@ public static SimpleCallable> toAsyncSupplier(final Supplier>() { @Override public Observable call() { - return Observable.fromSupplier(func).subscribeOn(scheduler); + return Observable.fromSupplier(func).subscribeOn(scheduler); } }; } @@ -1410,7 +1410,7 @@ public R get() throws Throwable { * @see RxJava Wiki: startFuture() */ public static Observable startFuture(final Supplier> functionAsync) { - return RxJavaPlugins.onAssembly(new ObservableFromSupplierNull(new Supplier() { + return RxJavaPlugins.onAssembly(new ObservableFromSupplierNull<>(new Supplier() { @Override public T get() throws Throwable { return functionAsync.get().get(); @@ -1649,9 +1649,9 @@ public static Future forEachFuture( Scheduler scheduler) { SequentialDisposable d = new SequentialDisposable(); - final FutureCompletable f = new FutureCompletable(d); + final FutureCompletable f = new FutureCompletable<>(d); - LambdaObserver ls = new LambdaObserver(onNext, + LambdaObserver ls = new LambdaObserver<>(onNext, new Consumer() { @Override public void accept(Throwable e) throws Exception { diff --git a/src/main/java/hu/akarnokd/rxjava3/async/FlowableFromCallableNull.java b/src/main/java/hu/akarnokd/rxjava3/async/FlowableFromCallableNull.java index 4ead8ab9..baed4d0d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/async/FlowableFromCallableNull.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/FlowableFromCallableNull.java @@ -38,7 +38,7 @@ final class FlowableFromSupplierNull extends Flowable implements Supplier< @Override protected void subscribeActual(Subscriber s) { - CallableNullSubscription deferred = new CallableNullSubscription(s); + CallableNullSubscription deferred = new CallableNullSubscription<>(s); s.onSubscribe(deferred); if (!deferred.isCancelled()) { diff --git a/src/main/java/hu/akarnokd/rxjava3/async/FutureCompletable.java b/src/main/java/hu/akarnokd/rxjava3/async/FutureCompletable.java index e274e9c3..6d669d23 100644 --- a/src/main/java/hu/akarnokd/rxjava3/async/FutureCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/FutureCompletable.java @@ -16,11 +16,11 @@ package hu.akarnokd.rxjava3.async; +import java.util.Objects; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; import io.reactivex.rxjava3.disposables.Disposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** @@ -79,7 +79,7 @@ public void complete(T value) { * @param error the error to complete exceptionally */ public void completeExceptionally(Throwable error) { - ObjectHelper.requireNonNull(error, "error is null"); + Objects.requireNonNull(error, "error is null"); if (once.compareAndSet(0, STATE_ERROR)) { this.onCancel = null; this.error = error; diff --git a/src/main/java/hu/akarnokd/rxjava3/async/ObservableFromSupplierNull.java b/src/main/java/hu/akarnokd/rxjava3/async/ObservableFromSupplierNull.java index c047da82..b7e0a722 100644 --- a/src/main/java/hu/akarnokd/rxjava3/async/ObservableFromSupplierNull.java +++ b/src/main/java/hu/akarnokd/rxjava3/async/ObservableFromSupplierNull.java @@ -36,7 +36,7 @@ final class ObservableFromSupplierNull extends Observable implements Suppl @Override protected void subscribeActual(Observer observer) { - SupplierNullDisposable deferred = new SupplierNullDisposable(observer); + SupplierNullDisposable deferred = new SupplierNullDisposable<>(observer); observer.onSubscribe(deferred); if (!deferred.isDisposed()) { diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/FuturePerhapsSubscriber.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/FuturePerhapsSubscriber.java index f002d6bf..a133ac52 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/FuturePerhapsSubscriber.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/FuturePerhapsSubscriber.java @@ -40,7 +40,7 @@ final class FuturePerhapsSubscriber extends CountDownLatch FuturePerhapsSubscriber() { super(1); - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/Nono.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/Nono.java index 9d2b437e..84bd2f1d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/Nono.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/Nono.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; import java.util.concurrent.*; import org.reactivestreams.*; @@ -68,7 +69,7 @@ protected static Nono onAssembly(Nono source) { Function f = onAssemblyHandler; if (f != null) { try { - return ObjectHelper.requireNonNull(f.apply(source), "The onAssemblyHandler returned a null Nono"); + return Objects.requireNonNull(f.apply(source), "The onAssemblyHandler returned a null Nono"); } catch (Throwable ex) { throw ExceptionHelper.wrapOrThrow(ex); } @@ -105,7 +106,7 @@ public static void setOnAssemblyHandler(Function handler) { * @return the new Nono instance */ public static Nono create(CompletableOnSubscribe onCreate) { - ObjectHelper.requireNonNull(onCreate, "onCreate is null"); + Objects.requireNonNull(onCreate, "onCreate is null"); return onAssembly(new NonoCreate(onCreate)); } @@ -132,7 +133,7 @@ public static Nono never() { * @return the new Nono instance */ public static Nono error(Throwable ex) { - ObjectHelper.requireNonNull(ex, "ex is null"); + Objects.requireNonNull(ex, "ex is null"); return onAssembly(new NonoError(ex)); } @@ -143,7 +144,7 @@ public static Nono error(Throwable ex) { * @return the new Nono instance */ public static Nono error(Supplier errorSupplier) { - ObjectHelper.requireNonNull(errorSupplier, "errorSupplier is null"); + Objects.requireNonNull(errorSupplier, "errorSupplier is null"); return onAssembly(new NonoErrorSupplier(errorSupplier)); } @@ -155,7 +156,7 @@ public static Nono error(Supplier errorSupplier) { * @return the new Nono instance */ public static Nono defer(Supplier supplier) { - ObjectHelper.requireNonNull(supplier, "supplier is null"); + Objects.requireNonNull(supplier, "supplier is null"); return onAssembly(new NonoDefer(supplier)); } @@ -166,7 +167,7 @@ public static Nono defer(Supplier supplier) { * @return the new nono instance */ public static Nono fromAction(Action action) { - ObjectHelper.requireNonNull(action, "action is null"); + Objects.requireNonNull(action, "action is null"); return onAssembly(new NonoFromAction(action)); } @@ -177,7 +178,7 @@ public static Nono fromAction(Action action) { * @return the new Nono instance */ public static Nono fromFuture(Future future) { - ObjectHelper.requireNonNull(future, "future is null"); + Objects.requireNonNull(future, "future is null"); return onAssembly(new NonoFromFuture(future, 0L, TimeUnit.NANOSECONDS)); } @@ -190,8 +191,8 @@ public static Nono fromFuture(Future future) { * @return the new Nono instance */ public static Nono fromFuture(Future future, long timeout, TimeUnit unit) { - ObjectHelper.requireNonNull(future, "future is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(future, "future is null"); + Objects.requireNonNull(unit, "unit is null"); return onAssembly(new NonoFromFuture(future, timeout, unit)); } @@ -202,7 +203,7 @@ public static Nono fromFuture(Future future, long timeout, TimeUnit unit) { * @return the new Nono instance */ public static Nono amb(Iterable sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return onAssembly(new NonoAmbIterable(sources)); } @@ -213,7 +214,7 @@ public static Nono amb(Iterable sources) { * @return the new Nono instance */ public static Nono ambArray(Nono... sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return onAssembly(new NonoAmbArray(sources)); } @@ -223,7 +224,7 @@ public static Nono ambArray(Nono... sources) { * @return the new Nono instances */ public static Nono concat(Iterable sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return onAssembly(new NonoConcatIterable(sources, false)); } @@ -244,7 +245,7 @@ public static Nono concat(Publisher sources) { * @return the new Nono instance */ public static Nono concat(Publisher sources, int prefetch) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return onAssembly(new NonoConcat(sources, prefetch, ErrorMode.IMMEDIATE)); } @@ -255,7 +256,7 @@ public static Nono concat(Publisher sources, int prefetch) { * @return the new Nono instances */ public static Nono concatArray(Nono... sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return onAssembly(new NonoConcatArray(sources, false)); } @@ -266,7 +267,7 @@ public static Nono concatArray(Nono... sources) { * @return the new Nono instances */ public static Nono concatDelayError(Iterable sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return onAssembly(new NonoConcatIterable(sources, true)); } @@ -290,7 +291,7 @@ public static Nono concatDelayError(Publisher sources) { * @return the new Nono instances */ public static Nono concatDelayError(Publisher sources, int prefetch, boolean tillTheEnd) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return onAssembly(new NonoConcat(sources, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY)); } @@ -302,7 +303,7 @@ public static Nono concatDelayError(Publisher sources, int prefe * @return the new Nono instances */ public static Nono concatArrayDelayError(Nono... sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return onAssembly(new NonoConcatArray(sources, true)); } @@ -323,7 +324,7 @@ public static Nono merge(Iterable sources) { * @return the new Nono instance */ public static Nono merge(Iterable sources, int maxConcurrency) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); return onAssembly(new NonoMergeIterable(sources, false, maxConcurrency)); } @@ -345,7 +346,7 @@ public static Nono merge(Publisher sources) { * @return the new Nono instance */ public static Nono merge(Publisher sources, int maxConcurrency) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); return onAssembly(new NonoMerge(sources, false, maxConcurrency)); } @@ -368,7 +369,7 @@ public static Nono mergeArray(Nono... sources) { */ public static Nono mergeArray(int maxConcurrency, Nono... sources) { ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return onAssembly(new NonoMergeArray(sources, false, maxConcurrency)); } @@ -390,7 +391,7 @@ public static Nono mergeDelayError(Iterable sources) { * @return the new Nono instance */ public static Nono mergeDelayError(Iterable sources, int maxConcurrency) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); return onAssembly(new NonoMergeIterable(sources, true, maxConcurrency)); } @@ -414,7 +415,7 @@ public static Nono mergeDelayError(Publisher sources) { * @return the new Nono instance */ public static Nono mergeDelayError(Publisher sources, int maxConcurrency) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); return onAssembly(new NonoMerge(sources, true, maxConcurrency)); } @@ -438,7 +439,7 @@ public static Nono mergeArrayDelayError(Nono... sources) { */ public static Nono mergeArrayDelayError(int maxConcurrency, Nono... sources) { ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return onAssembly(new NonoMergeArray(sources, true, maxConcurrency)); } @@ -462,8 +463,8 @@ public static Nono timer(long delay, TimeUnit unit) { */ @SchedulerSupport(SchedulerSupport.CUSTOM) public static Nono timer(long delay, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return onAssembly(new NonoTimer(delay, unit, scheduler)); } @@ -498,10 +499,10 @@ public static Nono using(Supplier resourceSupplier, Function Nono using(Supplier resourceSupplier, Function sourceSupplier, Consumer disposer, boolean eager) { - ObjectHelper.requireNonNull(resourceSupplier, "resourceSupplier is null"); - ObjectHelper.requireNonNull(sourceSupplier, "sourceSupplier is null"); - ObjectHelper.requireNonNull(disposer, "disposer is null"); - return onAssembly(new NonoUsing(resourceSupplier, sourceSupplier, disposer, eager)); + Objects.requireNonNull(resourceSupplier, "resourceSupplier is null"); + Objects.requireNonNull(sourceSupplier, "sourceSupplier is null"); + Objects.requireNonNull(disposer, "disposer is null"); + return onAssembly(new NonoUsing<>(resourceSupplier, sourceSupplier, disposer, eager)); } /** @@ -514,7 +515,7 @@ public static Nono fromPublisher(Publisher source) { if (source instanceof Nono) { return (Nono)source; } - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); return onAssembly(new NonoFromPublisher(source)); } @@ -525,7 +526,7 @@ public static Nono fromPublisher(Publisher source) { * @return the new Nono instance */ public static Nono fromSingle(SingleSource source) { - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); return onAssembly(new NonoFromSingle(source)); } @@ -536,7 +537,7 @@ public static Nono fromSingle(SingleSource source) { * @return the new Nono instance */ public static Nono fromMaybe(MaybeSource source) { - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); return onAssembly(new NonoFromMaybe(source)); } @@ -547,7 +548,7 @@ public static Nono fromMaybe(MaybeSource source) { * @return the new Nono instance */ public static Nono fromCompletable(CompletableSource source) { - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); return onAssembly(new NonoFromCompletable(source)); } @@ -558,7 +559,7 @@ public static Nono fromCompletable(CompletableSource source) { * @return the new Nono instance */ public static Nono fromObservable(ObservableSource source) { - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); return onAssembly(new NonoFromObservable(source)); } @@ -574,7 +575,7 @@ public static Nono fromObservable(ObservableSource source) { * @return the new Flowable instance */ public final Flowable andThen(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new NonoAndThenPublisher(this, other)); } @@ -584,7 +585,7 @@ public final Flowable andThen(Publisher other) { * @return the new Nono instance */ public final Nono andThen(Nono other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return onAssembly(new NonoAndThen(this, other)); } @@ -610,8 +611,8 @@ public final Nono delay(long delay, TimeUnit unit) { */ @SchedulerSupport(SchedulerSupport.CUSTOM) public final Nono delay(long delay, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return onAssembly(new NonoDelay(this, delay, unit, scheduler)); } @@ -622,7 +623,7 @@ public final Nono delay(long delay, TimeUnit unit, Scheduler scheduler) { * @return the new Nono instance */ public final Nono delaySubscription(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return onAssembly(new NonoDelaySubscription(this, other)); } @@ -694,9 +695,9 @@ public final Nono timeout(long timeout, TimeUnit unit, Scheduler scheduler) { * @return the new Nono instance */ public final Nono timeout(long timeout, TimeUnit unit, Scheduler scheduler, Nono fallback) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - ObjectHelper.requireNonNull(fallback, "fallback is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(fallback, "fallback is null"); return timeout(timer(timeout, unit, scheduler), fallback); } @@ -707,7 +708,7 @@ public final Nono timeout(long timeout, TimeUnit unit, Scheduler scheduler, Nono * @return the new Nono instance */ public final Nono timeout(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return onAssembly(new NonoTimeout(this, other, null)); } @@ -719,8 +720,8 @@ public final Nono timeout(Publisher other) { * @return the new Nono instance */ public final Nono timeout(Publisher other, Nono fallback) { - ObjectHelper.requireNonNull(other, "other is null"); - ObjectHelper.requireNonNull(fallback, "fallback is null"); + Objects.requireNonNull(other, "other is null"); + Objects.requireNonNull(fallback, "fallback is null"); return onAssembly(new NonoTimeout(this, other, fallback)); } @@ -740,7 +741,7 @@ public final Nono onErrorComplete() { * @return the new Nono instance */ public final Nono onErrorResumeNext(Function errorHandler) { - ObjectHelper.requireNonNull(errorHandler, "errorHandler is null"); + Objects.requireNonNull(errorHandler, "errorHandler is null"); return onAssembly(new NonoOnErrorResume(this, errorHandler)); } @@ -751,7 +752,7 @@ public final Nono onErrorResumeNext(Function * @return the new Nono instance */ public final Nono mapError(Function mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return onAssembly(new NonoMapError(this, mapper)); } @@ -767,9 +768,9 @@ public final Nono mapError(Function mapp */ public final Flowable flatMap(Function> onErrorMapper, Supplier> onCompleteMapper) { - ObjectHelper.requireNonNull(onErrorMapper, "onErrorMapper is null"); - ObjectHelper.requireNonNull(onCompleteMapper, "onCompleteMapper is null"); - return RxJavaPlugins.onAssembly(new NonoFlatMapSignal(this, onErrorMapper, onCompleteMapper)); + Objects.requireNonNull(onErrorMapper, "onErrorMapper is null"); + Objects.requireNonNull(onCompleteMapper, "onCompleteMapper is null"); + return RxJavaPlugins.onAssembly(new NonoFlatMapSignal<>(this, onErrorMapper, onCompleteMapper)); } /** @@ -804,7 +805,7 @@ public final R to(Function converter) { * @return the new Nono instance */ public final Nono lift(Function, Subscriber> lifter) { - ObjectHelper.requireNonNull(lifter, "lifter is null"); + Objects.requireNonNull(lifter, "lifter is null"); return onAssembly(new NonoLift(this, lifter)); } @@ -860,7 +861,7 @@ public final Perhaps toPerhaps() { * @return the new Nono instance */ public final Nono subscribeOn(Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return onAssembly(new NonoSubscribeOn(this, scheduler)); } @@ -871,7 +872,7 @@ public final Nono subscribeOn(Scheduler scheduler) { * @return the new Nono instance */ public final Nono observeOn(Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return onAssembly(new NonoObserveOn(this, scheduler)); } @@ -882,7 +883,7 @@ public final Nono observeOn(Scheduler scheduler) { * @return the new Nono instance */ public final Nono unsubscribeOn(Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return onAssembly(new NonoUnsubscribeOn(this, scheduler)); } @@ -893,7 +894,7 @@ public final Nono unsubscribeOn(Scheduler scheduler) { * @return the new Nolo instance */ public final Nono doOnComplete(Action onComplete) { - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); return onAssembly(new NonoDoOnLifecycle(this, Functions.emptyConsumer(), onComplete, @@ -911,7 +912,7 @@ public final Nono doOnComplete(Action onComplete) { * @return the new Nolo instance */ public final Nono doOnError(Consumer onError) { - ObjectHelper.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onError, "onError is null"); return onAssembly(new NonoDoOnLifecycle(this, onError, Functions.EMPTY_ACTION, @@ -928,7 +929,7 @@ public final Nono doOnError(Consumer onError) { * @return the new Nolo instance */ public final Nono doOnSubscribe(Consumer onSubscribe) { - ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null"); + Objects.requireNonNull(onSubscribe, "onSubscribe is null"); return onAssembly(new NonoDoOnLifecycle(this, Functions.emptyConsumer(), Functions.EMPTY_ACTION, @@ -945,7 +946,7 @@ public final Nono doOnSubscribe(Consumer onSubscribe) { * @return the new Nolo instance */ public final Nono doOnRequest(LongConsumer onRequest) { - ObjectHelper.requireNonNull(onRequest, "onRequest is null"); + Objects.requireNonNull(onRequest, "onRequest is null"); return onAssembly(new NonoDoOnLifecycle(this, Functions.emptyConsumer(), Functions.EMPTY_ACTION, @@ -963,7 +964,7 @@ public final Nono doOnRequest(LongConsumer onRequest) { * @return the new Nono instance */ public final Nono doAfterTerminate(Action onAfterTerminate) { - ObjectHelper.requireNonNull(onAfterTerminate, "onAfterTerminate is null"); + Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null"); return onAssembly(new NonoDoOnLifecycle(this, Functions.emptyConsumer(), Functions.EMPTY_ACTION, @@ -981,7 +982,7 @@ public final Nono doAfterTerminate(Action onAfterTerminate) { * @return the new Nono instance */ public final Nono doFinally(Action onFinally) { - ObjectHelper.requireNonNull(onFinally, "action is null"); + Objects.requireNonNull(onFinally, "action is null"); return onAssembly(new NonoDoFinally(this, onFinally)); } @@ -991,7 +992,7 @@ public final Nono doFinally(Action onFinally) { * @return the new Nono instance */ public final Nono doOnCancel(Action onCancel) { - ObjectHelper.requireNonNull(onCancel, "action is null"); + Objects.requireNonNull(onCancel, "action is null"); return onAssembly(new NonoDoOnLifecycle(this, Functions.emptyConsumer(), Functions.EMPTY_ACTION, @@ -1025,7 +1026,7 @@ public final Nono repeat(long times) { * @return the new Nono instance */ public final Nono repeat(BooleanSupplier stop) { - ObjectHelper.requireNonNull(stop, "stop is null"); + Objects.requireNonNull(stop, "stop is null"); return onAssembly(new NonoRepeatUntil(this, stop)); } @@ -1038,7 +1039,7 @@ public final Nono repeat(BooleanSupplier stop) { * @return the new Nono instance */ public final Nono repeatWhen(Function, ? extends Publisher> handler) { - ObjectHelper.requireNonNull(handler, "handler is null"); + Objects.requireNonNull(handler, "handler is null"); return onAssembly(new NonoRepeatWhen(this, handler)); } @@ -1066,7 +1067,7 @@ public final Nono retry(long times) { * @return the new Nono instance */ public final Nono retry(Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return onAssembly(new NonoRetryWhile(this, predicate)); } @@ -1079,7 +1080,7 @@ public final Nono retry(Predicate predicate) { * @return the new Nono instance */ public final Nono retryWhen(Function, ? extends Publisher> handler) { - ObjectHelper.requireNonNull(handler, "handler is null"); + Objects.requireNonNull(handler, "handler is null"); return onAssembly(new NonoRetryWhen(this, handler)); } @@ -1101,7 +1102,7 @@ public final Nono hide() { * @return the new Nono instance */ public final Nono takeUntil(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return onAssembly(new NonoTakeUntil(this, other)); } @@ -1122,7 +1123,7 @@ public final Nono cache() { @Override public final void subscribe(Subscriber s) { - ObjectHelper.requireNonNull(s, "s is null"); + Objects.requireNonNull(s, "s is null"); try { subscribeActual(s); @@ -1164,7 +1165,7 @@ public final > E subscribeWith(E subscriber) { */ @SchedulerSupport(SchedulerSupport.NONE) public final TestSubscriber test() { - TestSubscriber ts = new TestSubscriber(); + TestSubscriber ts = new TestSubscriber<>(); subscribe(ts); return ts; } @@ -1177,7 +1178,7 @@ public final TestSubscriber test() { */ @SchedulerSupport(SchedulerSupport.NONE) public final TestSubscriber test(boolean cancelled) { - TestSubscriber ts = new TestSubscriber(); + TestSubscriber ts = new TestSubscriber<>(); if (cancelled) { ts.cancel(); } @@ -1226,7 +1227,7 @@ public final Throwable blockingAwait(long timeout, TimeUnit unit) { return ex; } } - ObjectHelper.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(unit, "unit is null"); NonoBlockingAwaitSubscriber s = new NonoBlockingAwaitSubscriber(); subscribe(s); return s.blockingAwait(timeout, unit); @@ -1264,8 +1265,8 @@ public final Disposable subscribe(Action onComplete) { */ @SchedulerSupport(SchedulerSupport.NONE) public final Disposable subscribe(Action onComplete, Consumer onError) { - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(onError, "onError is null"); NonoLambdaSubscriber s = new NonoLambdaSubscriber(onComplete, onError); subscribe(s); return s; @@ -1296,8 +1297,8 @@ public final void blockingSubscribe(Action onComplete) { * @param onError the Consumer to call when this Nono terminates with an error */ public final void blockingSubscribe(Action onComplete, Consumer onError) { - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(onError, "onError is null"); Throwable ex = blockingAwait(); if (ex != null) { try { @@ -1322,7 +1323,7 @@ public final void blockingSubscribe(Action onComplete, Consumer toFuture() { - FuturePerhapsSubscriber fs = new FuturePerhapsSubscriber(); + FuturePerhapsSubscriber fs = new FuturePerhapsSubscriber<>(); subscribe(fs); return fs; } diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoCache.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoCache.java index b429b920..62f17b95 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoCache.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoCache.java @@ -42,7 +42,7 @@ final class NonoCache extends Nono implements Subscriber { NonoCache(Nono source) { this.source = source; this.once = new AtomicBoolean(); - this.subscribers = new AtomicReference(EMPTY); + this.subscribers = new AtomicReference<>(EMPTY); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java index 8484782b..fe600b73 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java @@ -147,13 +147,13 @@ public final void onSubscribe(Subscription s) { } if (prefetch == Integer.MAX_VALUE) { - queue = new SpscLinkedArrayQueue(bufferSize()); + queue = new SpscLinkedArrayQueue<>(bufferSize()); downstream.onSubscribe(this); s.request(Long.MAX_VALUE); } else { - queue = new SpscArrayQueue(prefetch); + queue = new SpscArrayQueue<>(prefetch); downstream.onSubscribe(this); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatIterable.java index 21609f37..a09c8f46 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcatIterable.java @@ -16,13 +16,12 @@ package hu.akarnokd.rxjava3.basetypes; -import java.util.Iterator; +import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import org.reactivestreams.*; import io.reactivex.rxjava3.exceptions.Exceptions; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.AtomicThrowable; @@ -45,7 +44,7 @@ protected void subscribeActual(Subscriber s) { Iterator it; try { - it = ObjectHelper.requireNonNull(sources.iterator(), "The sources Iterable returned a null Iterator"); + it = Objects.requireNonNull(sources.iterator(), "The sources Iterable returned a null Iterator"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); @@ -132,7 +131,7 @@ void drain() { try { b = iterator.hasNext(); if (b) { - np = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null Nono"); + np = Objects.requireNonNull(iterator.next(), "The iterator returned a null Nono"); } } catch (Throwable ex) { Exceptions.throwIfFatal(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDefer.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDefer.java index a7a1e5e7..4a46b14a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDefer.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoDefer.java @@ -16,11 +16,12 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; + import org.reactivestreams.Subscriber; 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; final class NonoDefer extends Nono { @@ -36,7 +37,7 @@ protected void subscribeActual(Subscriber s) { Nono np; try { - np = ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null Nono"); + np = Objects.requireNonNull(supplier.get(), "The supplier returned a null Nono"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoErrorSupplier.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoErrorSupplier.java index 35f7b802..ffef6467 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoErrorSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoErrorSupplier.java @@ -16,11 +16,12 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; + import org.reactivestreams.Subscriber; 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; /** @@ -38,7 +39,7 @@ final class NonoErrorSupplier extends Nono implements Supplier { protected void subscribeActual(Subscriber s) { Throwable ex; try { - ex = ObjectHelper.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); + ex = Objects.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); } catch (Throwable e) { Exceptions.throwIfFatal(e); ex = e; @@ -51,7 +52,7 @@ protected void subscribeActual(Subscriber s) { public Void get() throws Throwable { Throwable ex; try { - ex = ObjectHelper.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); + ex = Objects.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); } catch (Throwable e) { Exceptions.throwIfFatal(e); ex = e; diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFlatMapSignal.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFlatMapSignal.java index ca3ca176..3dd02c45 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFlatMapSignal.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoFlatMapSignal.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -23,7 +24,6 @@ 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.SubscriptionHelper; /** @@ -48,7 +48,7 @@ final class NonoFlatMapSignal extends Flowable { @Override protected void subscribeActual(Subscriber s) { - source.subscribe(new FlatMapSignalSubscriber(s, onErrorMapper, onCompleteMapper)); + source.subscribe(new FlatMapSignalSubscriber<>(s, onErrorMapper, onCompleteMapper)); } static final class FlatMapSignalSubscriber extends AtomicReference @@ -104,7 +104,7 @@ public void onNext(Void t) { public void onError(Throwable t) { Publisher p; try { - p = ObjectHelper.requireNonNull(onErrorMapper.apply(t), "The onErrorMapper returned a null Nono"); + p = Objects.requireNonNull(onErrorMapper.apply(t), "The onErrorMapper returned a null Nono"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); @@ -118,7 +118,7 @@ public void onError(Throwable t) { public void onComplete() { Publisher p; try { - p = ObjectHelper.requireNonNull(onCompleteMapper.get(), "The onCompleteMapper returned a null Nono"); + p = Objects.requireNonNull(onCompleteMapper.get(), "The onCompleteMapper returned a null Nono"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLift.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLift.java index 8a40e06e..9662be59 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLift.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoLift.java @@ -16,11 +16,12 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; + import org.reactivestreams.Subscriber; 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.EmptySubscription; /** @@ -42,7 +43,7 @@ protected void subscribeActual(Subscriber s) { Subscriber z; try { - z = ObjectHelper.requireNonNull(lifter.apply(s), "The lifter returned a null Subscriber"); + z = Objects.requireNonNull(lifter.apply(s), "The lifter returned a null Subscriber"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMapError.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMapError.java index 7a9db599..a85df00a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMapError.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMapError.java @@ -16,11 +16,12 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; + import org.reactivestreams.Subscriber; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Map an upstream error into another Throwable. @@ -54,7 +55,7 @@ static final class MapErrorSubscriber extends BasicNonoSubscriber { public void onError(Throwable t) { Throwable ex; try { - ex = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Throwable"); + ex = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Throwable"); } catch (Throwable exc) { Exceptions.throwIfFatal(exc); ex = new CompositeException(t, exc); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeIterable.java index 6ee6020e..724cc004 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoMergeIterable.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.basetypes; -import java.util.Iterator; +import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import org.reactivestreams.Subscriber; @@ -24,7 +24,6 @@ import hu.akarnokd.rxjava3.basetypes.NonoMergeArray.*; import hu.akarnokd.rxjava3.util.CompositeSubscription; import io.reactivex.rxjava3.exceptions.Exceptions; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.AtomicThrowable; @@ -50,7 +49,7 @@ protected void subscribeActual(Subscriber s) { Iterator it; try { - it = ObjectHelper.requireNonNull(sources.iterator(), "The source Iterable returned a null Iterator"); + it = Objects.requireNonNull(sources.iterator(), "The source Iterable returned a null Iterator"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); @@ -154,7 +153,7 @@ void subscribe(int n) { try { hasNext = srcs.hasNext(); if (hasNext) { - np = ObjectHelper.requireNonNull(srcs.next(), "The iterator returned a null Nono"); + np = Objects.requireNonNull(srcs.next(), "The iterator returned a null Nono"); } } catch (Throwable ex) { Exceptions.throwIfFatal(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoProcessor.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoProcessor.java index 2b582f15..eb5193ba 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoProcessor.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoProcessor.java @@ -50,7 +50,7 @@ public static NonoProcessor create() { } NonoProcessor() { - subscribers = new AtomicReference(EMPTY); + subscribers = new AtomicReference<>(EMPTY); once = new AtomicBoolean(); } diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeat.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeat.java index 2eadfeda..614a7980 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeat.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeat.java @@ -62,7 +62,7 @@ abstract static class RedoSubscriber extends BasicNonoIntQueueSubscription this.downstream = downstream; this.times = times; this.source = source; - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatUntil.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatUntil.java index 5d0dfea2..22c648c7 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatUntil.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatUntil.java @@ -65,7 +65,7 @@ static final class RepeatUntilSubscriber extends BasicNonoIntQueueSubscription this.downstream = downstream; this.stop = stop; this.source = source; - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatWhen.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatWhen.java index c9ebc5f2..c6bf51d6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatWhen.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRepeatWhen.java @@ -92,7 +92,7 @@ static final class RepeatWhenMainSubscriber extends BasicNonoIntQueueSubscriptio RepeatWhenMainSubscriber(Subscriber downstream, FlowableProcessor processor, Nono source) { this.downstream = downstream; - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); this.inner = new RedoInnerSubscriber(this); this.once = new AtomicBoolean(); this.processor = processor; diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhen.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhen.java index 3133cbfe..8e4dbf44 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhen.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhen.java @@ -84,7 +84,7 @@ static final class RetryWhenMainSubscriber extends BasicNonoIntQueueSubscription RetryWhenMainSubscriber(Subscriber downstream, FlowableProcessor processor, Nono source) { this.downstream = downstream; - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); this.inner = new RedoInnerSubscriber(this); this.once = new AtomicBoolean(); this.processor = processor; diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhile.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhile.java index b33b0b73..290f49ed 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhile.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoRetryWhile.java @@ -65,7 +65,7 @@ static final class RetryUntilSubscriber extends BasicNonoIntQueueSubscription this.downstream = downstream; this.predicate = predicate; this.source = source; - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUsing.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUsing.java index 22cd5723..ce4d6b01 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUsing.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoUsing.java @@ -16,11 +16,12 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; + import org.reactivestreams.*; 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; @@ -62,7 +63,7 @@ protected void subscribeActual(Subscriber s) { Nono np; try { - np = ObjectHelper.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null Nono"); + np = Objects.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null Nono"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); if (eager) { @@ -86,7 +87,7 @@ protected void subscribeActual(Subscriber s) { return; } - np.subscribe(new UsingSubscriber(s, resource, disposer, eager)); + np.subscribe(new UsingSubscriber<>(s, resource, disposer, eager)); } static final class UsingSubscriber extends BasicNonoIntQueueSubscription diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/Perhaps.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/Perhaps.java index f2b2e3b1..b83597bc 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/Perhaps.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/Perhaps.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; import java.util.concurrent.*; import org.reactivestreams.*; @@ -24,7 +25,7 @@ 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.functions.Functions; import io.reactivex.rxjava3.internal.subscribers.LambdaSubscriber; import io.reactivex.rxjava3.internal.util.ExceptionHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -94,8 +95,8 @@ protected static Perhaps onAssembly(Perhaps source) { * @return th new Perhaps instance */ public static Perhaps create(MaybeOnSubscribe onCreate) { - ObjectHelper.requireNonNull(onCreate, "onCreate is null"); - return onAssembly(new PerhapsCreate(onCreate)); + Objects.requireNonNull(onCreate, "onCreate is null"); + return onAssembly(new PerhapsCreate<>(onCreate)); } /** @@ -105,8 +106,8 @@ public static Perhaps create(MaybeOnSubscribe onCreate) { * @return the new Perhaps instance */ public static Perhaps just(T item) { - ObjectHelper.requireNonNull(item, "item is null"); - return onAssembly(new PerhapsJust(item)); + Objects.requireNonNull(item, "item is null"); + return onAssembly(new PerhapsJust<>(item)); } /** @@ -125,7 +126,7 @@ public static Perhaps empty() { * @return the new Perhaps instance */ public static Perhaps error(Throwable error) { - ObjectHelper.requireNonNull(error, "error is null"); + Objects.requireNonNull(error, "error is null"); return onAssembly(new PerhapsError(error)); } @@ -138,7 +139,7 @@ public static Perhaps error(Throwable error) { * @return the new Perhaps instance */ public static Perhaps error(Supplier errorSupplier) { - ObjectHelper.requireNonNull(errorSupplier, "errorSupplier is null"); + Objects.requireNonNull(errorSupplier, "errorSupplier is null"); return onAssembly(new PerhapsErrorSupplier(errorSupplier)); } @@ -159,8 +160,8 @@ public static Perhaps never() { * @return the new Perhaps instance */ public static Perhaps fromCallable(Callable callable) { - ObjectHelper.requireNonNull(callable, "callable is null"); - return onAssembly(new PerhapsFromCallable(callable)); + Objects.requireNonNull(callable, "callable is null"); + return onAssembly(new PerhapsFromCallable<>(callable)); } /** @@ -170,7 +171,7 @@ public static Perhaps fromCallable(Callable callable) { * @return the new Perhaps instance */ public static Perhaps fromAction(Action action) { - ObjectHelper.requireNonNull(action, "action is null"); + Objects.requireNonNull(action, "action is null"); return onAssembly(new PerhapsFromAction(action)); } @@ -183,7 +184,7 @@ public static Perhaps fromAction(Action action) { * @return the new Perhaps instance */ public static Perhaps fromFuture(Future future) { - ObjectHelper.requireNonNull(future, "future is null"); + Objects.requireNonNull(future, "future is null"); return onAssembly(new PerhapsFromFuture(future, 0, null)); } @@ -199,8 +200,8 @@ public static Perhaps fromFuture(Future future) { * @return the new Perhaps instance */ public static Perhaps fromFuture(Future future, long timeout, TimeUnit unit) { - ObjectHelper.requireNonNull(future, "future is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(future, "future is null"); + Objects.requireNonNull(unit, "unit is null"); return onAssembly(new PerhapsFromFuture(future, timeout, unit)); } @@ -212,8 +213,8 @@ public static Perhaps fromFuture(Future future, long timeout * @return the new Perhaps instance */ public static Perhaps fromPublisher(Publisher source) { - ObjectHelper.requireNonNull(source, "source is null"); - return onAssembly(new PerhapsFromPublisher(source)); + Objects.requireNonNull(source, "source is null"); + return onAssembly(new PerhapsFromPublisher<>(source)); } /** @@ -223,8 +224,8 @@ public static Perhaps fromPublisher(Publisher source) { * @return the new Perhaps instance */ public static Perhaps fromSingle(SingleSource source) { - ObjectHelper.requireNonNull(source, "source is null"); - return onAssembly(new PerhapsFromSingle(source)); + Objects.requireNonNull(source, "source is null"); + return onAssembly(new PerhapsFromSingle<>(source)); } /** @@ -234,8 +235,8 @@ public static Perhaps fromSingle(SingleSource source) { * @return the new Perhaps instance */ public static Perhaps fromMaybe(MaybeSource source) { - ObjectHelper.requireNonNull(source, "source is null"); - return onAssembly(new PerhapsFromMaybe(source)); + Objects.requireNonNull(source, "source is null"); + return onAssembly(new PerhapsFromMaybe<>(source)); } /** @@ -245,7 +246,7 @@ public static Perhaps fromMaybe(MaybeSource source) { * @return the new Perhaps instance */ public static Perhaps fromCompletable(CompletableSource source) { - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); return onAssembly(new PerhapsFromCompletable(source)); } @@ -259,8 +260,8 @@ public static Perhaps fromCompletable(CompletableSource source) { * @return the new Perhaps instance */ public static Perhaps defer(Supplier> supplier) { - ObjectHelper.requireNonNull(supplier, "supplier is null"); - return onAssembly(new PerhapsDefer(supplier)); + Objects.requireNonNull(supplier, "supplier is null"); + return onAssembly(new PerhapsDefer<>(supplier)); } /** @@ -270,8 +271,8 @@ public static Perhaps defer(Supplier> supp * @return the new Perhaps instance */ public static Perhaps amb(Iterable> sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); - return onAssembly(new PerhapsAmbIterable(sources)); + Objects.requireNonNull(sources, "sources is null"); + return onAssembly(new PerhapsAmbIterable<>(sources)); } /** @@ -280,9 +281,10 @@ public static Perhaps amb(Iterable> source * @param sources the array of Perhaps sources * @return the new Perhaps instance */ + @SafeVarargs public static Perhaps ambArray(Perhaps... sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); - return onAssembly(new PerhapsAmbArray(sources)); + Objects.requireNonNull(sources, "sources is null"); + return onAssembly(new PerhapsAmbArray<>(sources)); } /** @@ -322,6 +324,7 @@ public static Flowable concat(Publisher> s * @param sources the sequence of sources * @return the new Flowable instance */ + @SafeVarargs public static Flowable concatArray(Perhaps... sources) { return Flowable.concatArray(sources); } @@ -381,6 +384,7 @@ public static Flowable concatDelayError(Publisher Flowable concatArrayDelayError(Perhaps... sources) { return Flowable.concatArrayDelayError(sources); } @@ -433,6 +437,7 @@ public static Flowable merge(Publisher> so * @param sources the sequence of sources * @return the new Flowable instance */ + @SafeVarargs public static Flowable mergeArray(Perhaps... sources) { return Flowable.mergeArray(sources); } @@ -444,6 +449,7 @@ public static Flowable mergeArray(Perhaps... sources) { * @param maxConcurrency the maximum number of active subscriptions * @return the new Flowable instance */ + @SafeVarargs public static Flowable mergeArray(int maxConcurrency, Perhaps... sources) { return Flowable.mergeArray(maxConcurrency, 1, sources); } @@ -501,6 +507,7 @@ public static Flowable mergeDelayError(Publisher Flowable mergeArrayDelayError(Perhaps... sources) { return Flowable.mergeArrayDelayError(sources); } @@ -513,6 +520,7 @@ public static Flowable mergeArrayDelayError(Perhaps... sourc * @param maxConcurrency the maximum number of active subscriptions * @return the new Flowable instance */ + @SafeVarargs public static Flowable mergeArrayDelayError(int maxConcurrency, Perhaps... sources) { return Flowable.mergeArrayDelayError(maxConcurrency, 1, sources); } @@ -537,8 +545,8 @@ public static Perhaps timer(long delay, TimeUnit unit) { * @return the new Perhaps instance */ public static Perhaps timer(long delay, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return onAssembly(new PerhapsTimer(delay, unit, scheduler)); } @@ -577,10 +585,10 @@ public static Perhaps using(Supplier resourceSupplier, public static Perhaps using(Supplier resourceSupplier, Function> sourceSupplier, Consumer disposer, boolean eager) { - ObjectHelper.requireNonNull(resourceSupplier, "resourceSupplier is null"); - ObjectHelper.requireNonNull(sourceSupplier, "sourceSupplier is null"); - ObjectHelper.requireNonNull(disposer, "disposer is null"); - return onAssembly(new PerhapsUsing(resourceSupplier, sourceSupplier, disposer, eager)); + Objects.requireNonNull(resourceSupplier, "resourceSupplier is null"); + Objects.requireNonNull(sourceSupplier, "sourceSupplier is null"); + Objects.requireNonNull(disposer, "disposer is null"); + return onAssembly(new PerhapsUsing<>(resourceSupplier, sourceSupplier, disposer, eager)); } /** @@ -593,8 +601,8 @@ public static Perhaps using(Supplier resourceSupplier, * @return the new Perhaps instance */ public static Perhaps zip(Iterable> sources, Function zipper) { - ObjectHelper.requireNonNull(sources, "sources is null"); - ObjectHelper.requireNonNull(zipper, "zipper is null"); + Objects.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(zipper, "zipper is null"); return onAssembly(new PerhapsZipIterable(sources, zipper)); } @@ -607,9 +615,10 @@ public static Perhaps zip(Iterable> sou * @param zipper the function takin in an array of values and returns a Perhaps value * @return the new Perhaps instance */ + @SafeVarargs public static Perhaps zipArray(Function zipper, Perhaps... sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); - ObjectHelper.requireNonNull(zipper, "zipper is null"); + Objects.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(zipper, "zipper is null"); return onAssembly(new PerhapsZipArray(sources, zipper)); } @@ -623,7 +632,6 @@ public static Perhaps zipArray(Function * @param other the other Perhaps instance * @return the new Perhaps instance */ - @SuppressWarnings("unchecked") public final Perhaps ambWith(Perhaps other) { return ambArray(this, other); } @@ -636,8 +644,8 @@ public final Perhaps ambWith(Perhaps other) { * @return the new Perhaps instance */ public final Perhaps andThen(Nono other) { - ObjectHelper.requireNonNull(other, "other is null"); - return onAssembly(new PerhapsAndThenNono(this, other)); + Objects.requireNonNull(other, "other is null"); + return onAssembly(new PerhapsAndThenNono<>(this, other)); } /** @@ -647,7 +655,7 @@ public final Perhaps andThen(Nono other) { * @return the new Flowable instance */ public final Flowable andThen(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return Flowable.concat(this, other); } @@ -658,7 +666,7 @@ public final Flowable andThen(Publisher other) { * @return the new Flowable instance */ public final Flowable concatWith(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return Flowable.concat(this, other); } @@ -669,7 +677,7 @@ public final Flowable concatWith(Publisher other) { * @return the new Flowable instance */ public final Flowable mergeWith(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return Flowable.merge(this, other); } @@ -683,10 +691,9 @@ public final Flowable mergeWith(Publisher other) { * return a value to be emitted * @return the new Perhaps instance */ - @SuppressWarnings("unchecked") public final Perhaps zipWith(Perhaps other, BiFunction zipper) { - ObjectHelper.requireNonNull(other, "other is null"); - ObjectHelper.requireNonNull(zipper, "zipper is null"); + Objects.requireNonNull(other, "other is null"); + Objects.requireNonNull(zipper, "zipper is null"); return zipArray(Functions.toFunction(zipper), this, other); } @@ -699,7 +706,7 @@ public final Perhaps zipWith(Perhaps other, BiFunction Perhaps map(Function mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return onAssembly(new PerhapsMap(this, mapper)); } @@ -710,8 +717,8 @@ public final Perhaps map(Function mapper) { * @return the new Perhaps instance */ public final Perhaps mapError(Function errorMapper) { - ObjectHelper.requireNonNull(errorMapper, "errorMapper is null"); - return onAssembly(new PerhapsMapError(this, errorMapper)); + Objects.requireNonNull(errorMapper, "errorMapper is null"); + return onAssembly(new PerhapsMapError<>(this, errorMapper)); } /** @@ -722,8 +729,8 @@ public final Perhaps mapError(Function filter(Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); - return onAssembly(new PerhapsFilter(this, predicate)); + Objects.requireNonNull(predicate, "predicate is null"); + return onAssembly(new PerhapsFilter<>(this, predicate)); } /** @@ -742,7 +749,7 @@ public final Nono ignoreElement() { * @return the new Perhaps instance */ public final Perhaps hide() { - return onAssembly(new PerhapsHide(this)); + return onAssembly(new PerhapsHide<>(this)); } /** @@ -754,8 +761,8 @@ public final Perhaps hide() { * @return the new Perhaps instance */ public final Perhaps flatMap(Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); - return onAssembly(new PerhapsFlatMap(this, mapper)); + Objects.requireNonNull(mapper, "mapper is null"); + return onAssembly(new PerhapsFlatMap<>(this, mapper)); } /** @@ -773,10 +780,10 @@ public final Perhaps flatMap(Function Perhaps flatMap(Function> onSuccessMapper, Function> onErrorMapper, Supplier> onCompleteMapper) { - ObjectHelper.requireNonNull(onSuccessMapper, "onSuccessMapper is null"); - ObjectHelper.requireNonNull(onErrorMapper, "onErrorMapper is null"); - ObjectHelper.requireNonNull(onCompleteMapper, "onCompleteMapper is null"); - return onAssembly(new PerhapsFlatMapSignal(this, onSuccessMapper, onErrorMapper, onCompleteMapper)); + Objects.requireNonNull(onSuccessMapper, "onSuccessMapper is null"); + Objects.requireNonNull(onErrorMapper, "onErrorMapper is null"); + Objects.requireNonNull(onCompleteMapper, "onCompleteMapper is null"); + return onAssembly(new PerhapsFlatMapSignal<>(this, onSuccessMapper, onErrorMapper, onCompleteMapper)); } /** @@ -787,8 +794,8 @@ public final Perhaps flatMap(Function Flowable flatMapPublisher(Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); - return RxJavaPlugins.onAssembly(new PerhapsFlatMapPublisher(this, mapper)); + Objects.requireNonNull(mapper, "mapper is null"); + return RxJavaPlugins.onAssembly(new PerhapsFlatMapPublisher<>(this, mapper)); } /** @@ -796,7 +803,7 @@ public final Flowable flatMapPublisher(Function onErrorComplete() { - return onAssembly(new PerhapsOnErrorReturnItem(this, null)); + return onAssembly(new PerhapsOnErrorReturnItem<>(this, null)); } /** @@ -806,8 +813,8 @@ public final Perhaps onErrorComplete() { * @return the new Perhaps instance */ public final Perhaps onErrorReturnItem(T item) { - ObjectHelper.requireNonNull(item, "item is null"); - return onAssembly(new PerhapsOnErrorReturnItem(this, item)); + Objects.requireNonNull(item, "item is null"); + return onAssembly(new PerhapsOnErrorReturnItem<>(this, item)); } /** @@ -817,8 +824,8 @@ public final Perhaps onErrorReturnItem(T item) { * @return the new Perhaps instance */ public final Perhaps onErrorResumeWith(Perhaps fallback) { - ObjectHelper.requireNonNull(fallback, "fallback is null"); - return onAssembly(new PerhapsOnErrorResumeWith(this, fallback)); + Objects.requireNonNull(fallback, "fallback is null"); + return onAssembly(new PerhapsOnErrorResumeWith<>(this, fallback)); } /** @@ -830,8 +837,8 @@ public final Perhaps onErrorResumeWith(Perhaps fallback) { * @return the new Perhaps instance */ public final Perhaps onErrorResumeNext(Function> fallbackSupplier) { - ObjectHelper.requireNonNull(fallbackSupplier, "fallbackSupplier is null"); - return onAssembly(new PerhapsOnErrorResumeNext(this, fallbackSupplier)); + Objects.requireNonNull(fallbackSupplier, "fallbackSupplier is null"); + return onAssembly(new PerhapsOnErrorResumeNext<>(this, fallbackSupplier)); } /** @@ -889,8 +896,8 @@ public final Perhaps timeout(long timeout, TimeUnit unit, Scheduler scheduler * @return the new Perhaps instance */ public final Perhaps timeout(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); - return onAssembly(new PerhapsTimeout(this, other, null)); + Objects.requireNonNull(other, "other is null"); + return onAssembly(new PerhapsTimeout<>(this, other, null)); } /** @@ -901,9 +908,9 @@ public final Perhaps timeout(Publisher other) { * @return the new Perhaps instance */ public final Perhaps timeout(Publisher other, Perhaps fallback) { - ObjectHelper.requireNonNull(other, "other is null"); - ObjectHelper.requireNonNull(fallback, "fallback is null"); - return onAssembly(new PerhapsTimeout(this, other, fallback)); + Objects.requireNonNull(other, "other is null"); + Objects.requireNonNull(fallback, "fallback is null"); + return onAssembly(new PerhapsTimeout<>(this, other, fallback)); } /** @@ -912,8 +919,8 @@ public final Perhaps timeout(Publisher other, Perhaps fallbac * @return the new Perhaps instance */ public final Perhaps defaultIfEmpty(T item) { - ObjectHelper.requireNonNull(item, "item is null"); - return onAssembly(new PerhapsDefaultIfEmpty(this, item)); + Objects.requireNonNull(item, "item is null"); + return onAssembly(new PerhapsDefaultIfEmpty<>(this, item)); } /** @@ -922,8 +929,8 @@ public final Perhaps defaultIfEmpty(T item) { * @return the new Perhaps instance */ public final Perhaps switchIfEmpty(Perhaps other) { - ObjectHelper.requireNonNull(other, "other is null"); - return onAssembly(new PerhapsSwitchIfEmpty(this, other)); + Objects.requireNonNull(other, "other is null"); + return onAssembly(new PerhapsSwitchIfEmpty<>(this, other)); } /** @@ -971,7 +978,7 @@ public final Flowable repeatWhen(Function, ? extends * @return the new Perhaps instance */ public final Perhaps retry() { - return onAssembly(new PerhapsRetry(this, Long.MAX_VALUE)); + return onAssembly(new PerhapsRetry<>(this, Long.MAX_VALUE)); } /** @@ -983,7 +990,7 @@ public final Perhaps retry(long times) { if (times < 0L) { throw new IllegalArgumentException("times >= 0 required but it was " + times); } - return onAssembly(new PerhapsRetry(this, times)); + return onAssembly(new PerhapsRetry<>(this, times)); } /** @@ -994,8 +1001,8 @@ public final Perhaps retry(long times) { * @return the new Perhaps instance */ public final Perhaps retry(Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); - return onAssembly(new PerhapsRetryWhile(this, predicate)); + Objects.requireNonNull(predicate, "predicate is null"); + return onAssembly(new PerhapsRetryWhile<>(this, predicate)); } /** @@ -1007,8 +1014,8 @@ public final Perhaps retry(Predicate predicate) { * @return the new Perhaps instance */ public final Perhaps retryWhen(Function, ? extends Publisher> handler) { - ObjectHelper.requireNonNull(handler, "handler is null"); - return onAssembly(new PerhapsRetryWhen(this, handler)); + Objects.requireNonNull(handler, "handler is null"); + return onAssembly(new PerhapsRetryWhen<>(this, handler)); } /** @@ -1018,8 +1025,8 @@ public final Perhaps retryWhen(Function, ? extend * @return the new Perhaps instance */ public final Perhaps subscribeOn(Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - return onAssembly(new PerhapsSubscribeOn(this, scheduler)); + Objects.requireNonNull(scheduler, "scheduler is null"); + return onAssembly(new PerhapsSubscribeOn<>(this, scheduler)); } /** @@ -1028,8 +1035,8 @@ public final Perhaps subscribeOn(Scheduler scheduler) { * @return the new Perhaps instance */ public final Perhaps observeOn(Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - return onAssembly(new PerhapsObserveOn(this, scheduler)); + Objects.requireNonNull(scheduler, "scheduler is null"); + return onAssembly(new PerhapsObserveOn<>(this, scheduler)); } /** @@ -1040,8 +1047,8 @@ public final Perhaps observeOn(Scheduler scheduler) { * @return the new Perhaps instance */ public final Perhaps unsubscribeOn(Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - return onAssembly(new PerhapsUnsubscribeOn(this, scheduler)); + Objects.requireNonNull(scheduler, "scheduler is null"); + return onAssembly(new PerhapsUnsubscribeOn<>(this, scheduler)); } /** @@ -1050,8 +1057,8 @@ public final Perhaps unsubscribeOn(Scheduler scheduler) { * @return the new Perhaps instance */ public final Perhaps doOnSubscribe(Consumer onSubscribe) { - ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null"); - return onAssembly(new PerhapsDoOnLifecycle(this, + Objects.requireNonNull(onSubscribe, "onSubscribe is null"); + return onAssembly(new PerhapsDoOnLifecycle<>(this, Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -1069,8 +1076,8 @@ public final Perhaps doOnSubscribe(Consumer onSubscribe * @return the new Perhaps instance */ public final Perhaps doOnRequest(LongConsumer onRequest) { - ObjectHelper.requireNonNull(onRequest, "onRequest is null"); - return onAssembly(new PerhapsDoOnLifecycle(this, + Objects.requireNonNull(onRequest, "onRequest is null"); + return onAssembly(new PerhapsDoOnLifecycle<>(this, Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -1088,8 +1095,8 @@ public final Perhaps doOnRequest(LongConsumer onRequest) { * @return the new Perhaps instance */ public final Perhaps doOnCancel(Action onCancel) { - ObjectHelper.requireNonNull(onCancel, "onCancel is null"); - return onAssembly(new PerhapsDoOnLifecycle(this, + Objects.requireNonNull(onCancel, "onCancel is null"); + return onAssembly(new PerhapsDoOnLifecycle<>(this, Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -1108,8 +1115,8 @@ public final Perhaps doOnCancel(Action onCancel) { * @return the new Perhaps instance */ public final Perhaps doOnNext(Consumer onNext) { - ObjectHelper.requireNonNull(onNext, "onNext is null"); - return onAssembly(new PerhapsDoOnLifecycle(this, + Objects.requireNonNull(onNext, "onNext is null"); + return onAssembly(new PerhapsDoOnLifecycle<>(this, onNext, Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -1128,8 +1135,8 @@ public final Perhaps doOnNext(Consumer onNext) { * @return the new Perhaps instance */ public final Perhaps doAfterNext(Consumer onAfterNext) { - ObjectHelper.requireNonNull(onAfterNext, "onAfterNext is null"); - return onAssembly(new PerhapsDoOnLifecycle(this, + Objects.requireNonNull(onAfterNext, "onAfterNext is null"); + return onAssembly(new PerhapsDoOnLifecycle<>(this, Functions.emptyConsumer(), onAfterNext, Functions.emptyConsumer(), @@ -1148,8 +1155,8 @@ public final Perhaps doAfterNext(Consumer onAfterNext) { * @return the new Perhaps instance */ public final Perhaps doOnError(Consumer onError) { - ObjectHelper.requireNonNull(onError, "onError is null"); - return onAssembly(new PerhapsDoOnLifecycle(this, + Objects.requireNonNull(onError, "onError is null"); + return onAssembly(new PerhapsDoOnLifecycle<>(this, Functions.emptyConsumer(), Functions.emptyConsumer(), onError, @@ -1168,8 +1175,8 @@ public final Perhaps doOnError(Consumer onError) { * @return the new Perhaps instance */ public final Perhaps doOnComplete(Action onComplete) { - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); - return onAssembly(new PerhapsDoOnLifecycle(this, + Objects.requireNonNull(onComplete, "onComplete is null"); + return onAssembly(new PerhapsDoOnLifecycle<>(this, Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -1188,8 +1195,8 @@ public final Perhaps doOnComplete(Action onComplete) { * @return the new Perhaps instance */ public final Perhaps doAfterTerminate(Action onAfterTerminate) { - ObjectHelper.requireNonNull(onAfterTerminate, "onAfterTerminate is null"); - return onAssembly(new PerhapsDoOnLifecycle(this, + Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null"); + return onAssembly(new PerhapsDoOnLifecycle<>(this, Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -1208,8 +1215,8 @@ public final Perhaps doAfterTerminate(Action onAfterTerminate) { * @return the new Perhaps instance */ public final Perhaps doFinally(Action onFinally) { - ObjectHelper.requireNonNull(onFinally, "onFinally is null"); - return onAssembly(new PerhapsDoFinally(this, onFinally)); + Objects.requireNonNull(onFinally, "onFinally is null"); + return onAssembly(new PerhapsDoFinally<>(this, onFinally)); } /** @@ -1242,8 +1249,8 @@ public final Perhaps delay(long delay, TimeUnit unit, Scheduler scheduler) { * @return the new Perhaps instance */ public final Perhaps delay(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); - return onAssembly(new PerhapsDelayPublisher(this, other)); + Objects.requireNonNull(other, "other is null"); + return onAssembly(new PerhapsDelayPublisher<>(this, other)); } /** @@ -1276,8 +1283,8 @@ public final Perhaps delaySubscription(long delay, TimeUnit unit, Scheduler s * @return the new Perhaps instance */ public final Perhaps delaySubscription(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); - return onAssembly(new PerhapsDelaySubscription(this, other)); + Objects.requireNonNull(other, "other is null"); + return onAssembly(new PerhapsDelaySubscription<>(this, other)); } /** @@ -1288,8 +1295,8 @@ public final Perhaps delaySubscription(Publisher other) { * @return the new Perhaps type */ public final Perhaps lift(Function, Subscriber> onLift) { - ObjectHelper.requireNonNull(onLift, "onLift is null"); - return onAssembly(new PerhapsLift(this, onLift)); + Objects.requireNonNull(onLift, "onLift is null"); + return onAssembly(new PerhapsLift<>(this, onLift)); } /** @@ -1323,8 +1330,8 @@ public final Perhaps compose(Function, ? extends Perha * @return the new Perhaps instance */ public final Perhaps takeUntil(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); - return onAssembly(new PerhapsTakeUntil(this, other)); + Objects.requireNonNull(other, "other is null"); + return onAssembly(new PerhapsTakeUntil<>(this, other)); } /** @@ -1332,7 +1339,7 @@ public final Perhaps takeUntil(Publisher other) { * @return the new Flowable instance */ public final Flowable toFlowable() { - return RxJavaPlugins.onAssembly(new PerhapsToFlowable(this)); + return RxJavaPlugins.onAssembly(new PerhapsToFlowable<>(this)); } /** @@ -1340,7 +1347,7 @@ public final Flowable toFlowable() { * @return the new Observable instance */ public final Observable toObservable() { - return RxJavaPlugins.onAssembly(new PerhapsToObservable(this)); + return RxJavaPlugins.onAssembly(new PerhapsToObservable<>(this)); } /** @@ -1348,7 +1355,7 @@ public final Observable toObservable() { * @return the new Maybe instance */ public final Maybe toMaybe() { - return RxJavaPlugins.onAssembly(new PerhapsToMaybe(this)); + return RxJavaPlugins.onAssembly(new PerhapsToMaybe<>(this)); } /** @@ -1359,7 +1366,7 @@ public final Maybe toMaybe() { * @since 0.14.1 */ public final Perhaps cache() { - return onAssembly(new PerhapsCache(this)); + return onAssembly(new PerhapsCache<>(this)); } // ---------------------------------------------------- @@ -1368,7 +1375,7 @@ public final Perhaps cache() { @Override public final void subscribe(Subscriber s) { - ObjectHelper.requireNonNull(s, "s is null"); + Objects.requireNonNull(s, "s is null"); try { subscribeActual(s); } catch (NullPointerException ex) { @@ -1433,7 +1440,7 @@ public final Disposable subscribe(Consumer onNext, Consumer onNext, Consumer onError, Action onComplete) { - LambdaSubscriber s = new LambdaSubscriber(onNext, onError, onComplete, Functions.REQUEST_MAX); + LambdaSubscriber s = new LambdaSubscriber<>(onNext, onError, onComplete, Functions.REQUEST_MAX); subscribe(s); return s; } @@ -1471,10 +1478,10 @@ public final void blockingSubscribe(Consumer onNext, Consumer onNext, Consumer onError, Action onComplete) { - ObjectHelper.requireNonNull(onNext, "onNext is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); - BlockingGetSubscriber s = new BlockingGetSubscriber(); + Objects.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); + BlockingGetSubscriber s = new BlockingGetSubscriber<>(); subscribe(s); s.blockingCall(onNext, onError, onComplete); } @@ -1485,7 +1492,7 @@ public final void blockingSubscribe(Consumer onNext, Consumer s = new BlockingGetSubscriber(); + BlockingGetSubscriber s = new BlockingGetSubscriber<>(); subscribe(s); return s.blockingGet(); } @@ -1499,7 +1506,7 @@ public final T blockingGet() { * @return the success value of this Perhaps */ public final T blockingGet(long timeout, TimeUnit unit) { - BlockingGetSubscriber s = new BlockingGetSubscriber(); + BlockingGetSubscriber s = new BlockingGetSubscriber<>(); subscribe(s); return s.blockingGet(timeout, unit); } @@ -1542,7 +1549,7 @@ public final TestSubscriber test(long initialRequest) { * @return the new TestSubscriber */ public final TestSubscriber test(long initialRequest, boolean cancel) { - TestSubscriber ts = new TestSubscriber(initialRequest); + TestSubscriber ts = new TestSubscriber<>(initialRequest); if (cancel) { ts.cancel(); } @@ -1556,7 +1563,7 @@ public final TestSubscriber test(long initialRequest, boolean cancel) { * @return the new Future instance */ public final Future toFuture() { - FuturePerhapsSubscriber fs = new FuturePerhapsSubscriber(); + FuturePerhapsSubscriber fs = new FuturePerhapsSubscriber<>(); subscribe(fs); return fs; } diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbArray.java index fc3b62e0..7ae4f7b8 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbArray.java @@ -39,7 +39,7 @@ final class PerhapsAmbArray extends Perhaps { @Override protected void subscribeActual(Subscriber s) { - AmbSubscriber parent = new AmbSubscriber(s); + AmbSubscriber parent = new AmbSubscriber<>(s); s.onSubscribe(parent); for (Perhaps source : sources) { diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbIterable.java index 693a45a1..bf9a100d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsAmbIterable.java @@ -16,11 +16,12 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; + import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.basetypes.SoloAmbArray.AmbSubscriber; import io.reactivex.rxjava3.exceptions.Exceptions; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Signal the events of the first source that signals. @@ -37,12 +38,12 @@ final class PerhapsAmbIterable extends Perhaps { @Override protected void subscribeActual(Subscriber s) { - AmbSubscriber parent = new AmbSubscriber(s); + AmbSubscriber parent = new AmbSubscriber<>(s); s.onSubscribe(parent); try { for (Perhaps source : sources) { - ObjectHelper.requireNonNull(source, "One of the sources is null") + Objects.requireNonNull(source, "One of the sources is null") .subscribe(parent); } } catch (Throwable ex) { diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCache.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCache.java index 023fe2f6..87a78a80 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCache.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCache.java @@ -51,12 +51,12 @@ final class PerhapsCache extends Perhaps implements Subscriber { PerhapsCache(Perhaps source) { this.source = source; this.once = new AtomicBoolean(); - this.subscribers = new AtomicReference[]>(EMPTY); + this.subscribers = new AtomicReference<>(EMPTY); } @Override protected void subscribeActual(Subscriber s) { - CacheSubscription inner = new CacheSubscription(s, this); + CacheSubscription inner = new CacheSubscription<>(s, this); s.onSubscribe(inner); if (add(inner)) { @@ -180,7 +180,7 @@ static final class CacheSubscription extends DeferredScalarSubscription { CacheSubscription(Subscriber downstream, PerhapsCache parent) { super(downstream); - this.parent = new AtomicReference(parent); + this.parent = new AtomicReference<>(parent); } @SuppressWarnings("unchecked") diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCreate.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCreate.java index 05ea4106..23e72361 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCreate.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsCreate.java @@ -44,7 +44,7 @@ final class PerhapsCreate extends Perhaps { @Override protected void subscribeActual(Subscriber s) { - PerhapsEmitter parent = new PerhapsEmitter(s); + PerhapsEmitter parent = new PerhapsEmitter<>(s); s.onSubscribe(parent); try { @@ -63,7 +63,7 @@ static final class PerhapsEmitter extends DeferredScalarSubscription imple PerhapsEmitter(Subscriber downstream) { super(downstream); - this.resource = new AtomicReference(); + this.resource = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefaultIfEmpty.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefaultIfEmpty.java index 23807efb..a34614b9 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefaultIfEmpty.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefaultIfEmpty.java @@ -38,7 +38,7 @@ final class PerhapsDefaultIfEmpty extends Perhaps { @Override protected void subscribeActual(Subscriber s) { - source.subscribe(new OnErrorReturnItemSubscriber(s, item)); + source.subscribe(new OnErrorReturnItemSubscriber<>(s, item)); } static final class OnErrorReturnItemSubscriber extends DeferredScalarSubscription diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefer.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefer.java index 7c708fdd..985687c4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefer.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDefer.java @@ -16,11 +16,12 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; + import org.reactivestreams.Subscriber; 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; /** @@ -41,7 +42,7 @@ protected void subscribeActual(Subscriber s) { Perhaps sp; try { - sp = ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null Solo"); + sp = Objects.requireNonNull(supplier.get(), "The supplier returned a null Solo"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelaySubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelaySubscription.java index 52910603..f511961a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelaySubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDelaySubscription.java @@ -41,7 +41,7 @@ final class PerhapsDelaySubscription extends Perhaps { @Override protected void subscribeActual(Subscriber s) { - other.subscribe(new DelaySubscriber(s, source)); + other.subscribe(new DelaySubscriber<>(s, source)); } static final class DelaySubscriber extends DeferredScalarSubscription diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsErrorSupplier.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsErrorSupplier.java index 756a74b4..beed91f6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsErrorSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsErrorSupplier.java @@ -16,11 +16,12 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; + import org.reactivestreams.Subscriber; 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; /** @@ -41,7 +42,7 @@ protected void subscribeActual(Subscriber s) { Throwable ex; try { - ex = ObjectHelper.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); + ex = Objects.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); } catch (Throwable exc) { Exceptions.throwIfFatal(exc); ex = exc; @@ -52,6 +53,6 @@ protected void subscribeActual(Subscriber s) { @Override public T get() throws Throwable { - throw ObjectHelper.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); + throw Objects.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMap.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMap.java index f1fa620d..db012666 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMap.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMap.java @@ -16,13 +16,13 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; 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.*; /** @@ -85,7 +85,7 @@ public void onNext(T t) { Perhaps ph; try { - ph = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Perhaps"); + ph = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Perhaps"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapPublisher.java index 9bdec409..6f44ba94 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapPublisher.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -23,7 +24,6 @@ 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.subscriptions.SubscriptionHelper; /** @@ -88,7 +88,7 @@ public void onNext(T t) { Publisher ph; try { - ph = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); + ph = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapSignal.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapSignal.java index 3b3111ca..62fa67ba 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapSignal.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFlatMapSignal.java @@ -16,13 +16,13 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.*; /** @@ -103,7 +103,7 @@ public void onNext(T t) { Perhaps ph; try { - ph = ObjectHelper.requireNonNull(onSuccessMapper.apply(t), "The onSuccessMapper returned a null Perhaps"); + ph = Objects.requireNonNull(onSuccessMapper.apply(t), "The onSuccessMapper returned a null Perhaps"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); @@ -117,7 +117,7 @@ public void onNext(T t) { public void onError(Throwable t) { Perhaps ph; try { - ph = ObjectHelper.requireNonNull(onErrorMapper.apply(t), "The onErrorMapper returned a null Perhaps"); + ph = Objects.requireNonNull(onErrorMapper.apply(t), "The onErrorMapper returned a null Perhaps"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); @@ -131,7 +131,7 @@ public void onComplete() { if (!hasValue) { Perhaps ph; try { - ph = ObjectHelper.requireNonNull(onCompleteMapper.get(), "The onCompleteMapper returned a null Perhaps"); + ph = Objects.requireNonNull(onCompleteMapper.get(), "The onCompleteMapper returned a null Perhaps"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCallable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCallable.java index 2cf08c6b..fc28c4fc 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCallable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromCallable.java @@ -16,12 +16,12 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; import java.util.concurrent.Callable; import org.reactivestreams.Subscriber; import io.reactivex.rxjava3.exceptions.Exceptions; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; /** @@ -39,7 +39,7 @@ final class PerhapsFromCallable extends Perhaps implements Callable { @Override protected void subscribeActual(Subscriber s) { - DeferredScalarSubscription dss = new DeferredScalarSubscription(s); + DeferredScalarSubscription dss = new DeferredScalarSubscription<>(s); s.onSubscribe(dss); T v; @@ -61,6 +61,6 @@ protected void subscribeActual(Subscriber s) { @Override public T call() throws Exception { - return ObjectHelper.requireNonNull(callable.call(), "The callable returned a null value"); + return Objects.requireNonNull(callable.call(), "The callable returned a null value"); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromFuture.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromFuture.java index 688c2483..1dbe5e10 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromFuture.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsFromFuture.java @@ -45,7 +45,7 @@ final class PerhapsFromFuture extends Perhaps { @Override protected void subscribeActual(Subscriber s) { - DeferredScalarSubscription dss = new DeferredScalarSubscription(s); + DeferredScalarSubscription dss = new DeferredScalarSubscription<>(s); s.onSubscribe(dss); T v; diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsJust.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsJust.java index 6ed06691..fd729fd5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsJust.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsJust.java @@ -36,7 +36,7 @@ final class PerhapsJust extends Perhaps implements ScalarSupplier { @Override protected void subscribeActual(Subscriber s) { - s.onSubscribe(new ScalarSubscription(s, value)); + s.onSubscribe(new ScalarSubscription<>(s, value)); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsLift.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsLift.java index f65931da..e56d7d23 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsLift.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsLift.java @@ -16,11 +16,12 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; + import org.reactivestreams.Subscriber; 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.EmptySubscription; /** @@ -45,7 +46,7 @@ protected void subscribeActual(Subscriber s) { Subscriber parent; try { - parent = ObjectHelper.requireNonNull(onLift.apply(s), "The onLift returned a null Subscriber"); + parent = Objects.requireNonNull(onLift.apply(s), "The onLift returned a null Subscriber"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeNext.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeNext.java index 9a60d342..099f985c 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeNext.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorResumeNext.java @@ -16,13 +16,13 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -44,7 +44,7 @@ final class PerhapsOnErrorResumeNext extends Perhaps { @Override protected void subscribeActual(Subscriber s) { - source.subscribe(new OnErrorResumeNextSubscriber(s, fallbackSupplier)); + source.subscribe(new OnErrorResumeNextSubscriber<>(s, fallbackSupplier)); } static final class OnErrorResumeNextSubscriber extends DeferredScalarSubscription @@ -85,7 +85,7 @@ public void onError(Throwable t) { Perhaps ph; try { - ph = ObjectHelper.requireNonNull(fallbackSupplier.apply(t), "The fallbackSupplier returned a null Perhaps"); + ph = Objects.requireNonNull(fallbackSupplier.apply(t), "The fallbackSupplier returned a null Perhaps"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(new CompositeException(t, ex)); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorReturnItem.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorReturnItem.java index 8a3e9b15..c71a9ffc 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorReturnItem.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsOnErrorReturnItem.java @@ -38,7 +38,7 @@ final class PerhapsOnErrorReturnItem extends Perhaps { @Override protected void subscribeActual(Subscriber s) { - source.subscribe(new OnErrorReturnItemSubscriber(s, item)); + source.subscribe(new OnErrorReturnItemSubscriber<>(s, item)); } static final class OnErrorReturnItemSubscriber extends DeferredScalarSubscription diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsProcessor.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsProcessor.java index 7184e3a3..fe3032bd 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsProcessor.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsProcessor.java @@ -53,7 +53,7 @@ public final class PerhapsProcessor extends Perhaps implements Processor PerhapsProcessor create() { - return new PerhapsProcessor(); + return new PerhapsProcessor<>(); } /** @@ -61,13 +61,13 @@ public static PerhapsProcessor create() { */ @SuppressWarnings("unchecked") private PerhapsProcessor() { - subscribers = new AtomicReference[]>(EMPTY); + subscribers = new AtomicReference<>(EMPTY); once = new AtomicBoolean(); } @Override protected void subscribeActual(Subscriber s) { - InnerSubscription inner = new InnerSubscription(s, this); + InnerSubscription inner = new InnerSubscription<>(s, this); s.onSubscribe(inner); if (add(inner)) { if (inner.isCancelled()) { diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetry.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetry.java index 6d6bfdf0..88a9e5fb 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetry.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetry.java @@ -40,7 +40,7 @@ final class PerhapsRetry extends Perhaps { @Override protected void subscribeActual(Subscriber s) { - RetrySubscriber parent = new RetrySubscriber(s, times, source); + RetrySubscriber parent = new RetrySubscriber<>(s, times, source); s.onSubscribe(parent); parent.subscribeNext(); } @@ -65,7 +65,7 @@ static final class RetrySubscriber extends DeferredScalarSubscription this.times = times; this.source = source; this.wip = new AtomicInteger(); - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhen.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhen.java index bbe51aa5..c4f8366d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhen.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhen.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.basetypes; -import java.util.NoSuchElementException; +import java.util.*; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -24,7 +24,6 @@ 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.subscriptions.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; import io.reactivex.rxjava3.processors.*; @@ -52,14 +51,14 @@ protected void subscribeActual(Subscriber s) { Publisher when; try { - when = ObjectHelper.requireNonNull(handler.apply(pp), "The handler returned a null Publisher"); + when = Objects.requireNonNull(handler.apply(pp), "The handler returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); return; } - RetrySubscriber parent = new RetrySubscriber(s, pp, source); + RetrySubscriber parent = new RetrySubscriber<>(s, pp, source); s.onSubscribe(parent); when.subscribe(parent.other); @@ -91,7 +90,7 @@ static final class RetrySubscriber extends DeferredScalarSubscription this.source = source; this.other = new OtherSubscriber(); this.wip = new AtomicInteger(); - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); this.once = new AtomicBoolean(); } diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhile.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhile.java index c18a322e..309296a3 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhile.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsRetryWhile.java @@ -42,7 +42,7 @@ final class PerhapsRetryWhile extends Perhaps { @Override protected void subscribeActual(Subscriber s) { - RetrySubscriber parent = new RetrySubscriber(s, predicate, source); + RetrySubscriber parent = new RetrySubscriber<>(s, predicate, source); s.onSubscribe(parent); parent.subscribeNext(); } @@ -67,7 +67,7 @@ static final class RetrySubscriber extends DeferredScalarSubscription this.predicate = predicate; this.source = source; this.wip = new AtomicInteger(); - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSubscribeOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSubscribeOn.java index c54faa5b..62f5abb6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSubscribeOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsSubscribeOn.java @@ -43,7 +43,7 @@ final class PerhapsSubscribeOn extends Perhaps { protected void subscribeActual(Subscriber s) { Worker worker = scheduler.createWorker(); - SubscribeOnSubscriber parent = new SubscribeOnSubscriber(s, worker, source); + SubscribeOnSubscriber parent = new SubscribeOnSubscriber<>(s, worker, source); s.onSubscribe(parent); DisposableHelper.replace(parent.task, worker.schedule(parent)); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTakeUntil.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTakeUntil.java index 911c806d..386f3876 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTakeUntil.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTakeUntil.java @@ -41,7 +41,7 @@ final class PerhapsTakeUntil extends Perhaps { @Override protected void subscribeActual(Subscriber s) { - TakeUntilSubscriber parent = new TakeUntilSubscriber(s); + TakeUntilSubscriber parent = new TakeUntilSubscriber<>(s); s.onSubscribe(parent); other.subscribe(parent.other); @@ -62,7 +62,7 @@ static final class TakeUntilSubscriber extends DeferredScalarSubscription TakeUntilSubscriber(Subscriber downstream) { super(downstream); this.other = new OtherSubscriber(); - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); this.once = new AtomicBoolean(); } diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimeout.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimeout.java index d3775e97..40bd3e90 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimeout.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsTimeout.java @@ -46,7 +46,7 @@ final class PerhapsTimeout extends Perhaps { @Override protected void subscribeActual(Subscriber s) { - TimeoutSubscriber parent = new TimeoutSubscriber(s, fallback); + TimeoutSubscriber parent = new TimeoutSubscriber<>(s, fallback); s.onSubscribe(parent); other.subscribe(parent.other); @@ -70,7 +70,7 @@ static final class TimeoutSubscriber extends DeferredScalarSubscription TimeoutSubscriber(Subscriber downstream, Perhaps fallback) { super(downstream); - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); this.fallback = fallback; this.once = new AtomicBoolean(); this.other = new OtherSubscriber(); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUsing.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUsing.java index 3b53fba3..1918ef90 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUsing.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsUsing.java @@ -16,12 +16,13 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; + import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.basetypes.SoloUsing.UsingSubscriber; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -64,7 +65,7 @@ protected void subscribeActual(Subscriber s) { Perhaps np; try { - np = ObjectHelper.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null Nono"); + np = Objects.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null Nono"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); if (eager) { diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipArray.java index 6e6508a2..e11625a7 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipArray.java @@ -49,7 +49,7 @@ final class PerhapsZipArray extends Perhaps { protected void subscribeActual(Subscriber s) { Perhaps[] srcs = sources; int n = srcs.length; - ZipCoordinator parent = new ZipCoordinator(s, zipper, n); + ZipCoordinator parent = new ZipCoordinator<>(s, zipper, n); s.onSubscribe(parent); parent.subscribe(srcs, n); @@ -74,7 +74,7 @@ static final class ZipCoordinator extends DeferredScalarSubscription { this.wip = new AtomicInteger(n); this.subscribers = new ZipInnerSubscriber[n]; for (int i = 0; i < n; i++) { - subscribers[i] = new ZipInnerSubscriber(i, this); + subscribers[i] = new ZipInnerSubscriber<>(i, this); } this.values = new Object[n]; } diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipIterable.java index 5f55cf32..4b2cfb27 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsZipIterable.java @@ -63,7 +63,7 @@ protected void subscribeActual(Subscriber s) { return; } - ZipCoordinator parent = new ZipCoordinator(s, zipper, n); + ZipCoordinator parent = new ZipCoordinator<>(s, zipper, n); s.onSubscribe(parent); parent.subscribe(srcs, n); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/Solo.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/Solo.java index 2eaab780..d82af18f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/Solo.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/Solo.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; import java.util.concurrent.*; import org.reactivestreams.*; @@ -24,7 +25,7 @@ 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.functions.Functions; import io.reactivex.rxjava3.internal.subscribers.LambdaSubscriber; import io.reactivex.rxjava3.internal.util.ExceptionHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -94,8 +95,8 @@ protected static Solo onAssembly(Solo source) { * @return th new Solo instance */ public static Solo create(SingleOnSubscribe onCreate) { - ObjectHelper.requireNonNull(onCreate, "onCreate is null"); - return onAssembly(new SoloCreate(onCreate)); + Objects.requireNonNull(onCreate, "onCreate is null"); + return onAssembly(new SoloCreate<>(onCreate)); } /** @@ -105,8 +106,8 @@ public static Solo create(SingleOnSubscribe onCreate) { * @return the new Solo instance */ public static Solo just(T item) { - ObjectHelper.requireNonNull(item, "item is null"); - return onAssembly(new SoloJust(item)); + Objects.requireNonNull(item, "item is null"); + return onAssembly(new SoloJust<>(item)); } /** @@ -116,7 +117,7 @@ public static Solo just(T item) { * @return the new Solo instance */ public static Solo error(Throwable error) { - ObjectHelper.requireNonNull(error, "error is null"); + Objects.requireNonNull(error, "error is null"); return onAssembly(new SoloError(error)); } @@ -129,7 +130,7 @@ public static Solo error(Throwable error) { * @return the new Solo instance */ public static Solo error(Supplier errorSupplier) { - ObjectHelper.requireNonNull(errorSupplier, "errorSupplier is null"); + Objects.requireNonNull(errorSupplier, "errorSupplier is null"); return onAssembly(new SoloErrorSupplier(errorSupplier)); } @@ -140,8 +141,8 @@ public static Solo error(Supplier errorSupplier) { * @return the new Solo instance */ public static Solo fromCallable(Callable callable) { - ObjectHelper.requireNonNull(callable, "callable is null"); - return onAssembly(new SoloFromCallable(callable)); + Objects.requireNonNull(callable, "callable is null"); + return onAssembly(new SoloFromCallable<>(callable)); } /** @@ -161,8 +162,8 @@ public static Solo never() { * @return the new Solo instance */ public static Solo defer(Supplier> supplier) { - ObjectHelper.requireNonNull(supplier, "supplier is null"); - return onAssembly(new SoloDefer(supplier)); + Objects.requireNonNull(supplier, "supplier is null"); + return onAssembly(new SoloDefer<>(supplier)); } /** @@ -177,8 +178,8 @@ public static Solo fromPublisher(Publisher source) { if (source instanceof Solo) { return (Solo)source; } - ObjectHelper.requireNonNull(source, "source is null"); - return onAssembly(new SoloFromPublisher(source)); + Objects.requireNonNull(source, "source is null"); + return onAssembly(new SoloFromPublisher<>(source)); } /** @@ -188,8 +189,8 @@ public static Solo fromPublisher(Publisher source) { * @return the new Solo instance */ public static Solo fromSingle(SingleSource source) { - ObjectHelper.requireNonNull(source, "source is null"); - return onAssembly(new SoloFromSingle(source)); + Objects.requireNonNull(source, "source is null"); + return onAssembly(new SoloFromSingle<>(source)); } /** @@ -203,7 +204,7 @@ public static Solo fromSingle(SingleSource source) { * @since 0.14.0 */ public static Solo fromFuture(Future future) { - ObjectHelper.requireNonNull(future, "future is null"); + Objects.requireNonNull(future, "future is null"); return onAssembly(new SoloFromFuture(future, 0, null)); } @@ -221,8 +222,8 @@ public static Solo fromFuture(Future future) { * @since 0.14.0 */ public static Solo fromFuture(Future future, long timeout, TimeUnit unit) { - ObjectHelper.requireNonNull(future, "future is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(future, "future is null"); + Objects.requireNonNull(unit, "unit is null"); return onAssembly(new SoloFromFuture(future, timeout, unit)); } @@ -233,8 +234,8 @@ public static Solo fromFuture(Future future, long timeout, T * @return the new Solo instance */ public static Solo amb(Iterable> sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); - return onAssembly(new SoloAmbIterable(sources)); + Objects.requireNonNull(sources, "sources is null"); + return onAssembly(new SoloAmbIterable<>(sources)); } /** @@ -243,9 +244,10 @@ public static Solo amb(Iterable> sources) { * @param sources the array of Solo sources * @return the new Solo instance */ + @SafeVarargs public static Solo ambArray(Solo... sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); - return onAssembly(new SoloAmbArray(sources)); + Objects.requireNonNull(sources, "sources is null"); + return onAssembly(new SoloAmbArray<>(sources)); } /** @@ -285,6 +287,7 @@ public static Flowable concat(Publisher> sour * @param sources the sequence of sources * @return the new Flowable instance */ + @SafeVarargs public static Flowable concatArray(Solo... sources) { return Flowable.concatArray(sources); } @@ -344,6 +347,7 @@ public static Flowable concatDelayError(Publisher Flowable concatArrayDelayError(Solo... sources) { return Flowable.concatArrayDelayError(sources); } @@ -396,6 +400,7 @@ public static Flowable merge(Publisher> sourc * @param sources the sequence of sources * @return the new Flowable instance */ + @SafeVarargs public static Flowable mergeArray(Solo... sources) { return mergeArray(Integer.MAX_VALUE, sources); } @@ -407,6 +412,7 @@ public static Flowable mergeArray(Solo... sources) { * @param maxConcurrency the maximum number of active subscriptions * @return the new Flowable instance */ + @SafeVarargs public static Flowable mergeArray(int maxConcurrency, Solo... sources) { return Flowable.mergeArray(maxConcurrency, 1, sources); } @@ -464,6 +470,7 @@ public static Flowable mergeDelayError(Publisher Flowable mergeArrayDelayError(Solo... sources) { return mergeArrayDelayError(Integer.MAX_VALUE, sources); } @@ -476,6 +483,7 @@ public static Flowable mergeArrayDelayError(Solo... sources) * @param maxConcurrency the maximum number of active subscriptions * @return the new Flowable instance */ + @SafeVarargs public static Flowable mergeArrayDelayError(int maxConcurrency, Solo... sources) { return Flowable.mergeArrayDelayError(maxConcurrency, 1, sources); } @@ -500,8 +508,8 @@ public static Solo timer(long delay, TimeUnit unit) { * @return the new Solo instance */ public static Solo timer(long delay, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return onAssembly(new SoloTimer(delay, unit, scheduler)); } @@ -545,10 +553,10 @@ public static Solo using( Consumer disposer, boolean eager ) { - ObjectHelper.requireNonNull(resourceSupplier, "resourceSupplier is null"); - ObjectHelper.requireNonNull(sourceSupplier, "sourceSupplier is null"); - ObjectHelper.requireNonNull(disposer, "disposer is null"); - return onAssembly(new SoloUsing(resourceSupplier, sourceSupplier, disposer, eager)); + Objects.requireNonNull(resourceSupplier, "resourceSupplier is null"); + Objects.requireNonNull(sourceSupplier, "sourceSupplier is null"); + Objects.requireNonNull(disposer, "disposer is null"); + return onAssembly(new SoloUsing<>(resourceSupplier, sourceSupplier, disposer, eager)); } /** @@ -564,8 +572,8 @@ public static Solo zip( Iterable> sources, Function zipper ) { - ObjectHelper.requireNonNull(sources, "sources is null"); - ObjectHelper.requireNonNull(zipper, "zipper is null"); + Objects.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(zipper, "zipper is null"); return onAssembly(new SoloZipIterable(sources, zipper)); } @@ -578,12 +586,13 @@ public static Solo zip( * @param zipper the function takin in an array of values and returns a solo value * @return the new Solo instance */ + @SafeVarargs public static Solo zipArray( Function zipper, Solo... sources ) { - ObjectHelper.requireNonNull(sources, "sources is null"); - ObjectHelper.requireNonNull(zipper, "zipper is null"); + Objects.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(zipper, "zipper is null"); return onAssembly(new SoloZipArray(sources, zipper)); } @@ -597,7 +606,6 @@ public static Solo zipArray( * @param other the other Solo * @return the new Solo instance */ - @SuppressWarnings("unchecked") public final Solo ambWith(Solo other) { return ambArray(this, other); } @@ -609,8 +617,8 @@ public final Solo ambWith(Solo other) { * @return the new Solo instance */ public final Solo andThen(Nono other) { - ObjectHelper.requireNonNull(other, "other is null"); - return onAssembly(new SoloAndThen(this, other)); + Objects.requireNonNull(other, "other is null"); + return onAssembly(new SoloAndThen<>(this, other)); } /** @@ -652,7 +660,6 @@ public final Flowable mergeWith(Solo other) { * the other Solo and returns a solo value to be emitted. * @return the new Solo instance */ - @SuppressWarnings("unchecked") public final Solo zipWith(Solo other, BiFunction zipper) { return Solo.zipArray(Functions.toFunction(zipper), this, other); } @@ -665,7 +672,7 @@ public final Solo zipWith(Solo other, BiFunction Solo map(Function mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return onAssembly(new SoloMap(this, mapper)); } @@ -676,8 +683,8 @@ public final Solo map(Function mapper) { * @return the new Solo instance */ public final Solo mapError(Function errorMapper) { - ObjectHelper.requireNonNull(errorMapper, "errorMapper is null"); - return onAssembly(new SoloMapError(this, errorMapper)); + Objects.requireNonNull(errorMapper, "errorMapper is null"); + return onAssembly(new SoloMapError<>(this, errorMapper)); } /** @@ -687,8 +694,8 @@ public final Solo mapError(Function e * @return the new Perhaps instance */ public final Perhaps filter(Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); - return Perhaps.onAssembly(new SoloFilter(this, predicate)); + Objects.requireNonNull(predicate, "predicate is null"); + return Perhaps.onAssembly(new SoloFilter<>(this, predicate)); } /** @@ -747,8 +754,8 @@ public final Solo timeout(long timeout, TimeUnit unit, Scheduler scheduler, S * @return the new Solo instance */ public final Solo timeout(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); - return onAssembly(new SoloTimeout(this, other, null)); + Objects.requireNonNull(other, "other is null"); + return onAssembly(new SoloTimeout<>(this, other, null)); } /** @@ -760,9 +767,9 @@ public final Solo timeout(Publisher other) { * @return the new Solo instance */ public final Solo timeout(Publisher other, Solo fallback) { - ObjectHelper.requireNonNull(other, "other is null"); - ObjectHelper.requireNonNull(fallback, "fallback is null"); - return onAssembly(new SoloTimeout(this, other, fallback)); + Objects.requireNonNull(other, "other is null"); + Objects.requireNonNull(fallback, "fallback is null"); + return onAssembly(new SoloTimeout<>(this, other, fallback)); } /** @@ -771,8 +778,8 @@ public final Solo timeout(Publisher other, Solo fallback) { * @return the new Solo instance */ public final Solo onErrorReturnItem(T item) { - ObjectHelper.requireNonNull(item, "item is null"); - return onAssembly(new SoloOnErrorReturnItem(this, item)); + Objects.requireNonNull(item, "item is null"); + return onAssembly(new SoloOnErrorReturnItem<>(this, item)); } /** @@ -782,8 +789,8 @@ public final Solo onErrorReturnItem(T item) { * @return the new Solo instance */ public final Solo onErrorResumeWith(Solo next) { - ObjectHelper.requireNonNull(next, "next is null"); - return onAssembly(new SoloOnErrorResumeWith(this, next)); + Objects.requireNonNull(next, "next is null"); + return onAssembly(new SoloOnErrorResumeWith<>(this, next)); } /** @@ -794,8 +801,8 @@ public final Solo onErrorResumeWith(Solo next) { * @return the new Solo instance */ public final Solo onErrorResumeNext(Function> errorHandler) { - ObjectHelper.requireNonNull(errorHandler, "errorHandler is null"); - return onAssembly(new SoloOnErrorResumeNext(this, errorHandler)); + Objects.requireNonNull(errorHandler, "errorHandler is null"); + return onAssembly(new SoloOnErrorResumeNext<>(this, errorHandler)); } /** @@ -808,8 +815,8 @@ public final Solo onErrorResumeNext(Function Solo flatMap( Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); - return onAssembly(new SoloFlatMap(this, mapper)); + Objects.requireNonNull(mapper, "mapper is null"); + return onAssembly(new SoloFlatMap<>(this, mapper)); } /** @@ -826,9 +833,9 @@ public final Solo flatMap( Function> onSuccessMapper, Function> onErrorMapper ) { - ObjectHelper.requireNonNull(onSuccessMapper, "onSuccessMapper is null"); - ObjectHelper.requireNonNull(onErrorMapper, "onErrorMapper is null"); - return onAssembly(new SoloFlatMapSignal(this, onSuccessMapper, onErrorMapper)); + Objects.requireNonNull(onSuccessMapper, "onSuccessMapper is null"); + Objects.requireNonNull(onErrorMapper, "onErrorMapper is null"); + return onAssembly(new SoloFlatMapSignal<>(this, onSuccessMapper, onErrorMapper)); } /** @@ -842,8 +849,8 @@ public final Solo flatMap( public final Flowable flatMapPublisher( Function> mapper ) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); - return RxJavaPlugins.onAssembly(new SoloFlatMapPublisher(this, mapper)); + Objects.requireNonNull(mapper, "mapper is null"); + return RxJavaPlugins.onAssembly(new SoloFlatMapPublisher<>(this, mapper)); } /** @@ -853,8 +860,8 @@ public final Flowable flatMapPublisher( * @return the new Solo instance */ public final Solo takeUntil(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); - return onAssembly(new SoloTakeUntil(this, other)); + Objects.requireNonNull(other, "other is null"); + return onAssembly(new SoloTakeUntil<>(this, other)); } /** @@ -877,8 +884,8 @@ public final Solo delay(long delay, TimeUnit unit) { * @return the new Solo instance */ public final Solo delay(long delay, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return delay(timer(delay, unit, scheduler)); } @@ -890,8 +897,8 @@ public final Solo delay(long delay, TimeUnit unit, Scheduler scheduler) { * @return the new Solo instance */ public final Solo delay(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); - return onAssembly(new SoloDelayPublisher(this, other)); + Objects.requireNonNull(other, "other is null"); + return onAssembly(new SoloDelayPublisher<>(this, other)); } /** @@ -901,8 +908,8 @@ public final Solo delay(Publisher other) { * @return the new Solo type */ public final Solo delaySubscription(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); - return onAssembly(new SoloDelaySubscription(this, other)); + Objects.requireNonNull(other, "other is null"); + return onAssembly(new SoloDelaySubscription<>(this, other)); } /** @@ -931,7 +938,7 @@ public final Solo delaySubscription(long delay, TimeUnit unit, Scheduler sche * @return the new Flowable instance */ public final Flowable toFlowable() { - return RxJavaPlugins.onAssembly(new SoloToFlowable(this)); + return RxJavaPlugins.onAssembly(new SoloToFlowable<>(this)); } /** @@ -939,7 +946,7 @@ public final Flowable toFlowable() { * @return the new Observable instance */ public final Observable toObservable() { - return RxJavaPlugins.onAssembly(new SoloToObservable(this)); + return RxJavaPlugins.onAssembly(new SoloToObservable<>(this)); } /** @@ -947,7 +954,7 @@ public final Observable toObservable() { * @return the new Single instance */ public final Single toSingle() { - return RxJavaPlugins.onAssembly(new SoloToSingle(this)); + return RxJavaPlugins.onAssembly(new SoloToSingle<>(this)); } /** @@ -956,8 +963,8 @@ public final Single toSingle() { * @return the new Solo instance */ public final Solo doOnSubscribe(Consumer onSubscribe) { - ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null"); - return onAssembly(new SoloDoOnLifecycle(this, + Objects.requireNonNull(onSubscribe, "onSubscribe is null"); + return onAssembly(new SoloDoOnLifecycle<>(this, Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -975,8 +982,8 @@ public final Solo doOnSubscribe(Consumer onSubscribe) { * @return the new Solo instance */ public final Solo doOnRequest(LongConsumer onRequest) { - ObjectHelper.requireNonNull(onRequest, "onRequest is null"); - return onAssembly(new SoloDoOnLifecycle(this, + Objects.requireNonNull(onRequest, "onRequest is null"); + return onAssembly(new SoloDoOnLifecycle<>(this, Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -994,8 +1001,8 @@ public final Solo doOnRequest(LongConsumer onRequest) { * @return the new Solo instance */ public final Solo doOnCancel(Action onCancel) { - ObjectHelper.requireNonNull(onCancel, "onCancel is null"); - return onAssembly(new SoloDoOnLifecycle(this, + Objects.requireNonNull(onCancel, "onCancel is null"); + return onAssembly(new SoloDoOnLifecycle<>(this, Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -1014,8 +1021,8 @@ public final Solo doOnCancel(Action onCancel) { * @return the new Solo instance */ public final Solo doOnNext(Consumer onNext) { - ObjectHelper.requireNonNull(onNext, "onNext is null"); - return onAssembly(new SoloDoOnLifecycle(this, + Objects.requireNonNull(onNext, "onNext is null"); + return onAssembly(new SoloDoOnLifecycle<>(this, onNext, Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -1034,8 +1041,8 @@ public final Solo doOnNext(Consumer onNext) { * @return the new Solo instance */ public final Solo doAfterNext(Consumer onAfterNext) { - ObjectHelper.requireNonNull(onAfterNext, "onAfterNext is null"); - return onAssembly(new SoloDoOnLifecycle(this, + Objects.requireNonNull(onAfterNext, "onAfterNext is null"); + return onAssembly(new SoloDoOnLifecycle<>(this, Functions.emptyConsumer(), onAfterNext, Functions.emptyConsumer(), @@ -1054,8 +1061,8 @@ public final Solo doAfterNext(Consumer onAfterNext) { * @return the new Solo instance */ public final Solo doOnError(Consumer onError) { - ObjectHelper.requireNonNull(onError, "onError is null"); - return onAssembly(new SoloDoOnLifecycle(this, + Objects.requireNonNull(onError, "onError is null"); + return onAssembly(new SoloDoOnLifecycle<>(this, Functions.emptyConsumer(), Functions.emptyConsumer(), onError, @@ -1074,8 +1081,8 @@ public final Solo doOnError(Consumer onError) { * @return the new Solo instance */ public final Solo doOnComplete(Action onComplete) { - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); - return onAssembly(new SoloDoOnLifecycle(this, + Objects.requireNonNull(onComplete, "onComplete is null"); + return onAssembly(new SoloDoOnLifecycle<>(this, Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -1094,8 +1101,8 @@ public final Solo doOnComplete(Action onComplete) { * @return the new Solo instance */ public final Solo doAfterTerminate(Action onAfterTerminate) { - ObjectHelper.requireNonNull(onAfterTerminate, "onAfterTerminate is null"); - return onAssembly(new SoloDoOnLifecycle(this, + Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null"); + return onAssembly(new SoloDoOnLifecycle<>(this, Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -1114,8 +1121,8 @@ public final Solo doAfterTerminate(Action onAfterTerminate) { * @return the new Solo instance */ public final Solo doFinally(Action onFinally) { - ObjectHelper.requireNonNull(onFinally, "onFinally is null"); - return onAssembly(new SoloDoFinally(this, onFinally)); + Objects.requireNonNull(onFinally, "onFinally is null"); + return onAssembly(new SoloDoFinally<>(this, onFinally)); } /** @@ -1133,7 +1140,7 @@ public final Nono ignoreElement() { * @return the new Solo instance */ public final Solo hide() { - return onAssembly(new SoloHide(this)); + return onAssembly(new SoloHide<>(this)); } /** @@ -1168,8 +1175,8 @@ public final Solo compose(Function, ? extends Solo> co * @return the new Solo type */ public final Solo lift(Function, Subscriber> onLift) { - ObjectHelper.requireNonNull(onLift, "onLift is null"); - return onAssembly(new SoloLift(this, onLift)); + Objects.requireNonNull(onLift, "onLift is null"); + return onAssembly(new SoloLift<>(this, onLift)); } /** @@ -1217,7 +1224,7 @@ public final Flowable repeatWhen(Function, ? extends * @return the new Solo instance */ public final Solo retry() { - return onAssembly(new SoloRetry(this, Long.MAX_VALUE)); + return onAssembly(new SoloRetry<>(this, Long.MAX_VALUE)); } /** @@ -1229,7 +1236,7 @@ public final Solo retry(long times) { if (times < 0L) { throw new IllegalArgumentException("times >= 0 required but it was " + times); } - return onAssembly(new SoloRetry(this, times)); + return onAssembly(new SoloRetry<>(this, times)); } /** @@ -1240,8 +1247,8 @@ public final Solo retry(long times) { * @return the new Solo instance */ public final Solo retry(Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); - return onAssembly(new SoloRetryWhile(this, predicate)); + Objects.requireNonNull(predicate, "predicate is null"); + return onAssembly(new SoloRetryWhile<>(this, predicate)); } /** @@ -1253,8 +1260,8 @@ public final Solo retry(Predicate predicate) { * @return the new Solo instance */ public final Solo retryWhen(Function, ? extends Publisher> handler) { - ObjectHelper.requireNonNull(handler, "handler is null"); - return onAssembly(new SoloRetryWhen(this, handler)); + Objects.requireNonNull(handler, "handler is null"); + return onAssembly(new SoloRetryWhen<>(this, handler)); } /** @@ -1264,8 +1271,8 @@ public final Solo retryWhen(Function, ? extends P * @return the new Solo instance */ public final Solo subscribeOn(Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - return onAssembly(new SoloSubscribeOn(this, scheduler)); + Objects.requireNonNull(scheduler, "scheduler is null"); + return onAssembly(new SoloSubscribeOn<>(this, scheduler)); } /** @@ -1275,8 +1282,8 @@ public final Solo subscribeOn(Scheduler scheduler) { * @return the new Solo instance */ public final Solo observeOn(Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - return onAssembly(new SoloObserveOn(this, scheduler)); + Objects.requireNonNull(scheduler, "scheduler is null"); + return onAssembly(new SoloObserveOn<>(this, scheduler)); } /** @@ -1286,8 +1293,8 @@ public final Solo observeOn(Scheduler scheduler) { * @return the new Solo instance */ public final Solo unsubscribeOn(Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - return onAssembly(new SoloUnsubscribeOn(this, scheduler)); + Objects.requireNonNull(scheduler, "scheduler is null"); + return onAssembly(new SoloUnsubscribeOn<>(this, scheduler)); } /** @@ -1298,7 +1305,7 @@ public final Solo unsubscribeOn(Scheduler scheduler) { * @since 0.14.1 */ public final Solo cache() { - return onAssembly(new SoloCache(this)); + return onAssembly(new SoloCache<>(this)); } // ---------------------------------------------------- @@ -1307,7 +1314,7 @@ public final Solo cache() { @Override public final void subscribe(Subscriber s) { - ObjectHelper.requireNonNull(s, "s is null"); + Objects.requireNonNull(s, "s is null"); try { subscribeActual(s); } catch (NullPointerException ex) { @@ -1372,7 +1379,7 @@ public final Disposable subscribe(Consumer onNext, Consumer onNext, Consumer onError, Action onComplete) { - LambdaSubscriber s = new LambdaSubscriber(onNext, onError, onComplete, Functions.REQUEST_MAX); + LambdaSubscriber s = new LambdaSubscriber<>(onNext, onError, onComplete, Functions.REQUEST_MAX); subscribe(s); return s; } @@ -1410,10 +1417,10 @@ public final void blockingSubscribe(Consumer onNext, Consumer onNext, Consumer onError, Action onComplete) { - ObjectHelper.requireNonNull(onNext, "onNext is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); - BlockingGetSubscriber s = new BlockingGetSubscriber(); + Objects.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); + BlockingGetSubscriber s = new BlockingGetSubscriber<>(); subscribe(s); s.blockingCall(onNext, onError, onComplete); } @@ -1424,7 +1431,7 @@ public final void blockingSubscribe(Consumer onNext, Consumer s = new BlockingGetSubscriber(); + BlockingGetSubscriber s = new BlockingGetSubscriber<>(); subscribe(s); return s.blockingGet(); } @@ -1438,7 +1445,7 @@ public final T blockingGet() { * @return the success value of this Solo */ public final T blockingGet(long timeout, TimeUnit unit) { - BlockingGetSubscriber s = new BlockingGetSubscriber(); + BlockingGetSubscriber s = new BlockingGetSubscriber<>(); subscribe(s); return s.blockingGet(timeout, unit); } @@ -1481,7 +1488,7 @@ public final TestSubscriber test(long initialRequest) { * @return the new TestSubscriber */ public final TestSubscriber test(long initialRequest, boolean cancel) { - TestSubscriber ts = new TestSubscriber(initialRequest); + TestSubscriber ts = new TestSubscriber<>(initialRequest); if (cancel) { ts.cancel(); } @@ -1495,7 +1502,7 @@ public final TestSubscriber test(long initialRequest, boolean cancel) { * @return the new Future instance */ public final Future toFuture() { - FuturePerhapsSubscriber fs = new FuturePerhapsSubscriber(); + FuturePerhapsSubscriber fs = new FuturePerhapsSubscriber<>(); subscribe(fs); return fs; } diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbArray.java index 8c815c77..5613f9bf 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbArray.java @@ -39,7 +39,7 @@ final class SoloAmbArray extends Solo { @Override protected void subscribeActual(Subscriber s) { - AmbSubscriber parent = new AmbSubscriber(s); + AmbSubscriber parent = new AmbSubscriber<>(s); s.onSubscribe(parent); for (Solo source : sources) { diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbIterable.java index 7fc428e6..6823385a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloAmbIterable.java @@ -16,11 +16,12 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; + import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.basetypes.SoloAmbArray.AmbSubscriber; import io.reactivex.rxjava3.exceptions.Exceptions; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Signal the events of the first source that signals. @@ -37,12 +38,12 @@ final class SoloAmbIterable extends Solo { @Override protected void subscribeActual(Subscriber s) { - AmbSubscriber parent = new AmbSubscriber(s); + AmbSubscriber parent = new AmbSubscriber<>(s); s.onSubscribe(parent); try { for (Solo source : sources) { - ObjectHelper.requireNonNull(source, "One of the sources is null") + Objects.requireNonNull(source, "One of the sources is null") .subscribe(parent); } } catch (Throwable ex) { diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCache.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCache.java index f80d1c20..a2ab3ced 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCache.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCache.java @@ -51,12 +51,12 @@ final class SoloCache extends Solo implements Subscriber { SoloCache(Solo source) { this.source = source; this.once = new AtomicBoolean(); - this.subscribers = new AtomicReference[]>(EMPTY); + this.subscribers = new AtomicReference<>(EMPTY); } @Override protected void subscribeActual(Subscriber s) { - CacheSubscription inner = new CacheSubscription(s, this); + CacheSubscription inner = new CacheSubscription<>(s, this); s.onSubscribe(inner); if (add(inner)) { @@ -168,7 +168,7 @@ static final class CacheSubscription extends DeferredScalarSubscription { CacheSubscription(Subscriber downstream, SoloCache parent) { super(downstream); - this.parent = new AtomicReference(parent); + this.parent = new AtomicReference<>(parent); } @SuppressWarnings("unchecked") diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCreate.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCreate.java index b6a756fc..c3fa0ad0 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCreate.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloCreate.java @@ -44,7 +44,7 @@ final class SoloCreate extends Solo { @Override protected void subscribeActual(Subscriber s) { - SoloEmitter parent = new SoloEmitter(s); + SoloEmitter parent = new SoloEmitter<>(s); s.onSubscribe(parent); try { @@ -63,7 +63,7 @@ static final class SoloEmitter extends DeferredScalarSubscription implemen SoloEmitter(Subscriber downstream) { super(downstream); - this.resource = new AtomicReference(); + this.resource = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDefer.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDefer.java index e82e1f39..ee23ef3b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDefer.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDefer.java @@ -16,11 +16,12 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; + import org.reactivestreams.Subscriber; 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; /** @@ -41,7 +42,7 @@ protected void subscribeActual(Subscriber s) { Solo sp; try { - sp = ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null Solo"); + sp = Objects.requireNonNull(supplier.get(), "The supplier returned a null Solo"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelaySubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelaySubscription.java index a2c89761..3617fefb 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelaySubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelaySubscription.java @@ -41,7 +41,7 @@ final class SoloDelaySubscription extends Solo { @Override protected void subscribeActual(Subscriber s) { - DelaySubscriptionSubscriber parent = new DelaySubscriptionSubscriber(s, source); + DelaySubscriptionSubscriber parent = new DelaySubscriptionSubscriber<>(s, source); s.onSubscribe(parent); other.subscribe(parent.other); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloErrorSupplier.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloErrorSupplier.java index d142f279..f40e8a3d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloErrorSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloErrorSupplier.java @@ -16,11 +16,12 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; + import org.reactivestreams.Subscriber; 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; /** @@ -41,7 +42,7 @@ protected void subscribeActual(Subscriber s) { Throwable ex; try { - ex = ObjectHelper.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); + ex = Objects.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); } catch (Throwable exc) { Exceptions.throwIfFatal(exc); ex = exc; @@ -52,6 +53,6 @@ protected void subscribeActual(Subscriber s) { @Override public T get() throws Throwable { - throw ObjectHelper.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); + throw Objects.requireNonNull(errorSupplier.get(), "The errorSupplier returned a null Throwable"); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMap.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMap.java index 02731ed4..daac8073 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMap.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMap.java @@ -16,13 +16,13 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; 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.*; /** @@ -80,7 +80,7 @@ public void onNext(T t) { Solo sp; try { - sp = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Solo"); + sp = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Solo"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapPublisher.java index 25195929..464f499f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapPublisher.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -23,7 +24,6 @@ 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.subscriptions.SubscriptionHelper; /** @@ -85,7 +85,7 @@ public void onNext(T t) { Publisher p; try { - p = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); + p = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapSignal.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapSignal.java index 6d89fc63..d6c05d56 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapSignal.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFlatMapSignal.java @@ -16,13 +16,13 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; 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.*; /** @@ -90,7 +90,7 @@ public void onNext(T t) { Solo sp; try { - sp = ObjectHelper.requireNonNull(onSuccessMapper.apply(t), "The onSuccessMapper returned a null Solo"); + sp = Objects.requireNonNull(onSuccessMapper.apply(t), "The onSuccessMapper returned a null Solo"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); @@ -105,7 +105,7 @@ public void onError(Throwable t) { Solo sp; try { - sp = ObjectHelper.requireNonNull(onErrorMapper.apply(t), "The onErrorMapper returned a null Solo"); + sp = Objects.requireNonNull(onErrorMapper.apply(t), "The onErrorMapper returned a null Solo"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromCallable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromCallable.java index 9c96a98a..daa98f86 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromCallable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromCallable.java @@ -16,13 +16,12 @@ package hu.akarnokd.rxjava3.basetypes; -import java.util.NoSuchElementException; +import java.util.*; import java.util.concurrent.Callable; import org.reactivestreams.Subscriber; import io.reactivex.rxjava3.exceptions.Exceptions; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; /** @@ -40,7 +39,7 @@ final class SoloFromCallable extends Solo implements Callable { @Override protected void subscribeActual(Subscriber s) { - DeferredScalarSubscription dss = new DeferredScalarSubscription(s); + DeferredScalarSubscription dss = new DeferredScalarSubscription<>(s); s.onSubscribe(dss); T v; @@ -62,6 +61,6 @@ protected void subscribeActual(Subscriber s) { @Override public T call() throws Exception { - return ObjectHelper.requireNonNull(callable.call(), "The callable returned a null value"); + return Objects.requireNonNull(callable.call(), "The callable returned a null value"); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromFuture.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromFuture.java index b4e18b77..2adeacad 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromFuture.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloFromFuture.java @@ -46,7 +46,7 @@ final class SoloFromFuture extends Solo { @Override protected void subscribeActual(Subscriber s) { - DeferredScalarSubscription dss = new DeferredScalarSubscription(s); + DeferredScalarSubscription dss = new DeferredScalarSubscription<>(s); s.onSubscribe(dss); T v; diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloJust.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloJust.java index 29e4a72b..00d304eb 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloJust.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloJust.java @@ -36,7 +36,7 @@ final class SoloJust extends Solo implements ScalarSupplier { @Override protected void subscribeActual(Subscriber s) { - s.onSubscribe(new ScalarSubscription(s, value)); + s.onSubscribe(new ScalarSubscription<>(s, value)); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloLift.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloLift.java index 438b2e9f..cbb63b9b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloLift.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloLift.java @@ -16,11 +16,12 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; + import org.reactivestreams.Subscriber; 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.EmptySubscription; /** @@ -45,7 +46,7 @@ protected void subscribeActual(Subscriber s) { Subscriber parent; try { - parent = ObjectHelper.requireNonNull(onLift.apply(s), "The onLift returned a null Subscriber"); + parent = Objects.requireNonNull(onLift.apply(s), "The onLift returned a null Subscriber"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMap.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMap.java index 5d194562..1660fd1e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMap.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMap.java @@ -16,10 +16,11 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; + import org.reactivestreams.Subscriber; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscribers.BasicFuseableSubscriber; /** @@ -60,7 +61,7 @@ public void onNext(T t) { R v; try { - v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null value"); + v = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null value"); } catch (Throwable ex) { fail(ex); return; @@ -82,7 +83,7 @@ public int requestFusion(int mode) { public R poll() throws Throwable { T v = qs.poll(); if (v != null) { - return ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null value"); + return Objects.requireNonNull(mapper.apply(v), "The mapper returned a null value"); } return null; } diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMapError.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMapError.java index dd53993e..287137cd 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMapError.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMapError.java @@ -16,11 +16,12 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; + import org.reactivestreams.Subscriber; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; import io.reactivex.rxjava3.internal.subscribers.BasicFuseableSubscriber; @@ -65,7 +66,7 @@ public void onError(Throwable t) { Throwable ex; try { - ex = ObjectHelper.requireNonNull(errorMapper.apply(t), "The errorMapper returned a null Throwable"); + ex = Objects.requireNonNull(errorMapper.apply(t), "The errorMapper returned a null Throwable"); } catch (Throwable exc) { Exceptions.throwIfFatal(exc); ex = new CompositeException(t, exc); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloObserveOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloObserveOn.java index b26e5e2d..fc66797b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloObserveOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloObserveOn.java @@ -106,7 +106,7 @@ public void onSubscribe(Subscription s) { } } - queue = new SpscOneQueue(); + queue = new SpscOneQueue<>(); downstream.onSubscribe(this); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeNext.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeNext.java index ce4f050b..5cc440ae 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeNext.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeNext.java @@ -16,13 +16,13 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.*; /** @@ -43,7 +43,7 @@ final class SoloOnErrorResumeNext extends Solo { @Override protected void subscribeActual(Subscriber s) { - source.subscribe(new OnErrorReturnItemSubscriber(s, errorHandler)); + source.subscribe(new OnErrorReturnItemSubscriber<>(s, errorHandler)); } static final class OnErrorReturnItemSubscriber extends DeferredScalarSubscription @@ -84,7 +84,7 @@ public void onError(Throwable t) { Solo sp; try { - sp = ObjectHelper.requireNonNull(errorHandler.apply(t), "The errorHandler returned a null Solo"); + sp = Objects.requireNonNull(errorHandler.apply(t), "The errorHandler returned a null Solo"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(new CompositeException(t, ex)); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeWith.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeWith.java index 4a6bf741..bb6115be 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeWith.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorResumeWith.java @@ -40,7 +40,7 @@ final class SoloOnErrorResumeWith extends Solo { @Override protected void subscribeActual(Subscriber s) { - source.subscribe(new OnErrorResumeWithSubscriber(s, next)); + source.subscribe(new OnErrorResumeWithSubscriber<>(s, next)); } static final class OnErrorResumeWithSubscriber extends DeferredScalarSubscription diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorReturnItem.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorReturnItem.java index 11915f59..3061d2bb 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorReturnItem.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloOnErrorReturnItem.java @@ -38,7 +38,7 @@ final class SoloOnErrorReturnItem extends Solo { @Override protected void subscribeActual(Subscriber s) { - source.subscribe(new OnErrorReturnItemSubscriber(s, item)); + source.subscribe(new OnErrorReturnItemSubscriber<>(s, item)); } static final class OnErrorReturnItemSubscriber extends DeferredScalarSubscription diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloProcessor.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloProcessor.java index fbf4f365..961816ae 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloProcessor.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloProcessor.java @@ -55,7 +55,7 @@ public final class SoloProcessor extends Solo implements Processor { * @return the new SoloProcessor instance */ public static SoloProcessor create() { - return new SoloProcessor(); + return new SoloProcessor<>(); } /** @@ -63,13 +63,13 @@ public static SoloProcessor create() { */ @SuppressWarnings("unchecked") private SoloProcessor() { - subscribers = new AtomicReference[]>(EMPTY); + subscribers = new AtomicReference<>(EMPTY); once = new AtomicBoolean(); } @Override protected void subscribeActual(Subscriber s) { - InnerSubscription inner = new InnerSubscription(s, this); + InnerSubscription inner = new InnerSubscription<>(s, this); s.onSubscribe(inner); if (add(inner)) { if (inner.isCancelled()) { diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetry.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetry.java index 2091cc63..7144a88a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetry.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetry.java @@ -40,7 +40,7 @@ final class SoloRetry extends Solo { @Override protected void subscribeActual(Subscriber s) { - RetrySubscriber parent = new RetrySubscriber(s, times, source); + RetrySubscriber parent = new RetrySubscriber<>(s, times, source); s.onSubscribe(parent); parent.subscribeNext(); } @@ -65,7 +65,7 @@ static final class RetrySubscriber extends DeferredScalarSubscription this.times = times; this.source = source; this.wip = new AtomicInteger(); - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhen.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhen.java index f4b5e2e2..2d15a399 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhen.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhen.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.basetypes; -import java.util.NoSuchElementException; +import java.util.*; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -24,7 +24,6 @@ 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.subscriptions.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; import io.reactivex.rxjava3.processors.*; @@ -52,14 +51,14 @@ protected void subscribeActual(Subscriber s) { Publisher when; try { - when = ObjectHelper.requireNonNull(handler.apply(pp), "The handler returned a null Publisher"); + when = Objects.requireNonNull(handler.apply(pp), "The handler returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); return; } - RetrySubscriber parent = new RetrySubscriber(s, pp, source); + RetrySubscriber parent = new RetrySubscriber<>(s, pp, source); s.onSubscribe(parent); when.subscribe(parent.other); @@ -91,7 +90,7 @@ static final class RetrySubscriber extends DeferredScalarSubscription this.source = source; this.other = new OtherSubscriber(); this.wip = new AtomicInteger(); - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); this.once = new AtomicBoolean(); } diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhile.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhile.java index 217f0127..e7c86f0a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhile.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloRetryWhile.java @@ -42,7 +42,7 @@ final class SoloRetryWhile extends Solo { @Override protected void subscribeActual(Subscriber s) { - RetrySubscriber parent = new RetrySubscriber(s, predicate, source); + RetrySubscriber parent = new RetrySubscriber<>(s, predicate, source); s.onSubscribe(parent); parent.subscribeNext(); } @@ -67,7 +67,7 @@ static final class RetrySubscriber extends DeferredScalarSubscription this.predicate = predicate; this.source = source; this.wip = new AtomicInteger(); - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloSubscribeOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloSubscribeOn.java index e51392f1..697b70d7 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloSubscribeOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloSubscribeOn.java @@ -46,7 +46,7 @@ final class SoloSubscribeOn extends Solo { protected void subscribeActual(Subscriber s) { Worker worker = scheduler.createWorker(); - SubscribeOnSubscriber parent = new SubscribeOnSubscriber(s, worker, source); + SubscribeOnSubscriber parent = new SubscribeOnSubscriber<>(s, worker, source); s.onSubscribe(parent); DisposableHelper.replace(parent.task, worker.schedule(parent)); @@ -72,7 +72,7 @@ static final class SubscribeOnSubscriber this.downstream = downstream; this.worker = worker; this.source = source; - this.task = new AtomicReference(); + this.task = new AtomicReference<>(); this.requested = new AtomicBoolean(); } diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTakeUntil.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTakeUntil.java index 566987c4..ad8a5e30 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTakeUntil.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTakeUntil.java @@ -43,7 +43,7 @@ final class SoloTakeUntil extends Solo { @Override protected void subscribeActual(Subscriber s) { - TakeUntilSubscriber parent = new TakeUntilSubscriber(s); + TakeUntilSubscriber parent = new TakeUntilSubscriber<>(s); s.onSubscribe(parent); other.subscribe(parent.other); @@ -63,7 +63,7 @@ static final class TakeUntilSubscriber extends DeferredScalarSubscription TakeUntilSubscriber(Subscriber downstream) { super(downstream); - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); this.other = new OtherSubscriber(); this.once = new AtomicBoolean(); } diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimeout.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimeout.java index 81ee9e4f..e02f0498 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimeout.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimeout.java @@ -40,7 +40,7 @@ final class SoloTimeout extends Solo { @Override protected void subscribeActual(Subscriber s) { - TimeoutSubscriber parent = new TimeoutSubscriber(s, fallback); + TimeoutSubscriber parent = new TimeoutSubscriber<>(s, fallback); s.onSubscribe(parent); other.subscribe(parent.other); @@ -64,7 +64,7 @@ static final class TimeoutSubscriber extends DeferredScalarSubscription TimeoutSubscriber(Subscriber downstream, Solo fallback) { super(downstream); - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); this.fallback = fallback; this.once = new AtomicBoolean(); this.other = new OtherSubscriber(); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimer.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimer.java index 86b66ff7..0edd1226 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimer.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloTimer.java @@ -61,7 +61,7 @@ static final class TimerSubscriber extends DeferredScalarSubscription TimerSubscriber(Subscriber downstream) { super(downstream); - this.task = new AtomicReference(); + this.task = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUsing.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUsing.java index 2c2d9176..b7577cf6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUsing.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUsing.java @@ -16,13 +16,13 @@ package hu.akarnokd.rxjava3.basetypes; +import java.util.Objects; import java.util.concurrent.atomic.AtomicBoolean; import org.reactivestreams.*; 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; @@ -64,7 +64,7 @@ protected void subscribeActual(Subscriber s) { Solo np; try { - np = ObjectHelper.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null Nono"); + np = Objects.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null Nono"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); if (eager) { diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipArray.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipArray.java index 83f5d8f5..ba6f4a9f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipArray.java @@ -16,14 +16,13 @@ package hu.akarnokd.rxjava3.basetypes; -import java.util.Arrays; +import java.util.*; import java.util.concurrent.atomic.*; import org.reactivestreams.*; 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.plugins.RxJavaPlugins; @@ -48,7 +47,7 @@ final class SoloZipArray extends Solo { protected void subscribeActual(Subscriber s) { Solo[] a = sources; int n = a.length; - ZipCoordinator parent = new ZipCoordinator(s, zipper, n); + ZipCoordinator parent = new ZipCoordinator<>(s, zipper, n); s.onSubscribe(parent); parent.subscribe(a, n); @@ -73,7 +72,7 @@ static final class ZipCoordinator extends DeferredScalarSubscription { @SuppressWarnings("unchecked") ZipSubscriber[] a = new ZipSubscriber[n]; for (int i = 0; i < n; i++) { - a[i] = new ZipSubscriber(i, this); + a[i] = new ZipSubscriber<>(i, this); } this.subscribers = a; this.wip = new AtomicInteger(n); @@ -100,7 +99,7 @@ void onSuccess(int index, T value) { if (wip.decrementAndGet() == 0) { R v; try { - v = ObjectHelper.requireNonNull(zipper.apply(values), "The zipper returned a null value"); + v = Objects.requireNonNull(zipper.apply(values), "The zipper returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); Arrays.fill(values, null); diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipIterable.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipIterable.java index c26b7a0b..d8d070ff 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipIterable.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloZipIterable.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.basetypes; -import java.util.Arrays; +import java.util.*; import org.reactivestreams.Subscriber; @@ -24,7 +24,6 @@ import hu.akarnokd.rxjava3.basetypes.SoloZipArray.ZipCoordinator; 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.EmptySubscription; /** @@ -60,7 +59,7 @@ protected void subscribeActual(Subscriber s) { if (n == array.length) { array = Arrays.copyOf(array, n + (n >> 1)); } - array[n++] = ObjectHelper.requireNonNull(inner, "One of the source Solo is null"); + array[n++] = Objects.requireNonNull(inner, "One of the source Solo is null"); } } catch (Throwable ex) { Exceptions.throwIfFatal(ex); @@ -73,11 +72,11 @@ protected void subscribeActual(Subscriber s) { return; } else if (n == 1) { - array[0].subscribe(new MapSubscriber(s, this)); + array[0].subscribe(new MapSubscriber<>(s, this)); return; } - ZipCoordinator parent = new ZipCoordinator(s, zipper, n); + ZipCoordinator parent = new ZipCoordinator<>(s, zipper, n); s.onSubscribe(parent); parent.subscribe(array, n); diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/AbstractDisposableAutoRelease.java b/src/main/java/hu/akarnokd/rxjava3/consumers/AbstractDisposableAutoRelease.java index ce5ca383..4cfcc03e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/AbstractDisposableAutoRelease.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/AbstractDisposableAutoRelease.java @@ -49,7 +49,7 @@ abstract class AbstractDisposableAutoRelease ) { this.onError = onError; this.onComplete = onComplete; - this.composite = new AtomicReference(composite); + this.composite = new AtomicReference<>(composite); } public final void onError(Throwable t) { diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/CompletableConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/CompletableConsumers.java index 482e1828..bbcd4fb0 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/CompletableConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/CompletableConsumers.java @@ -16,10 +16,12 @@ package hu.akarnokd.rxjava3.consumers; +import java.util.Objects; + import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.disposables.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.internal.functions.Functions; /** * Utility methods for creating and using consumers {@link io.reactivex.rxjava3.core.Completable}s. @@ -48,11 +50,11 @@ public static Disposable subscribeAutoDispose( Completable source, CompositeDisposable composite, Action onComplete) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(composite, "composite is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(composite, "composite is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); - DisposableAutoReleaseMultiObserver observer = new DisposableAutoReleaseMultiObserver( + DisposableAutoReleaseMultiObserver observer = new DisposableAutoReleaseMultiObserver<>( composite, Functions.emptyConsumer(), null, onComplete); composite.add(observer); source.subscribe(observer); @@ -77,12 +79,12 @@ public static Disposable subscribeAutoDispose( CompositeDisposable composite, Action onComplete, Consumer onError) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(composite, "composite is null"); - ObjectHelper.requireNonNull(onComplete, "onSuccess is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(composite, "composite is null"); + Objects.requireNonNull(onComplete, "onSuccess is null"); + Objects.requireNonNull(onError, "onError is null"); - DisposableAutoReleaseMultiObserver observer = new DisposableAutoReleaseMultiObserver( + DisposableAutoReleaseMultiObserver observer = new DisposableAutoReleaseMultiObserver<>( composite, Functions.emptyConsumer(), onError, onComplete); composite.add(observer); source.subscribe(observer); diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseSubscriber.java b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseSubscriber.java index dd67f450..50b70f41 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseSubscriber.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/DisposableAutoReleaseSubscriber.java @@ -57,7 +57,7 @@ final class DisposableAutoReleaseSubscriber this.onNext = onNext; this.onError = onError; this.onComplete = onComplete; - this.composite = new AtomicReference(composite); + this.composite = new AtomicReference<>(composite); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/FlowableConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/FlowableConsumers.java index 9ec1aaa1..70f666ae 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/FlowableConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/FlowableConsumers.java @@ -16,10 +16,12 @@ package hu.akarnokd.rxjava3.consumers; +import java.util.Objects; + import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.disposables.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.internal.functions.Functions; /** * Utility methods for creating and using consumers {@link io.reactivex.rxjava3.core.Flowable}s. @@ -49,11 +51,11 @@ public static Disposable subscribeAutoDispose( Flowable source, CompositeDisposable composite, Consumer onNext) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(composite, "composite is null"); - ObjectHelper.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(composite, "composite is null"); + Objects.requireNonNull(onNext, "onNext is null"); - DisposableAutoReleaseSubscriber subscriber = new DisposableAutoReleaseSubscriber( + DisposableAutoReleaseSubscriber subscriber = new DisposableAutoReleaseSubscriber<>( composite, onNext, null, Functions.EMPTY_ACTION); composite.add(subscriber); source.subscribe(subscriber); @@ -79,12 +81,12 @@ public static Disposable subscribeAutoDispose( CompositeDisposable composite, Consumer onNext, Consumer onError) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(composite, "composite is null"); - ObjectHelper.requireNonNull(onNext, "onNext is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(composite, "composite is null"); + Objects.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(onError, "onError is null"); - DisposableAutoReleaseSubscriber subscriber = new DisposableAutoReleaseSubscriber( + DisposableAutoReleaseSubscriber subscriber = new DisposableAutoReleaseSubscriber<>( composite, onNext, onError, Functions.EMPTY_ACTION); composite.add(subscriber); source.subscribe(subscriber); @@ -112,13 +114,13 @@ public static Disposable subscribeAutoDispose( Consumer onNext, Consumer onError, Action onComplete) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(composite, "composite is null"); - ObjectHelper.requireNonNull(onNext, "onNext is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(composite, "composite is null"); + Objects.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); - DisposableAutoReleaseSubscriber subscriber = new DisposableAutoReleaseSubscriber( + DisposableAutoReleaseSubscriber subscriber = new DisposableAutoReleaseSubscriber<>( composite, onNext, onError, onComplete); composite.add(subscriber); source.subscribe(subscriber); diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/MaybeConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/MaybeConsumers.java index a25ff678..8c4fac37 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/MaybeConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/MaybeConsumers.java @@ -16,10 +16,12 @@ package hu.akarnokd.rxjava3.consumers; +import java.util.Objects; + import io.reactivex.rxjava3.core.Maybe; import io.reactivex.rxjava3.disposables.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.internal.functions.Functions; /** * Utility methods for creating and using consumers {@link io.reactivex.rxjava3.core.Maybe}s. @@ -49,11 +51,11 @@ public static Disposable subscribeAutoDispose( Maybe source, CompositeDisposable composite, Consumer onSuccess) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(composite, "composite is null"); - ObjectHelper.requireNonNull(onSuccess, "onSuccess is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(composite, "composite is null"); + Objects.requireNonNull(onSuccess, "onSuccess is null"); - DisposableAutoReleaseMultiObserver observer = new DisposableAutoReleaseMultiObserver( + DisposableAutoReleaseMultiObserver observer = new DisposableAutoReleaseMultiObserver<>( composite, onSuccess, null, Functions.EMPTY_ACTION); composite.add(observer); source.subscribe(observer); @@ -79,12 +81,12 @@ public static Disposable subscribeAutoDispose( CompositeDisposable composite, Consumer onSuccess, Consumer onError) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(composite, "composite is null"); - ObjectHelper.requireNonNull(onSuccess, "onSuccess is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(composite, "composite is null"); + Objects.requireNonNull(onSuccess, "onSuccess is null"); + Objects.requireNonNull(onError, "onError is null"); - DisposableAutoReleaseMultiObserver observer = new DisposableAutoReleaseMultiObserver( + DisposableAutoReleaseMultiObserver observer = new DisposableAutoReleaseMultiObserver<>( composite, onSuccess, onError, Functions.EMPTY_ACTION); composite.add(observer); source.subscribe(observer); @@ -112,13 +114,13 @@ public static Disposable subscribeAutoDispose( Consumer onSuccess, Consumer onError, Action onComplete) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(composite, "composite is null"); - ObjectHelper.requireNonNull(onSuccess, "onSuccess is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(composite, "composite is null"); + Objects.requireNonNull(onSuccess, "onSuccess is null"); + Objects.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); - DisposableAutoReleaseMultiObserver observer = new DisposableAutoReleaseMultiObserver( + DisposableAutoReleaseMultiObserver observer = new DisposableAutoReleaseMultiObserver<>( composite, onSuccess, onError, onComplete); composite.add(observer); source.subscribe(observer); diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/ObservableConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/ObservableConsumers.java index bacf2461..3d807e93 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/ObservableConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/ObservableConsumers.java @@ -16,10 +16,12 @@ package hu.akarnokd.rxjava3.consumers; +import java.util.Objects; + import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.disposables.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.internal.functions.Functions; /** * Utility methods for creating and using consumers {@link io.reactivex.rxjava3.core.Observable}s. @@ -49,11 +51,11 @@ public static Disposable subscribeAutoDispose( Observable source, CompositeDisposable composite, Consumer onNext) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(composite, "composite is null"); - ObjectHelper.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(composite, "composite is null"); + Objects.requireNonNull(onNext, "onNext is null"); - DisposableAutoReleaseObserver observer = new DisposableAutoReleaseObserver( + DisposableAutoReleaseObserver observer = new DisposableAutoReleaseObserver<>( composite, onNext, null, Functions.EMPTY_ACTION); composite.add(observer); source.subscribe(observer); @@ -79,12 +81,12 @@ public static Disposable subscribeAutoDispose( CompositeDisposable composite, Consumer onNext, Consumer onError) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(composite, "composite is null"); - ObjectHelper.requireNonNull(onNext, "onNext is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(composite, "composite is null"); + Objects.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(onError, "onError is null"); - DisposableAutoReleaseObserver observer = new DisposableAutoReleaseObserver( + DisposableAutoReleaseObserver observer = new DisposableAutoReleaseObserver<>( composite, onNext, onError, Functions.EMPTY_ACTION); composite.add(observer); source.subscribe(observer); @@ -112,13 +114,13 @@ public static Disposable subscribeAutoDispose( Consumer onNext, Consumer onError, Action onComplete) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(composite, "composite is null"); - ObjectHelper.requireNonNull(onNext, "onNext is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(composite, "composite is null"); + Objects.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); - DisposableAutoReleaseObserver observer = new DisposableAutoReleaseObserver( + DisposableAutoReleaseObserver observer = new DisposableAutoReleaseObserver<>( composite, onNext, onError, onComplete); composite.add(observer); source.subscribe(observer); diff --git a/src/main/java/hu/akarnokd/rxjava3/consumers/SingleConsumers.java b/src/main/java/hu/akarnokd/rxjava3/consumers/SingleConsumers.java index 6db25559..2e28e321 100644 --- a/src/main/java/hu/akarnokd/rxjava3/consumers/SingleConsumers.java +++ b/src/main/java/hu/akarnokd/rxjava3/consumers/SingleConsumers.java @@ -16,10 +16,12 @@ package hu.akarnokd.rxjava3.consumers; +import java.util.Objects; + import io.reactivex.rxjava3.core.Single; import io.reactivex.rxjava3.disposables.*; import io.reactivex.rxjava3.functions.Consumer; -import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.internal.functions.Functions; /** * Utility methods for creating and using consumers {@link io.reactivex.rxjava3.core.SingleObserver}s. @@ -49,11 +51,11 @@ public static Disposable subscribeAutoDispose( Single source, CompositeDisposable composite, Consumer onSuccess) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(composite, "composite is null"); - ObjectHelper.requireNonNull(onSuccess, "onSuccess is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(composite, "composite is null"); + Objects.requireNonNull(onSuccess, "onSuccess is null"); - DisposableAutoReleaseMultiObserver observer = new DisposableAutoReleaseMultiObserver( + DisposableAutoReleaseMultiObserver observer = new DisposableAutoReleaseMultiObserver<>( composite, onSuccess, null, Functions.EMPTY_ACTION); composite.add(observer); source.subscribe(observer); @@ -79,12 +81,12 @@ public static Disposable subscribeAutoDispose( CompositeDisposable composite, Consumer onSuccess, Consumer onError) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(composite, "composite is null"); - ObjectHelper.requireNonNull(onSuccess, "onSuccess is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(composite, "composite is null"); + Objects.requireNonNull(onSuccess, "onSuccess is null"); + Objects.requireNonNull(onError, "onError is null"); - DisposableAutoReleaseMultiObserver observer = new DisposableAutoReleaseMultiObserver( + DisposableAutoReleaseMultiObserver observer = new DisposableAutoReleaseMultiObserver<>( composite, onSuccess, onError, Functions.EMPTY_ACTION); composite.add(observer); source.subscribe(observer); diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/ParallelFlowableOnAssembly.java b/src/main/java/hu/akarnokd/rxjava3/debug/ParallelFlowableOnAssembly.java index 9e7ad569..3778dab0 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/ParallelFlowableOnAssembly.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/ParallelFlowableOnAssembly.java @@ -53,9 +53,9 @@ public void subscribe(Subscriber[] s) { for (int i = 0; i < n; i++) { Subscriber z = s[i]; if (z instanceof ConditionalSubscriber) { - parents[i] = new OnAssemblyConditionalSubscriber((ConditionalSubscriber)z, assembled); + parents[i] = new OnAssemblyConditionalSubscriber<>((ConditionalSubscriber)z, assembled); } else { - parents[i] = new OnAssemblySubscriber(z, assembled); + parents[i] = new OnAssemblySubscriber<>(z, assembled); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyException.java b/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyException.java index 9ecabe0a..23fdf08b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyException.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyException.java @@ -116,7 +116,7 @@ public synchronized Throwable fillInStackTrace() { */ public Throwable appendLast(Throwable ex) { Throwable r = ex; - Set memory = new HashSet(); + Set memory = new HashSet<>(); while (ex.getCause() != null) { if (memory.add(ex)) { ex = ex.getCause(); @@ -141,7 +141,7 @@ public Throwable appendLast(Throwable ex) { * @return the RxJavaAssemblyException found or null */ public static RxJavaAssemblyException find(Throwable ex) { - Set memory = new HashSet(); + Set memory = new HashSet<>(); while (ex != null) { if (ex instanceof RxJavaAssemblyException) { return (RxJavaAssemblyException)ex; diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/multihook/MultiHandlerManager.java b/src/main/java/hu/akarnokd/rxjava3/debug/multihook/MultiHandlerManager.java index 94e70f77..80259158 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/multihook/MultiHandlerManager.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/multihook/MultiHandlerManager.java @@ -16,14 +16,13 @@ package hu.akarnokd.rxjava3.debug.multihook; -import java.util.Iterator; +import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Manages an array of handlers. @@ -43,7 +42,7 @@ public class MultiHandlerManager { * Constructs an empty handler manager. */ public MultiHandlerManager() { - handlers = new CopyOnWriteArrayList>(); + handlers = new CopyOnWriteArrayList<>(); } /** @@ -58,8 +57,8 @@ public MultiHandlerManager() { */ @NonNull public final Disposable register(@NonNull H handler) { - ObjectHelper.requireNonNull(handler, "handler is null"); - HandlerRegistration hr = new HandlerRegistration(this, handler); + Objects.requireNonNull(handler, "handler is null"); + HandlerRegistration hr = new HandlerRegistration<>(this, handler); handlers.add(hr); return hr; } @@ -79,7 +78,7 @@ final void unregister(HandlerRegistration handler) { * @param consumer the consumer to invoke */ public final void forEach(@NonNull Consumer consumer) { - ObjectHelper.requireNonNull(consumer, "consumer is null"); + Objects.requireNonNull(consumer, "consumer is null"); Iterator> it = handlers.iterator(); while (it.hasNext()) { try { @@ -109,7 +108,7 @@ public final void forEach(@NonNull Consumer consumer) { * @param consumer the consumer to invoke */ public final void forEach(S state, @NonNull BiConsumer consumer) { - ObjectHelper.requireNonNull(consumer, "consumer is null"); + Objects.requireNonNull(consumer, "consumer is null"); Iterator> it = handlers.iterator(); while (it.hasNext()) { try { diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/validator/ParallelFlowableValidator.java b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ParallelFlowableValidator.java index 49ca8ee3..fbeb8c7a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/validator/ParallelFlowableValidator.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/validator/ParallelFlowableValidator.java @@ -44,7 +44,7 @@ public void subscribe(Subscriber[] s) { @SuppressWarnings("unchecked") Subscriber[] actual = new Subscriber[n]; for (int i = 0; i < n; i++) { - actual[i] = new FlowableValidator.ValidatorConsumer(s[i], onViolation); + actual[i] = new FlowableValidator.ValidatorConsumer<>(s[i], onViolation); } source.subscribe(actual); } diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/FlowableWhileDoWhile.java b/src/main/java/hu/akarnokd/rxjava3/expr/FlowableWhileDoWhile.java index 7e252090..415cd4da 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/FlowableWhileDoWhile.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/FlowableWhileDoWhile.java @@ -53,7 +53,7 @@ protected void subscribeActual(Subscriber s) { } if (b) { - WhileDoWhileObserver parent = new WhileDoWhileObserver(s, postCondition, source); + WhileDoWhileObserver parent = new WhileDoWhileObserver<>(s, postCondition, source); s.onSubscribe(parent); parent.subscribeNext(); } else { diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/ObservableWhileDoWhile.java b/src/main/java/hu/akarnokd/rxjava3/expr/ObservableWhileDoWhile.java index a4f7bb1d..80b97899 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/ObservableWhileDoWhile.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/ObservableWhileDoWhile.java @@ -52,7 +52,7 @@ protected void subscribeActual(Observer observer) { } if (b) { - WhileDoWhileObserver parent = new WhileDoWhileObserver(observer, postCondition, source); + WhileDoWhileObserver parent = new WhileDoWhileObserver<>(observer, postCondition, source); observer.onSubscribe(parent); parent.subscribeNext(); } else { diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/StatementCompletable.java b/src/main/java/hu/akarnokd/rxjava3/expr/StatementCompletable.java index c1de6e2c..2e482791 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/StatementCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/StatementCompletable.java @@ -16,11 +16,10 @@ package hu.akarnokd.rxjava3.expr; -import java.util.Map; +import java.util.*; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** @@ -53,9 +52,9 @@ public final class StatementCompletable { public static Completable switchCase(Supplier caseSelector, Map mapOfCases, CompletableSource defaultCase) { - ObjectHelper.requireNonNull(caseSelector, "caseSelector is null"); - ObjectHelper.requireNonNull(mapOfCases, "mapOfCases is null"); - ObjectHelper.requireNonNull(defaultCase, "defaultCase is null"); + Objects.requireNonNull(caseSelector, "caseSelector is null"); + Objects.requireNonNull(mapOfCases, "mapOfCases is null"); + Objects.requireNonNull(defaultCase, "defaultCase is null"); return RxJavaPlugins.onAssembly(new CompletableSwitchCase(caseSelector, mapOfCases, defaultCase)); } @@ -77,9 +76,9 @@ public static Completable switchCase(Supplier caseSelector, */ public static Completable ifThen(BooleanSupplier condition, CompletableSource then, Completable orElse) { - ObjectHelper.requireNonNull(condition, "condition is null"); - ObjectHelper.requireNonNull(then, "then is null"); - ObjectHelper.requireNonNull(orElse, "orElse is null"); + Objects.requireNonNull(condition, "condition is null"); + Objects.requireNonNull(then, "then is null"); + Objects.requireNonNull(orElse, "orElse is null"); return RxJavaPlugins.onAssembly(new CompletableIfThen(condition, then, orElse)); } } \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/StatementFlowable.java b/src/main/java/hu/akarnokd/rxjava3/expr/StatementFlowable.java index b66f00f4..4cf4752e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/StatementFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/StatementFlowable.java @@ -16,14 +16,13 @@ package hu.akarnokd.rxjava3.expr; -import java.util.Map; +import java.util.*; import org.reactivestreams.Publisher; import hu.akarnokd.rxjava3.util.AlwaysTrueBooleanSupplier; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** @@ -107,9 +106,9 @@ public static Flowable switchCase(Supplier caseSelector, public static Flowable switchCase(Supplier caseSelector, Map> mapOfCases, Publisher defaultCase) { - ObjectHelper.requireNonNull(caseSelector, "caseSelector is null"); - ObjectHelper.requireNonNull(mapOfCases, "mapOfCases is null"); - ObjectHelper.requireNonNull(defaultCase, "defaultCase is null"); + Objects.requireNonNull(caseSelector, "caseSelector is null"); + Objects.requireNonNull(mapOfCases, "mapOfCases is null"); + Objects.requireNonNull(defaultCase, "defaultCase is null"); return RxJavaPlugins.onAssembly(new FlowableSwitchCase(caseSelector, mapOfCases, defaultCase)); } @@ -130,8 +129,8 @@ public static Flowable switchCase(Supplier caseSelector, * condition is true */ public static Flowable doWhile(Publisher source, BooleanSupplier postCondition) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(postCondition, "postCondition is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(postCondition, "postCondition is null"); return RxJavaPlugins.onAssembly(new FlowableWhileDoWhile(source, AlwaysTrueBooleanSupplier.INSTANCE, postCondition)); } @@ -150,8 +149,8 @@ public static Flowable doWhile(Publisher source, BooleanSupp * Flowable so long as preCondition is true */ public static Flowable whileDo(Publisher source, BooleanSupplier preCondition) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(preCondition, "preCondition is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(preCondition, "preCondition is null"); return RxJavaPlugins.onAssembly(new FlowableWhileDoWhile(source, preCondition, preCondition)); } @@ -219,9 +218,9 @@ public static Flowable ifThen(BooleanSupplier condition, Publisher Flowable ifThen(BooleanSupplier condition, Publisher then, Flowable orElse) { - ObjectHelper.requireNonNull(condition, "condition is null"); - ObjectHelper.requireNonNull(then, "then is null"); - ObjectHelper.requireNonNull(orElse, "orElse is null"); - return RxJavaPlugins.onAssembly(new FlowableIfThen(condition, then, orElse)); + Objects.requireNonNull(condition, "condition is null"); + Objects.requireNonNull(then, "then is null"); + Objects.requireNonNull(orElse, "orElse is null"); + return RxJavaPlugins.onAssembly(new FlowableIfThen<>(condition, then, orElse)); } } \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/StatementMaybe.java b/src/main/java/hu/akarnokd/rxjava3/expr/StatementMaybe.java index b88520d9..91541ab8 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/StatementMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/StatementMaybe.java @@ -16,11 +16,10 @@ package hu.akarnokd.rxjava3.expr; -import java.util.Map; +import java.util.*; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** @@ -104,9 +103,9 @@ public static Maybe switchCase(Supplier caseSelector, public static Maybe switchCase(Supplier caseSelector, Map> mapOfCases, MaybeSource defaultCase) { - ObjectHelper.requireNonNull(caseSelector, "caseSelector is null"); - ObjectHelper.requireNonNull(mapOfCases, "mapOfCases is null"); - ObjectHelper.requireNonNull(defaultCase, "defaultCase is null"); + Objects.requireNonNull(caseSelector, "caseSelector is null"); + Objects.requireNonNull(mapOfCases, "mapOfCases is null"); + Objects.requireNonNull(defaultCase, "defaultCase is null"); return RxJavaPlugins.onAssembly(new MaybeSwitchCase(caseSelector, mapOfCases, defaultCase)); } @@ -174,9 +173,9 @@ public static Maybe ifThen(BooleanSupplier condition, MaybeSource Maybe ifThen(BooleanSupplier condition, MaybeSource then, Maybe orElse) { - ObjectHelper.requireNonNull(condition, "condition is null"); - ObjectHelper.requireNonNull(then, "then is null"); - ObjectHelper.requireNonNull(orElse, "orElse is null"); - return RxJavaPlugins.onAssembly(new MaybeIfThen(condition, then, orElse)); + Objects.requireNonNull(condition, "condition is null"); + Objects.requireNonNull(then, "then is null"); + Objects.requireNonNull(orElse, "orElse is null"); + return RxJavaPlugins.onAssembly(new MaybeIfThen<>(condition, then, orElse)); } } \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/StatementObservable.java b/src/main/java/hu/akarnokd/rxjava3/expr/StatementObservable.java index 4d49723f..731a6a16 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/StatementObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/StatementObservable.java @@ -16,12 +16,12 @@ package hu.akarnokd.rxjava3.expr; -import java.util.Map; +import java.util.*; import hu.akarnokd.rxjava3.util.AlwaysTrueBooleanSupplier; import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** @@ -105,9 +105,9 @@ public static Observable switchCase(Supplier caseSelector public static Observable switchCase(Supplier caseSelector, Map> mapOfCases, ObservableSource defaultCase) { - ObjectHelper.requireNonNull(caseSelector, "caseSelector is null"); - ObjectHelper.requireNonNull(mapOfCases, "mapOfCases is null"); - ObjectHelper.requireNonNull(defaultCase, "defaultCase is null"); + Objects.requireNonNull(caseSelector, "caseSelector is null"); + Objects.requireNonNull(mapOfCases, "mapOfCases is null"); + Objects.requireNonNull(defaultCase, "defaultCase is null"); return RxJavaPlugins.onAssembly(new ObservableSwitchCase(caseSelector, mapOfCases, defaultCase)); } @@ -128,8 +128,8 @@ public static Observable switchCase(Supplier caseSelector * condition is true */ public static Observable doWhile(ObservableSource source, BooleanSupplier postCondition) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(postCondition, "postCondition is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(postCondition, "postCondition is null"); return RxJavaPlugins.onAssembly(new ObservableWhileDoWhile(source, AlwaysTrueBooleanSupplier.INSTANCE, postCondition)); } @@ -148,8 +148,8 @@ public static Observable doWhile(ObservableSource source, Bo * Observable so long as preCondition is true */ public static Observable whileDo(ObservableSource source, BooleanSupplier preCondition) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(preCondition, "preCondition is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(preCondition, "preCondition is null"); return RxJavaPlugins.onAssembly(new ObservableWhileDoWhile(source, preCondition, preCondition)); } @@ -217,9 +217,9 @@ public static Observable ifThen(BooleanSupplier condition, ObservableSour */ public static Observable ifThen(BooleanSupplier condition, ObservableSource then, Observable orElse) { - ObjectHelper.requireNonNull(condition, "condition is null"); - ObjectHelper.requireNonNull(then, "then is null"); - ObjectHelper.requireNonNull(orElse, "orElse is null"); - return RxJavaPlugins.onAssembly(new ObservableIfThen(condition, then, orElse)); + Objects.requireNonNull(condition, "condition is null"); + Objects.requireNonNull(then, "then is null"); + Objects.requireNonNull(orElse, "orElse is null"); + return RxJavaPlugins.onAssembly(new ObservableIfThen<>(condition, then, orElse)); } } \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava3/expr/StatementSingle.java b/src/main/java/hu/akarnokd/rxjava3/expr/StatementSingle.java index 5245b8e2..6156f82a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/expr/StatementSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/expr/StatementSingle.java @@ -16,11 +16,10 @@ package hu.akarnokd.rxjava3.expr; -import java.util.Map; +import java.util.*; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** @@ -55,9 +54,9 @@ public final class StatementSingle { public static Single switchCase(Supplier caseSelector, Map> mapOfCases, SingleSource defaultCase) { - ObjectHelper.requireNonNull(caseSelector, "caseSelector is null"); - ObjectHelper.requireNonNull(mapOfCases, "mapOfCases is null"); - ObjectHelper.requireNonNull(defaultCase, "defaultCase is null"); + Objects.requireNonNull(caseSelector, "caseSelector is null"); + Objects.requireNonNull(mapOfCases, "mapOfCases is null"); + Objects.requireNonNull(defaultCase, "defaultCase is null"); return RxJavaPlugins.onAssembly(new SingleSwitchCase(caseSelector, mapOfCases, defaultCase)); } @@ -81,9 +80,9 @@ public static Single switchCase(Supplier caseSelector, */ public static Single ifThen(BooleanSupplier condition, SingleSource then, Single orElse) { - ObjectHelper.requireNonNull(condition, "condition is null"); - ObjectHelper.requireNonNull(then, "then is null"); - ObjectHelper.requireNonNull(orElse, "orElse is null"); - return RxJavaPlugins.onAssembly(new SingleIfThen(condition, then, orElse)); + Objects.requireNonNull(condition, "condition is null"); + Objects.requireNonNull(then, "then is null"); + Objects.requireNonNull(orElse, "orElse is null"); + return RxJavaPlugins.onAssembly(new SingleIfThen<>(condition, then, orElse)); } } \ No newline at end of file diff --git a/src/main/java/hu/akarnokd/rxjava3/functions/FunctionTagging.java b/src/main/java/hu/akarnokd/rxjava3/functions/FunctionTagging.java index e6c40bc5..def667e3 100644 --- a/src/main/java/hu/akarnokd/rxjava3/functions/FunctionTagging.java +++ b/src/main/java/hu/akarnokd/rxjava3/functions/FunctionTagging.java @@ -20,7 +20,6 @@ import io.reactivex.rxjava3.exceptions.CompositeException; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** @@ -71,81 +70,81 @@ public static boolean isEnabled() { public static Function tagFunction(Function func, String tag) { if (enabled) { - ObjectHelper.requireNonNull(func, "func is null"); - ObjectHelper.requireNonNull(tag, "tag is null"); - return new TagFunction(func, tag); + Objects.requireNonNull(func, "func is null"); + Objects.requireNonNull(tag, "tag is null"); + return new TagFunction<>(func, tag); } return func; } public static BiFunction tagBiFunction(BiFunction func, String tag) { if (enabled) { - ObjectHelper.requireNonNull(func, "func is null"); - ObjectHelper.requireNonNull(tag, "tag is null"); - return new TagBiFunction(func, tag); + Objects.requireNonNull(func, "func is null"); + Objects.requireNonNull(tag, "tag is null"); + return new TagBiFunction<>(func, tag); } return func; } public static Function3 tagFunction3(Function3 func, String tag) { if (enabled) { - ObjectHelper.requireNonNull(func, "func is null"); - ObjectHelper.requireNonNull(tag, "tag is null"); - return new TagFunction3(func, tag); + Objects.requireNonNull(func, "func is null"); + Objects.requireNonNull(tag, "tag is null"); + return new TagFunction3<>(func, tag); } return func; } public static Function4 tagFunction4(Function4 func, String tag) { if (enabled) { - ObjectHelper.requireNonNull(func, "func is null"); - ObjectHelper.requireNonNull(tag, "tag is null"); - return new TagFunction4(func, tag); + Objects.requireNonNull(func, "func is null"); + Objects.requireNonNull(tag, "tag is null"); + return new TagFunction4<>(func, tag); } return func; } public static Function5 tagFunction5(Function5 func, String tag) { if (enabled) { - ObjectHelper.requireNonNull(func, "func is null"); - ObjectHelper.requireNonNull(tag, "tag is null"); - return new TagFunction5(func, tag); + Objects.requireNonNull(func, "func is null"); + Objects.requireNonNull(tag, "tag is null"); + return new TagFunction5<>(func, tag); } return func; } public static Function6 tagFunction6(Function6 func, String tag) { if (enabled) { - ObjectHelper.requireNonNull(func, "func is null"); - ObjectHelper.requireNonNull(tag, "tag is null"); - return new TagFunction6(func, tag); + Objects.requireNonNull(func, "func is null"); + Objects.requireNonNull(tag, "tag is null"); + return new TagFunction6<>(func, tag); } return func; } public static Function7 tagFunction7(Function7 func, String tag) { if (enabled) { - ObjectHelper.requireNonNull(func, "func is null"); - ObjectHelper.requireNonNull(tag, "tag is null"); - return new TagFunction7(func, tag); + Objects.requireNonNull(func, "func is null"); + Objects.requireNonNull(tag, "tag is null"); + return new TagFunction7<>(func, tag); } return func; } public static Function8 tagFunction8(Function8 func, String tag) { if (enabled) { - ObjectHelper.requireNonNull(func, "func is null"); - ObjectHelper.requireNonNull(tag, "tag is null"); - return new TagFunction8(func, tag); + Objects.requireNonNull(func, "func is null"); + Objects.requireNonNull(tag, "tag is null"); + return new TagFunction8<>(func, tag); } return func; } public static Function9 tagFunction9(Function9 func, String tag) { if (enabled) { - ObjectHelper.requireNonNull(func, "func is null"); - ObjectHelper.requireNonNull(tag, "tag is null"); - return new TagFunction9(func, tag); + Objects.requireNonNull(func, "func is null"); + Objects.requireNonNull(tag, "tag is null"); + return new TagFunction9<>(func, tag); } return func; } @@ -197,7 +196,7 @@ public synchronized Throwable fillInStackTrace() { */ public Throwable appendLast(Throwable ex) { Throwable r = ex; - Set memory = new HashSet(); + Set memory = new HashSet<>(); while (ex.getCause() != null) { if (memory.add(ex)) { ex = ex.getCause(); diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan0.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan0.java index ca7eae06..669fe7c9 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan0.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlan0.java @@ -22,7 +22,7 @@ * Represents an activated plan. */ abstract class ActivePlan0 { - protected final Map joinObservers = new HashMap(); + protected final Map joinObservers = new HashMap<>(); protected abstract void match() throws Throwable; diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlanN.java b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlanN.java index f453eaee..7e9068ee 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlanN.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/ActivePlanN.java @@ -34,7 +34,7 @@ final class ActivePlanN extends ActivePlan0 { Action onCompleted) { this.onNext = onNext; this.onCompleted = onCompleted; - this.observers = new ArrayList>(observers); + this.observers = new ArrayList<>(observers); for (JoinObserver1 jo : this.observers) { addJoinObserver(jo); } diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/JoinObservable.java b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObservable.java index 218ff8ac..f39587c0 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/JoinObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObservable.java @@ -40,7 +40,7 @@ private JoinObservable(Observable o) { * @return the created JoinObservable instance */ public static JoinObservable from(Observable o) { - return new JoinObservable(RxJavaPlugins.onAssembly(o)); + return new JoinObservable<>(RxJavaPlugins.onAssembly(o)); } /** @@ -96,6 +96,7 @@ public static JoinObservable when(Iterable> plans) { * @see RxJava Wiki: when() * @see MSDN: Observable.When */ + @SafeVarargs public static JoinObservable when(Plan... plans) { return from(JoinPatterns.when(plans)); } diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver1.java b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver1.java index 1cb29f3b..01914093 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver1.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObserver1.java @@ -44,8 +44,8 @@ final class JoinObserver1 implements Observer>, JoinObserver JoinObserver1(Observable source, Consumer onError) { this.source = source; this.onError = onError; - queue = new LinkedList>(); - activePlans = new ArrayList(); + queue = new LinkedList<>(); + activePlans = new ArrayList<>(); safeObserver = new InnerObserver(); // add this subscription so it gets unsubscribed when the parent does // add(safeObserver); @@ -138,7 +138,7 @@ public void onNext(Notification args) { queue.add(args); // remark: activePlans might change while iterating - for (ActivePlan0 a : new ArrayList(activePlans)) { + for (ActivePlan0 a : new ArrayList<>(activePlans)) { try { a.match(); } catch (Throwable ex) { diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/JoinPatterns.java b/src/main/java/hu/akarnokd/rxjava3/joins/JoinPatterns.java index 15dd6be2..4b9f5c98 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/JoinPatterns.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/JoinPatterns.java @@ -45,7 +45,7 @@ public static Pattern2 and(/* this */Observable left, Obser if (right == null) { throw new NullPointerException("right"); } - return new Pattern2(left, right); + return new Pattern2<>(left, right); } /** @@ -63,7 +63,7 @@ public static Plan then(/* this */Observable source, Function(source).then(selector); + return new Pattern1<>(source).then(selector); } /** @@ -72,6 +72,7 @@ public static Plan then(/* this */Observable source, Function the result type * @return the Observable coining the plans */ + @SafeVarargs public static Observable when(Plan... plans) { if (plans == null) { throw new NullPointerException("plans"); @@ -92,11 +93,11 @@ public static Observable when(final Iterable> plans) { return new Observable() { @Override protected void subscribeActual(final Observer t1) { - final Map externalSubscriptions = new HashMap(); + final Map externalSubscriptions = new HashMap<>(); final Object gate = new Object(); - final List activePlans = new ArrayList(); + final List activePlans = new ArrayList<>(); - final Observer out = new SafeObserver(new Observer() { + final Observer out = new SafeObserver<>(new Observer() { @Override public void onSubscribe(Disposable d) { @@ -121,7 +122,7 @@ public void onComplete() { } }); - out.onSubscribe(Disposables.empty()); + out.onSubscribe(Disposable.empty()); try { for (Plan plan : plans) { diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern1.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern1.java index c138c839..8b2714a5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern1.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern1.java @@ -49,6 +49,6 @@ public Plan then(Function selector) { if (selector == null) { throw new NullPointerException(); } - return new Plan1(this, selector); + return new Plan1<>(this, selector); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern2.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern2.java index 4cd66239..20a3c5a6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern2.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern2.java @@ -53,7 +53,7 @@ public Pattern3 and(Observable other) { if (other == null) { throw new NullPointerException(); } - return new Pattern3(o1, o2, other); + return new Pattern3<>(o1, o2, other); } /** @@ -71,6 +71,6 @@ public Plan then(BiFunction selector) { if (selector == null) { throw new NullPointerException(); } - return new Plan2(this, selector); + return new Plan2<>(this, selector); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern3.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern3.java index 34b68132..f0250114 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern3.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern3.java @@ -61,7 +61,7 @@ public Pattern4 and(Observable other) { if (other == null) { throw new NullPointerException(); } - return new Pattern4(o1, o2, o3, other); + return new Pattern4<>(o1, o2, o3, other); } /** @@ -79,6 +79,6 @@ public Plan then(Function3 selector) { if (selector == null) { throw new NullPointerException(); } - return new Plan3(this, selector); + return new Plan3<>(this, selector); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern4.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern4.java index d61e0724..72f7a571 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern4.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern4.java @@ -72,7 +72,7 @@ public Pattern5 and(Observable other) { if (other == null) { throw new NullPointerException(); } - return new Pattern5(o1, o2, o3, o4, other); + return new Pattern5<>(o1, o2, o3, o4, other); } /** * Matches when all observable sequences have an available @@ -89,6 +89,6 @@ public Plan then(Function4 selector) { if (selector == null) { throw new NullPointerException(); } - return new Plan4(this, selector); + return new Plan4<>(this, selector); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern5.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern5.java index 6ca962b7..8b2beb8f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern5.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern5.java @@ -80,7 +80,7 @@ public Pattern6 and(Observable other) { if (other == null) { throw new NullPointerException(); } - return new Pattern6(o1, o2, o3, o4, o5, other); + return new Pattern6<>(o1, o2, o3, o4, o5, other); } /** * Matches when all observable sequences have an available @@ -97,6 +97,6 @@ public Plan then(Function5 selector) { if (selector == null) { throw new NullPointerException(); } - return new Plan5(this, selector); + return new Plan5<>(this, selector); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern6.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern6.java index f54b3d49..d418a667 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern6.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern6.java @@ -88,7 +88,7 @@ public Pattern7 and(Observable other) { if (other == null) { throw new NullPointerException(); } - return new Pattern7(o1, o2, o3, o4, o5, o6, other); + return new Pattern7<>(o1, o2, o3, o4, o5, o6, other); } /** * Matches when all observable sequences have an available @@ -105,6 +105,6 @@ public Plan then(Function6 selector) { if (selector == null) { throw new NullPointerException(); } - return new Plan6(this, selector); + return new Plan6<>(this, selector); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern7.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern7.java index 5eefb201..607b7171 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern7.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern7.java @@ -96,7 +96,7 @@ public Pattern8 and(Observable other) { if (other == null) { throw new NullPointerException(); } - return new Pattern8(o1, o2, o3, o4, o5, o6, o7, other); + return new Pattern8<>(o1, o2, o3, o4, o5, o6, o7, other); } /** * Matches when all observable sequences have an available @@ -113,6 +113,6 @@ public Plan then(Function7 selector) { if (selector == null) { throw new NullPointerException(); } - return new Plan7(this, selector); + return new Plan7<>(this, selector); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern8.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern8.java index 30d79113..5e34429e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern8.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern8.java @@ -103,7 +103,7 @@ public Pattern9 and(Observable othe if (other == null) { throw new NullPointerException(); } - return new Pattern9(o1, o2, o3, o4, o5, o6, o7, o8, other); + return new Pattern9<>(o1, o2, o3, o4, o5, o6, o7, o8, other); } /** * Matches when all observable sequences have an available @@ -120,6 +120,6 @@ public Plan then(Function8 selector) { if (selector == null) { throw new NullPointerException(); } - return new Plan8(this, selector); + return new Plan8<>(this, selector); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern9.java b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern9.java index af670548..52640026 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Pattern9.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Pattern9.java @@ -20,7 +20,6 @@ import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.functions.Function9; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Represents a join pattern over observable sequences. @@ -114,7 +113,7 @@ public PatternN and(Observable other) { if (other == null) { throw new NullPointerException(); } - List> list = new ArrayList>(); + List> list = new ArrayList<>(); list.add(o1); list.add(o2); list.add(o3); @@ -139,7 +138,7 @@ public PatternN and(Observable other) { * if selector is null */ public Plan then(Function9 selector) { - ObjectHelper.requireNonNull(selector, "selector is null"); - return new Plan9(this, selector); + Objects.requireNonNull(selector, "selector is null"); + return new Plan9<>(this, selector); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/PatternN.java b/src/main/java/hu/akarnokd/rxjava3/joins/PatternN.java index 4bb569aa..0c9466b3 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/PatternN.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/PatternN.java @@ -32,7 +32,7 @@ public PatternN(List> observables) { } public PatternN(List> observables, Observable other) { - this.observables = new ArrayList>(observables); + this.observables = new ArrayList<>(observables); this.observables.add(other); } @@ -81,6 +81,6 @@ public Plan then(Function selector) { if (selector == null) { throw new NullPointerException(); } - return new PlanN(this, selector); + return new PlanN<>(this, selector); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan.java index f5d1639c..aefe0b6c 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan.java @@ -38,7 +38,7 @@ static final JoinObserver1 createObserver( JoinObserver1 observer; JoinObserver nonGeneric = externalSubscriptions.get(observable); if (nonGeneric == null) { - observer = new JoinObserver1(observable, onError); + observer = new JoinObserver1<>(observable, onError); externalSubscriptions.put(observable, observer); } else { observer = (JoinObserver1) nonGeneric; diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan1.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan1.java index b077cd32..c8181238 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan1.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan1.java @@ -42,9 +42,9 @@ public ActivePlan0 activate(Map externalSubscriptions, fin final JoinObserver1 firstJoinObserver = createObserver(externalSubscriptions, expression.o1(), onError); - final AtomicReference> self = new AtomicReference>(); + final AtomicReference> self = new AtomicReference<>(); - ActivePlan1 activePlan = new ActivePlan1(firstJoinObserver, new Consumer() { + ActivePlan1 activePlan = new ActivePlan1<>(firstJoinObserver, new Consumer() { @Override public void accept(T1 t1) { R result; diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan2.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan2.java index dc706f71..a87273e6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan2.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan2.java @@ -45,9 +45,9 @@ public ActivePlan0 activate(Map externalSubscriptions, final JoinObserver1 jo1 = createObserver(externalSubscriptions, expression.o1(), onError); final JoinObserver1 jo2 = createObserver(externalSubscriptions, expression.o2(), onError); - final AtomicReference> self = new AtomicReference>(); + final AtomicReference> self = new AtomicReference<>(); - ActivePlan2 activePlan = new ActivePlan2(jo1, jo2, new BiConsumer() { + ActivePlan2 activePlan = new ActivePlan2<>(jo1, jo2, new BiConsumer() { @Override public void accept(T1 t1, T2 t2) { R result; diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan3.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan3.java index 1ecd4958..6fe80be8 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan3.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan3.java @@ -48,9 +48,9 @@ public ActivePlan0 activate(Map externalSubscriptions, final JoinObserver1 jo2 = createObserver(externalSubscriptions, expression.o2(), onError); final JoinObserver1 jo3 = createObserver(externalSubscriptions, expression.o3(), onError); - final AtomicReference> self = new AtomicReference>(); + final AtomicReference> self = new AtomicReference<>(); - ActivePlan3 activePlan = new ActivePlan3( + ActivePlan3 activePlan = new ActivePlan3<>( jo1, jo2, jo3, new Consumer3() { @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan4.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan4.java index f36c1567..0a876b15 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan4.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan4.java @@ -50,9 +50,9 @@ public ActivePlan0 activate(Map externalSubscriptions, final JoinObserver1 jo3 = createObserver(externalSubscriptions, expression.o3(), onError); final JoinObserver1 jo4 = createObserver(externalSubscriptions, expression.o4(), onError); - final AtomicReference self = new AtomicReference(); + final AtomicReference self = new AtomicReference<>(); - ActivePlan0 activePlan = new ActivePlan4( + ActivePlan0 activePlan = new ActivePlan4<>( jo1, jo2, jo3, jo4, new Consumer4() { @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan5.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan5.java index 610d2ed9..fe6e89b0 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan5.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan5.java @@ -52,9 +52,9 @@ public ActivePlan0 activate(Map externalSubscriptions, final JoinObserver1 jo4 = createObserver(externalSubscriptions, expression.o4(), onError); final JoinObserver1 jo5 = createObserver(externalSubscriptions, expression.o5(), onError); - final AtomicReference self = new AtomicReference(); + final AtomicReference self = new AtomicReference<>(); - ActivePlan0 activePlan = new ActivePlan5( + ActivePlan0 activePlan = new ActivePlan5<>( jo1, jo2, jo3, jo4, jo5, new Consumer5() { @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan6.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan6.java index d2188bf6..1559978b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan6.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan6.java @@ -54,9 +54,9 @@ public ActivePlan0 activate(Map externalSubscriptions, final JoinObserver1 jo5 = createObserver(externalSubscriptions, expression.o5(), onError); final JoinObserver1 jo6 = createObserver(externalSubscriptions, expression.o6(), onError); - final AtomicReference self = new AtomicReference(); + final AtomicReference self = new AtomicReference<>(); - ActivePlan0 activePlan = new ActivePlan6( + ActivePlan0 activePlan = new ActivePlan6<>( jo1, jo2, jo3, jo4, jo5, jo6, new Consumer6() { @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan7.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan7.java index 47f207a2..815c948d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan7.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan7.java @@ -56,9 +56,9 @@ public ActivePlan0 activate(Map externalSubscriptions, final JoinObserver1 jo6 = createObserver(externalSubscriptions, expression.o6(), onError); final JoinObserver1 jo7 = createObserver(externalSubscriptions, expression.o7(), onError); - final AtomicReference self = new AtomicReference(); + final AtomicReference self = new AtomicReference<>(); - ActivePlan0 activePlan = new ActivePlan7( + ActivePlan0 activePlan = new ActivePlan7<>( jo1, jo2, jo3, jo4, jo5, jo6, jo7, new Consumer7() { @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan8.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan8.java index 6f72fbf1..abe793fc 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan8.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan8.java @@ -58,9 +58,9 @@ public ActivePlan0 activate(Map externalSubscriptions, final JoinObserver1 jo7 = createObserver(externalSubscriptions, expression.o7(), onError); final JoinObserver1 jo8 = createObserver(externalSubscriptions, expression.o8(), onError); - final AtomicReference self = new AtomicReference(); + final AtomicReference self = new AtomicReference<>(); - ActivePlan0 activePlan = new ActivePlan8( + ActivePlan0 activePlan = new ActivePlan8<>( jo1, jo2, jo3, jo4, jo5, jo6, jo7, jo8, new Consumer8() { @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/Plan9.java b/src/main/java/hu/akarnokd/rxjava3/joins/Plan9.java index 05030278..6f378d09 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/Plan9.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/Plan9.java @@ -60,9 +60,9 @@ public ActivePlan0 activate(Map externalSubscriptions, final JoinObserver1 jo8 = createObserver(externalSubscriptions, expression.o8(), onError); final JoinObserver1 jo9 = createObserver(externalSubscriptions, expression.o9(), onError); - final AtomicReference self = new AtomicReference(); + final AtomicReference self = new AtomicReference<>(); - ActivePlan0 activePlan = new ActivePlan9( + ActivePlan0 activePlan = new ActivePlan9<>( jo1, jo2, jo3, jo4, jo5, jo6, jo7, jo8, jo9, new Consumer9() { @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/PlanN.java b/src/main/java/hu/akarnokd/rxjava3/joins/PlanN.java index 6f4d65e1..4b277b34 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/PlanN.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/PlanN.java @@ -40,11 +40,11 @@ public ActivePlan0 activate(Map externalSubscriptions, final Observer observer, final Consumer deactivate) { Consumer onError = onErrorFrom(observer); - final List> observers = new ArrayList>(); + final List> observers = new ArrayList<>(); for (int i = 0; i < expression.size(); i++) { observers.add(createObserver(externalSubscriptions, expression.get(i), onError)); } - final AtomicReference self = new AtomicReference(); + final AtomicReference self = new AtomicReference<>(); ActivePlanN activePlan = new ActivePlanN(observers, new Consumer() { @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/math/MathFlowable.java b/src/main/java/hu/akarnokd/rxjava3/math/MathFlowable.java index 650e13bc..e01b5ca5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/MathFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/MathFlowable.java @@ -55,7 +55,7 @@ public static > Flowable max(Publisher sou } public static Flowable max(Publisher source, Comparator comparator) { - return RxJavaPlugins.onAssembly(new FlowableMinMax(source, comparator, -1)); + return RxJavaPlugins.onAssembly(new FlowableMinMax<>(source, comparator, -1)); } public static > Flowable min(Publisher source) { @@ -64,7 +64,7 @@ public static > Flowable min(Publisher sou } public static Flowable min(Publisher source, Comparator comparator) { - return RxJavaPlugins.onAssembly(new FlowableMinMax(source, comparator, 1)); + return RxJavaPlugins.onAssembly(new FlowableMinMax<>(source, comparator, 1)); } @SuppressWarnings("unchecked") diff --git a/src/main/java/hu/akarnokd/rxjava3/math/MathObservable.java b/src/main/java/hu/akarnokd/rxjava3/math/MathObservable.java index d4607214..d486efad 100644 --- a/src/main/java/hu/akarnokd/rxjava3/math/MathObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/math/MathObservable.java @@ -53,7 +53,7 @@ public static > Observable max(ObservableSour } public static Observable max(ObservableSource source, Comparator comparator) { - return RxJavaPlugins.onAssembly(new ObservableMinMax(source, comparator, -1)); + return RxJavaPlugins.onAssembly(new ObservableMinMax<>(source, comparator, -1)); } public static > Observable min(ObservableSource source) { @@ -62,7 +62,7 @@ public static > Observable min(ObservableSour } public static Observable min(ObservableSource source, Comparator comparator) { - return RxJavaPlugins.onAssembly(new ObservableMinMax(source, comparator, 1)); + return RxJavaPlugins.onAssembly(new ObservableMinMax<>(source, comparator, 1)); } @SuppressWarnings("unchecked") diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java b/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java index fefa3195..cd13f5f0 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java @@ -63,7 +63,7 @@ public BasicMergeSubscription(Subscriber downstream, Comparator[] subs = new InnerQueuedSubscriber[n]; for (int i = 0; i < n; i++) { - subs[i] = new InnerQueuedSubscriber(this, prefetch); + subs[i] = new InnerQueuedSubscriber<>(this, prefetch); } this.subscribers = subs; this.requested = new AtomicLong(); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletable.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletable.java index a930fb58..0ef8586c 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalCompletable.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -23,7 +24,6 @@ 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 the terminal signals of the upstream into CompletableSources and consumes them. @@ -96,7 +96,7 @@ public void onComplete() { CompletableSource next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null CompletableSource"); + next = Objects.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -111,7 +111,7 @@ public void onError(Throwable e) { CompletableSource next; try { - next = ObjectHelper.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null CompletableSource"); + next = Objects.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowable.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowable.java index 05ae5fa8..c4804e31 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalFlowable.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -25,7 +26,6 @@ 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.subscriptions.SubscriptionHelper; /** @@ -51,12 +51,12 @@ final class CompletableFlatMapSignalFlowable extends Flowable @Override public Flowable apply(Completable t) { - return new CompletableFlatMapSignalFlowable(t, onCompleteHandler, onErrorHandler); + return new CompletableFlatMapSignalFlowable<>(t, onCompleteHandler, onErrorHandler); } @Override protected void subscribeActual(Subscriber subscriber) { - source.subscribe(new FlatMapSignalConsumer(subscriber, onCompleteHandler, onErrorHandler)); + source.subscribe(new FlatMapSignalConsumer<>(subscriber, onCompleteHandler, onErrorHandler)); } static final class FlatMapSignalConsumer @@ -73,7 +73,7 @@ static final class FlatMapSignalConsumer FlatMapSignalConsumer(Subscriber downstream, Supplier> onCompleteHandler, Function> onErrorHandler) { - this.consumer = new SignalConsumer(downstream); + this.consumer = new SignalConsumer<>(downstream); this.onCompleteHandler = onCompleteHandler; this.onErrorHandler = onErrorHandler; } @@ -102,7 +102,7 @@ public void onComplete() { Publisher next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null Publisher"); + next = Objects.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -117,7 +117,7 @@ public void onError(Throwable e) { Publisher next; try { - next = ObjectHelper.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null Publisher"); + next = Objects.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybe.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybe.java index 69fa953b..b76d2c88 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalMaybe.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -23,7 +24,6 @@ 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 the terminal signals of the upstream into MaybeSources and consumes them. @@ -48,12 +48,12 @@ final class CompletableFlatMapSignalMaybe extends Maybe @Override public Maybe apply(Completable t) { - return new CompletableFlatMapSignalMaybe(t, onCompleteHandler, onErrorHandler); + return new CompletableFlatMapSignalMaybe<>(t, onCompleteHandler, onErrorHandler); } @Override protected void subscribeActual(MaybeObserver observer) { - source.subscribe(new FlatMapSignalConsumer(observer, onCompleteHandler, onErrorHandler)); + source.subscribe(new FlatMapSignalConsumer<>(observer, onCompleteHandler, onErrorHandler)); } static final class FlatMapSignalConsumer @@ -68,7 +68,7 @@ static final class FlatMapSignalConsumer FlatMapSignalConsumer(MaybeObserver downstream, Supplier> onCompleteHandler, Function> onErrorHandler) { - this.consumer = new SignalConsumer(downstream); + this.consumer = new SignalConsumer<>(downstream); this.onCompleteHandler = onCompleteHandler; this.onErrorHandler = onErrorHandler; } @@ -96,7 +96,7 @@ public void onComplete() { MaybeSource next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null MaybeSource"); + next = Objects.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -111,7 +111,7 @@ public void onError(Throwable e) { MaybeSource next; try { - next = ObjectHelper.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null MaybeSource"); + next = Objects.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservable.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservable.java index d451512a..a371f48b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalObservable.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -23,7 +24,6 @@ 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 the terminal signals of the upstream into ObservableSources and consumes them. @@ -48,12 +48,12 @@ final class CompletableFlatMapSignalObservable extends Observable @Override public Observable apply(Completable t) { - return new CompletableFlatMapSignalObservable(t, onCompleteHandler, onErrorHandler); + return new CompletableFlatMapSignalObservable<>(t, onCompleteHandler, onErrorHandler); } @Override protected void subscribeActual(Observer observer) { - source.subscribe(new FlatMapSignalConsumer(observer, onCompleteHandler, onErrorHandler)); + source.subscribe(new FlatMapSignalConsumer<>(observer, onCompleteHandler, onErrorHandler)); } static final class FlatMapSignalConsumer @@ -68,7 +68,7 @@ static final class FlatMapSignalConsumer FlatMapSignalConsumer(Observer downstream, Supplier> onCompleteHandler, Function> onErrorHandler) { - this.consumer = new SignalConsumer(downstream); + this.consumer = new SignalConsumer<>(downstream); this.onCompleteHandler = onCompleteHandler; this.onErrorHandler = onErrorHandler; } @@ -96,7 +96,7 @@ public void onComplete() { ObservableSource next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null ObservableSource"); + next = Objects.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -111,7 +111,7 @@ public void onError(Throwable e) { ObservableSource next; try { - next = ObjectHelper.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null ObservableSource"); + next = Objects.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingle.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingle.java index 232edc37..1a2ff7e4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableFlatMapSignalSingle.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -23,7 +24,6 @@ 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 the terminal signals of the upstream into SingleSources and consumes them. @@ -48,12 +48,12 @@ final class CompletableFlatMapSignalSingle extends Single @Override public Single apply(Completable t) { - return new CompletableFlatMapSignalSingle(t, onCompleteHandler, onErrorHandler); + return new CompletableFlatMapSignalSingle<>(t, onCompleteHandler, onErrorHandler); } @Override protected void subscribeActual(SingleObserver observer) { - source.subscribe(new FlatMapSignalConsumer(observer, onCompleteHandler, onErrorHandler)); + source.subscribe(new FlatMapSignalConsumer<>(observer, onCompleteHandler, onErrorHandler)); } static final class FlatMapSignalConsumer @@ -68,7 +68,7 @@ static final class FlatMapSignalConsumer FlatMapSignalConsumer(SingleObserver downstream, Supplier> onCompleteHandler, Function> onErrorHandler) { - this.consumer = new SignalConsumer(downstream); + this.consumer = new SignalConsumer<>(downstream); this.onCompleteHandler = onCompleteHandler; this.onErrorHandler = onErrorHandler; } @@ -96,7 +96,7 @@ public void onComplete() { SingleSource next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null SingleSource"); + next = Objects.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -111,7 +111,7 @@ public void onError(Throwable e) { SingleSource next; try { - next = ObjectHelper.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null SingleSource"); + next = Objects.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableTransformers.java b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableTransformers.java index 0fc0d2f0..de56ff64 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/CompletableTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/CompletableTransformers.java @@ -16,9 +16,10 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; + import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Additional operators in the form of {@link CompletableTransformer}, @@ -48,8 +49,8 @@ private CompletableTransformers() { public static CompletableTransformer flatMap( Supplier onCompleteHandler, Function onErrorHandler) { - ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); - ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); + Objects.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); + Objects.requireNonNull(onErrorHandler, "onErrorHandler is null"); return new CompletableFlatMapSignalCompletable(null, onCompleteHandler, onErrorHandler); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/Completables.java b/src/main/java/hu/akarnokd/rxjava3/operators/Completables.java index b33ba4bf..7d9f1fed 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/Completables.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/Completables.java @@ -16,11 +16,12 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; + import org.reactivestreams.Publisher; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Additional operators in the form of {@link CompletableConverter}s, @@ -51,9 +52,9 @@ private Completables() { public static CompletableConverter> flatMapMaybe( Supplier> onCompleteHandler, Function> onErrorHandler) { - ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); - ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); - return new CompletableFlatMapSignalMaybe(null, onCompleteHandler, onErrorHandler); + Objects.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); + Objects.requireNonNull(onErrorHandler, "onErrorHandler is null"); + return new CompletableFlatMapSignalMaybe<>(null, onCompleteHandler, onErrorHandler); } /** @@ -70,9 +71,9 @@ public static CompletableConverter> flatMapMaybe( public static CompletableConverter> flatMapSingle( Supplier> onCompleteHandler, Function> onErrorHandler) { - ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); - ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); - return new CompletableFlatMapSignalSingle(null, onCompleteHandler, onErrorHandler); + Objects.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); + Objects.requireNonNull(onErrorHandler, "onErrorHandler is null"); + return new CompletableFlatMapSignalSingle<>(null, onCompleteHandler, onErrorHandler); } /** @@ -89,9 +90,9 @@ public static CompletableConverter> flatMapSingle( public static CompletableConverter> flatMapObservable( Supplier> onCompleteHandler, Function> onErrorHandler) { - ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); - ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); - return new CompletableFlatMapSignalObservable(null, onCompleteHandler, onErrorHandler); + Objects.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); + Objects.requireNonNull(onErrorHandler, "onErrorHandler is null"); + return new CompletableFlatMapSignalObservable<>(null, onCompleteHandler, onErrorHandler); } /** @@ -108,8 +109,8 @@ public static CompletableConverter> flatMapObservable( public static CompletableConverter> flatMapFlowable( Supplier> onCompleteHandler, Function> onErrorHandler) { - ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); - ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); - return new CompletableFlatMapSignalFlowable(null, onCompleteHandler, onErrorHandler); + Objects.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); + Objects.requireNonNull(onErrorHandler, "onErrorHandler is null"); + return new CompletableFlatMapSignalFlowable<>(null, onCompleteHandler, onErrorHandler); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicate.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicate.java index 7132b8b1..32348edd 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicate.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicate.java @@ -16,14 +16,13 @@ package hu.akarnokd.rxjava3.operators; -import java.util.Collection; +import java.util.*; import org.reactivestreams.*; 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.ConditionalSubscriber; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -69,19 +68,19 @@ protected void subscribeActual(Subscriber s) { C buffer; try { - buffer = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer"); + buffer = Objects.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); return; } - source.subscribe(new BufferPredicateSubscriber(s, buffer, predicate, mode, bufferSupplier)); + source.subscribe(new BufferPredicateSubscriber<>(s, buffer, predicate, mode, bufferSupplier)); } @Override public Publisher apply(Flowable upstream) { - return new FlowableBufferPredicate(upstream, predicate, mode, bufferSupplier); + return new FlowableBufferPredicate<>(upstream, predicate, mode, bufferSupplier); } static final class BufferPredicateSubscriber> diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCacheLast.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCacheLast.java index ed6ed97c..9f903cec 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCacheLast.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCacheLast.java @@ -46,7 +46,7 @@ final class FlowableCacheLast extends Flowable @Override public Publisher apply(Flowable upstream) { - return new FlowableCacheLast(upstream); + return new FlowableCacheLast<>(upstream); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCoalesce.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCoalesce.java index 23511ff5..3ac13be4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCoalesce.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCoalesce.java @@ -55,12 +55,12 @@ final class FlowableCoalesce extends Flowable implements FlowableTransf @Override public Publisher apply(Flowable upstream) { - return new FlowableCoalesce(upstream, containerSupplier, coalescer, bufferSize); + return new FlowableCoalesce<>(upstream, containerSupplier, coalescer, bufferSize); } @Override protected void subscribeActual(Subscriber s) { - source.subscribe(new CoalesceSubscriber(s, containerSupplier, coalescer, bufferSize)); + source.subscribe(new CoalesceSubscriber<>(s, containerSupplier, coalescer, bufferSize)); } static final class CoalesceSubscriber extends AtomicInteger @@ -144,7 +144,7 @@ public void onNext(T t) { } else { SimplePlainQueue q = queue; if (q == null) { - q = new SpscLinkedArrayQueue(bufferSize); + q = new SpscLinkedArrayQueue<>(bufferSize); queue = q; } q.offer(t); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirst.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirst.java index 927b42b8..3a797e5f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirst.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirst.java @@ -52,7 +52,7 @@ final class FlowableDebounceFirst extends Flowable @Override public Publisher apply(Flowable upstream) { - return new FlowableDebounceFirst(upstream, timeout, unit, scheduler); + return new FlowableDebounceFirst<>(upstream, timeout, unit, scheduler); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableErrorJump.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableErrorJump.java index 82eb1730..20aed078 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableErrorJump.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableErrorJump.java @@ -16,13 +16,13 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** @@ -49,18 +49,18 @@ final class FlowableErrorJump extends Flowable implements FlowableTrans @Override public Publisher apply(Flowable upstream) { - return new FlowableErrorJump(upstream, transformer); + return new FlowableErrorJump<>(upstream, transformer); } @Override protected void subscribeActual(Subscriber s) { - ErrorJumpFront front = new ErrorJumpFront(source, s); + ErrorJumpFront front = new ErrorJumpFront<>(source, s); Publisher downstream; try { - downstream = ObjectHelper.requireNonNull( + downstream = Objects.requireNonNull( transformer.apply(front), "The transformer returned a null Publisher"); } catch (Throwable ex) { @@ -84,7 +84,7 @@ static final class ErrorJumpFront extends Flowable implements FlowableS ErrorJumpFront(Flowable source, Subscriber downstream) { this.source = source; - this.middle = new AtomicReference>(); + this.middle = new AtomicReference<>(); this.end = new EndSubscriber(downstream); } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableEvery.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableEvery.java index 1e250dd5..666cc1a4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableEvery.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableEvery.java @@ -47,7 +47,7 @@ protected void subscribeActual(Subscriber s) { @Override public Publisher apply(Flowable upstream) { - return new FlowableEvery(upstream, keep); + return new FlowableEvery<>(upstream, keep); } static final class EverySubscriber implements Subscriber, Subscription { diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java index cdf296d6..ae8aff7e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.operators; -import java.util.ArrayDeque; +import java.util.*; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -24,7 +24,6 @@ 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.SimplePlainQueue; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.*; @@ -59,12 +58,12 @@ final class FlowableExpand extends Flowable implements FlowableTransformer @Override protected void subscribeActual(Subscriber s) { if (strategy != ExpandStrategy.DEPTH_FIRST) { - ExpandBreadthSubscriber parent = new ExpandBreadthSubscriber(s, expander, capacityHint, delayErrors); + ExpandBreadthSubscriber parent = new ExpandBreadthSubscriber<>(s, expander, capacityHint, delayErrors); parent.queue.offer(source); s.onSubscribe(parent); parent.drainQueue(); } else { - ExpandDepthSubscription parent = new ExpandDepthSubscription(s, expander, capacityHint, delayErrors); + ExpandDepthSubscription parent = new ExpandDepthSubscription<>(s, expander, capacityHint, delayErrors); parent.source = source; s.onSubscribe(parent); } @@ -72,7 +71,7 @@ protected void subscribeActual(Subscriber s) { @Override public Publisher apply(Flowable upstream) { - return new FlowableExpand(upstream, expander, strategy, capacityHint, delayErrors); + return new FlowableExpand<>(upstream, expander, strategy, capacityHint, delayErrors); } static final class ExpandBreadthSubscriber extends SubscriptionArbiter implements FlowableSubscriber { @@ -101,7 +100,7 @@ static final class ExpandBreadthSubscriber extends SubscriptionArbiter implem this.downstream = downstream; this.expander = expander; this.wip = new AtomicInteger(); - this.queue = new SpscLinkedArrayQueue>(capacityHint); + this.queue = new SpscLinkedArrayQueue<>(capacityHint); this.errors = new AtomicThrowable(); this.delayErrors = delayErrors; } @@ -118,7 +117,7 @@ public void onNext(T t) { Publisher p; try { - p = ObjectHelper.requireNonNull(expander.apply(t), "The expander returned a null Publisher"); + p = Objects.requireNonNull(expander.apply(t), "The expander returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); super.cancel(); @@ -218,11 +217,11 @@ static final class ExpandDepthSubscription int capacityHint, boolean delayErrors) { this.downstream = downstream; this.expander = expander; - this.subscriptionStack = new ArrayDeque(); + this.subscriptionStack = new ArrayDeque<>(); this.error = new AtomicThrowable(); this.active = new AtomicInteger(); this.requested = new AtomicLong(); - this.current = new AtomicReference(); + this.current = new AtomicReference<>(); this.delayErrors = delayErrors; } @@ -342,7 +341,7 @@ void drainQueue() { e++; try { - p = ObjectHelper.requireNonNull(expander.apply(v), "The expander returned a null Publisher"); + p = Objects.requireNonNull(expander.apply(v), "The expander returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); p = null; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsync.java index 3fcb3f4f..941c590b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFilterAsync.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -25,7 +26,6 @@ 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.*; @@ -55,7 +55,7 @@ final class FlowableFilterAsync extends Flowable implements FlowableTransf @Override public Publisher apply(Flowable upstream) { - return new FlowableFilterAsync(upstream, asyncPredicate, bufferSize); + return new FlowableFilterAsync<>(upstream, asyncPredicate, bufferSize); } @Override @@ -117,7 +117,7 @@ static final class FilterAsyncSubscriber this.errors = new AtomicThrowable(); this.requested = new AtomicLong(); this.wip = new AtomicInteger(); - this.current = new AtomicReference>(); + this.current = new AtomicReference<>(); } @Override @@ -243,7 +243,7 @@ void drain() { Publisher p; try { - p = ObjectHelper.requireNonNull(asyncPredicate.apply(t), "The asyncPredicate returned a null value"); + p = Objects.requireNonNull(asyncPredicate.apply(t), "The asyncPredicate returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); errors.tryAddThrowableOrReport(ex); @@ -267,7 +267,7 @@ void drain() { e++; } } else { - InnerSubscriber inner = new InnerSubscriber(this); + InnerSubscriber inner = new InnerSubscriber<>(this); if (current.compareAndSet(null, inner)) { state = STATE_RUNNING; p.subscribe(inner); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java index b7596054..f8eddae3 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java @@ -62,7 +62,7 @@ protected void subscribeActual(Subscriber s) { @Override public Publisher apply(Flowable upstream) { - return new FlowableFlatMapAsync(upstream, mapper, maxConcurrency, bufferSize, depthFirst, scheduler); + return new FlowableFlatMapAsync<>(upstream, mapper, maxConcurrency, bufferSize, depthFirst, scheduler); } static final class FlatMapOuterSubscriber extends BaseFlatMapOuterSubscriber implements Runnable { diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java index ba389b06..f2ec65e5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -23,7 +24,6 @@ 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.SubscriptionHelper; @@ -65,7 +65,7 @@ protected void subscribeActual(Subscriber s) { @Override public Publisher apply(Flowable upstream) { - return new FlowableFlatMapSync(upstream, mapper, maxConcurrency, bufferSize, depthFirst); + return new FlowableFlatMapSync<>(upstream, mapper, maxConcurrency, bufferSize, depthFirst); } interface FlatMapInnerSubscriberSupport { @@ -131,7 +131,7 @@ abstract static class BaseFlatMapOuterSubscriber extends AtomicInteger this.active = new AtomicLong(); int c = Pow2.roundToPowerOfTwo(maxConcurrency); - this.subscribers = new AtomicReferenceArray>(c); + this.subscribers = new AtomicReferenceArray<>(c); this.freelist = new AtomicIntegerArray(c + CONSUMER_INDEX + 16); } @@ -152,7 +152,7 @@ public final void onNext(T t) { Publisher p; try { - p = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null value"); + p = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); @@ -175,7 +175,7 @@ public final void onNext(T t) { idx = ci + 1; } - FlatMapInnerSubscriber inner = new FlatMapInnerSubscriber(this, bufferSize, idx); + FlatMapInnerSubscriber inner = new FlatMapInnerSubscriber<>(this, bufferSize, idx); s.lazySet(idx - 1, inner); fl.lazySet(m + CONSUMER_INDEX, (ci + 1) & (m - 1)); @@ -692,7 +692,7 @@ void producedOne() { SimpleQueue queue() { SimpleQueue q = queue; if (q == null) { - q = new SpscArrayQueue(bufferSize); + q = new SpscArrayQueue<>(bufferSize); queue = q; } return q; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsync.java index 3d840c48..09dba1ad 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsync.java @@ -65,7 +65,7 @@ protected void subscribeActual(Subscriber s) { return; } - GenerateAsyncSubscription parent = new GenerateAsyncSubscription(s, state, asyncGenerator, stateCleanup); + GenerateAsyncSubscription parent = new GenerateAsyncSubscription<>(s, state, asyncGenerator, stateCleanup); s.onSubscribe(parent); parent.moveNext(); } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableIndexOf.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableIndexOf.java index bb1a88e4..262ace97 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableIndexOf.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableIndexOf.java @@ -43,7 +43,7 @@ final class FlowableIndexOf extends Flowable @Override public Publisher apply(Flowable upstream) { - return new FlowableIndexOf(upstream, predicate); + return new FlowableIndexOf<>(upstream, predicate); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapAsync.java index 2822d004..f85af8de 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapAsync.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -23,7 +24,6 @@ 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; @@ -60,7 +60,7 @@ final class FlowableMapAsync extends Flowable implements FlowableTra @Override public Publisher apply(Flowable upstream) { - return new FlowableMapAsync(upstream, mapper, combiner, bufferSize); + return new FlowableMapAsync<>(upstream, mapper, combiner, bufferSize); } @Override @@ -134,7 +134,7 @@ static final class MapAsyncSubscriber this.error = new AtomicThrowable(); this.requested = new AtomicLong(); this.wip = new AtomicInteger(); - this.current = new AtomicReference>(); + this.current = new AtomicReference<>(); } @Override @@ -259,7 +259,7 @@ void drain() { Publisher p; try { - p = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null value"); + p = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); error.tryAddThrowableOrReport(ex); @@ -274,7 +274,7 @@ void drain() { @SuppressWarnings("unchecked") U u = ((Supplier)p).get(); if (u != null) { - v = ObjectHelper.requireNonNull(combiner.apply(t, u), "The combiner returned a null value"); + v = Objects.requireNonNull(combiner.apply(t, u), "The combiner returned a null value"); } else { v = null; } @@ -289,7 +289,7 @@ void drain() { e++; } } else { - InnerSubscriber inner = new InnerSubscriber(this); + InnerSubscriber inner = new InnerSubscriber<>(this); if (current.compareAndSet(null, inner)) { state = STATE_RUNNING; p.subscribe(inner); @@ -313,7 +313,7 @@ void drain() { R v; try { - v = ObjectHelper.requireNonNull(combiner.apply(t, u), "The combiner returned a null value"); + v = Objects.requireNonNull(combiner.apply(t, u), "The combiner returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); error.tryAddThrowableOrReport(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapFilter.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapFilter.java index a8075602..3930f1fb 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapFilter.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapFilter.java @@ -44,7 +44,7 @@ final class FlowableMapFilter extends Flowable implements FlowableTrans @Override public Publisher apply(Flowable upstream) { - return new FlowableMapFilter(upstream, consumer); + return new FlowableMapFilter<>(upstream, consumer); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeout.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeout.java index e5ac4dc7..d774cf4d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeout.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeout.java @@ -62,7 +62,7 @@ final class FlowableOnBackpressureTimeout extends Flowable @Override public Publisher apply(Flowable upstream) { - return new FlowableOnBackpressureTimeout(upstream, maxSize, timeout, unit, scheduler, onEvict); + return new FlowableOnBackpressureTimeout<>(upstream, maxSize, timeout, unit, scheduler, onEvict); } @Override @@ -108,7 +108,7 @@ static final class OnBackpressureTimeoutSubscriber this.worker = worker; this.onEvict = onEvict; this.requested = new AtomicLong(); - this.queue = new ArrayDeque(); + this.queue = new ArrayDeque<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMerge.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMerge.java index a9e1ecc1..db2935d2 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMerge.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMerge.java @@ -22,7 +22,6 @@ import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.exceptions.Exceptions; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** @@ -69,7 +68,7 @@ protected void subscribeActual(Subscriber s) { if (n == array.length) { array = Arrays.copyOf(array, n << 1); } - array[n++] = ObjectHelper.requireNonNull(p, "a source is null"); + array[n++] = Objects.requireNonNull(p, "a source is null"); } } catch (Throwable ex) { Exceptions.throwIfFatal(ex); @@ -90,7 +89,7 @@ protected void subscribeActual(Subscriber s) { return; } - BasicMergeSubscription parent = new BasicMergeSubscription(s, comparator, n, prefetch, delayErrors); + BasicMergeSubscription parent = new BasicMergeSubscription<>(s, comparator, n, prefetch, delayErrors); s.onSubscribe(parent); parent.subscribe(array, n); } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollect.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollect.java index 6661cae1..3e068c74 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollect.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowablePartialCollect.java @@ -65,12 +65,12 @@ final class FlowablePartialCollect extends Flowable @Override public Publisher apply(Flowable upstream) { - return new FlowablePartialCollect(upstream, handler, cleaner, prefetch); + return new FlowablePartialCollect<>(upstream, handler, cleaner, prefetch); } @Override protected void subscribeActual(Subscriber s) { - source.subscribe(new PartialCollectSubscriber(s, handler, cleaner, prefetch)); + source.subscribe(new PartialCollectSubscriber<>(s, handler, cleaner, prefetch)); } static final class PartialCollectSubscriber @@ -124,7 +124,7 @@ static final class PartialCollectSubscriber this.cleaner = cleaner; this.prefetch = prefetch; this.errors = new AtomicThrowable(); - this.queue = new AtomicReferenceArray(Pow2.roundToPowerOfTwo(prefetch)); + this.queue = new AtomicReferenceArray<>(Pow2.roundToPowerOfTwo(prefetch)); this.producerIndex = new AtomicLong(); this.requested = new AtomicLong(); this.limit = prefetch - (prefetch >> 2); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatScalar.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatScalar.java index 6fe0d520..80fd3bf5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatScalar.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatScalar.java @@ -41,9 +41,9 @@ final class FlowableRepeatScalar extends Flowable { @Override protected void subscribeActual(Subscriber s) { if (s instanceof ConditionalSubscriber) { - s.onSubscribe(new RepeatScalarConditionalSubscription((ConditionalSubscriber)s, value)); + s.onSubscribe(new RepeatScalarConditionalSubscription<>((ConditionalSubscriber)s, value)); } else { - s.onSubscribe(new RepeatScalarSubscription(s, value)); + s.onSubscribe(new RepeatScalarSubscription<>(s, value)); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatSupplier.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatSupplier.java index a31e0d2b..0d789715 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatSupplier.java @@ -16,12 +16,13 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; + import org.reactivestreams.Subscriber; 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.fuseable.ConditionalSubscriber; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.BackpressureHelper; @@ -44,9 +45,9 @@ final class FlowableRepeatSupplier extends Flowable { @Override protected void subscribeActual(Subscriber s) { if (s instanceof ConditionalSubscriber) { - s.onSubscribe(new RepeatCallableConditionalSubscription((ConditionalSubscriber)s, supplier)); + s.onSubscribe(new RepeatCallableConditionalSubscription<>((ConditionalSubscriber)s, supplier)); } else { - s.onSubscribe(new RepeatCallableSubscription(s, supplier)); + s.onSubscribe(new RepeatCallableSubscription<>(s, supplier)); } } @@ -88,7 +89,7 @@ void fastpath() { T v; try { - v = ObjectHelper.requireNonNull(c.get(), "The supplier returned a null value"); + v = Objects.requireNonNull(c.get(), "The supplier returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); @@ -114,7 +115,7 @@ void slowpath(long r) { T v; try { - v = ObjectHelper.requireNonNull(c.get(), "The supplier returned a null value"); + v = Objects.requireNonNull(c.get(), "The supplier returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); @@ -156,7 +157,7 @@ public int requestFusion(int mode) { @Override public T poll() throws Throwable { - return ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null value"); + return Objects.requireNonNull(supplier.get(), "The supplier returned a null value"); } @Override @@ -208,7 +209,7 @@ void fastpath() { T v; try { - v = ObjectHelper.requireNonNull(c.get(), "The supplier returned a null value"); + v = Objects.requireNonNull(c.get(), "The supplier returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); @@ -234,7 +235,7 @@ void slowpath(long r) { T v; try { - v = ObjectHelper.requireNonNull(c.get(), "The supplier returned a null value"); + v = Objects.requireNonNull(c.get(), "The supplier returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); @@ -276,7 +277,7 @@ public int requestFusion(int mode) { @Override public T poll() throws Throwable { - return ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null value"); + return Objects.requireNonNull(supplier.get(), "The supplier returned a null value"); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOn.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOn.java index cd0ed7a8..ba799091 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestObserveOn.java @@ -44,7 +44,7 @@ final class FlowableRequestObserveOn extends Flowable implements FlowableT @Override public Publisher apply(Flowable upstream) { - return new FlowableRequestObserveOn(upstream, scheduler); + return new FlowableRequestObserveOn<>(upstream, scheduler); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSample.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSample.java index abb36adc..20ce91de 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSample.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSample.java @@ -45,12 +45,12 @@ final class FlowableRequestSample extends Flowable implements FlowableTran @Override public Publisher apply(Flowable upstream) { - return new FlowableRequestSample(upstream, other); + return new FlowableRequestSample<>(upstream, other); } @Override protected void subscribeActual(Subscriber s) { - RequestSample parent = new RequestSample(s); + RequestSample parent = new RequestSample<>(s); s.onSubscribe(parent); other.subscribe(parent.otherConsumer); source.subscribe(parent); @@ -81,7 +81,7 @@ static final class RequestSample this.downstream = downstream; this.downstreamRequests = new AtomicLong(); this.upstreamRequests = new AtomicLong(); - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); this.otherConsumer = new OtherConsumer(this); this.error = new AtomicThrowable(); this.wip = new AtomicInteger(); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTime.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTime.java index d4ecc9e4..2cbe3522 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTime.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRequestSampleTime.java @@ -59,12 +59,12 @@ final class FlowableRequestSampleTime extends Flowable implements Flowable @Override public Publisher apply(Flowable upstream) { - return new FlowableRequestSampleTime(upstream, initialDelay, period, unit, scheduler); + return new FlowableRequestSampleTime<>(upstream, initialDelay, period, unit, scheduler); } @Override protected void subscribeActual(Subscriber s) { - RequestSample parent = new RequestSample(s); + RequestSample parent = new RequestSample<>(s); s.onSubscribe(parent); DisposableHelper.setOnce(parent.timer, scheduler.schedulePeriodicallyDirect(parent, initialDelay, period, unit)); source.subscribe(parent); @@ -91,8 +91,8 @@ static final class RequestSample this.downstream = downstream; this.downstreamRequests = new AtomicLong(); this.upstreamRequests = new AtomicLong(); - this.upstream = new AtomicReference(); - this.timer = new AtomicReference(); + this.upstream = new AtomicReference<>(); + this.timer = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSpanout.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSpanout.java index bdd658b3..da80a5de 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSpanout.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSpanout.java @@ -64,7 +64,7 @@ final class FlowableSpanout extends Flowable implements FlowableTransforme @Override public Publisher apply(Flowable upstream) { - return new FlowableSpanout(upstream, initialSpan, betweenSpan, TimeUnit.NANOSECONDS, scheduler, delayError, bufferSize); + return new FlowableSpanout<>(upstream, initialSpan, betweenSpan, TimeUnit.NANOSECONDS, scheduler, delayError, bufferSize); } @Override @@ -101,7 +101,7 @@ static final class SpanoutSubscriber implements Subscriber, Subscription, this.worker = worker; this.delayError = delayError; this.lastEvent = -1L; - this.queue = new SpscLinkedArrayQueue(bufferSize); + this.queue = new SpscLinkedArrayQueue<>(bufferSize); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMap.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMap.java index 77c832c7..69ab9967 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMap.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMap.java @@ -24,7 +24,6 @@ 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.SimplePlainQueue; import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; @@ -53,7 +52,7 @@ final class FlowableSwitchFlatMap extends Flowable @Override public Publisher apply(Flowable upstream) { - return new FlowableSwitchFlatMap(upstream, mapper, maxActive, bufferSize); + return new FlowableSwitchFlatMap<>(upstream, mapper, maxActive, bufferSize); } @Override @@ -100,7 +99,7 @@ static final class SwitchFlatMapSubscriber this.mapper = mapper; this.maxActive = maxActive; this.bufferSize = bufferSize; - this.active = new ArrayDeque>(); + this.active = new ArrayDeque<>(); this.requested = new AtomicLong(); this.error = new AtomicThrowable(); this.activeCache = new SfmInnerSubscriber[maxActive]; @@ -121,7 +120,7 @@ public void onSubscribe(Subscription s) { public void onNext(T t) { Publisher p; try { - p = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); + p = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); @@ -129,7 +128,7 @@ public void onNext(T t) { return; } - SfmInnerSubscriber inner = new SfmInnerSubscriber(this, bufferSize); + SfmInnerSubscriber inner = new SfmInnerSubscriber<>(this, bufferSize); if (add(inner)) { p.subscribe(inner); } @@ -204,7 +203,7 @@ void clearCache() { } void cancelInners() { - List> subscribers = new ArrayList>(); + List> subscribers = new ArrayList<>(); synchronized (this) { subscribers.addAll(active); active.clear(); @@ -398,7 +397,7 @@ static final class SfmInnerSubscriber extends AtomicReference> 2); - this.queue = new SpscArrayQueue(bufferSize); + this.queue = new SpscArrayQueue<>(bufferSize); } void cancel() { diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyMany.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyMany.java index 1560826d..58fb541b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyMany.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyMany.java @@ -48,14 +48,14 @@ protected void subscribeActual(Subscriber s) { EmptySubscription.error(ex, s); return; } - SwitchManySubscriber parent = new SwitchManySubscriber(s, it); + SwitchManySubscriber parent = new SwitchManySubscriber<>(s, it); s.onSubscribe(parent); parent.drain(source); } @Override public Publisher apply(Flowable upstream) { - return new FlowableSwitchIfEmptyMany(upstream, alternatives); + return new FlowableSwitchIfEmptyMany<>(upstream, alternatives); } static final class SwitchManySubscriber @@ -80,7 +80,7 @@ static final class SwitchManySubscriber this.downstream = downstream; this.alternatives = alternatives; this.requested = new AtomicLong(); - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArray.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArray.java index 416489d8..f699654d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArray.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArray.java @@ -38,14 +38,14 @@ final class FlowableSwitchIfEmptyManyArray extends Flowable @Override protected void subscribeActual(Subscriber s) { - SwitchManySubscriber parent = new SwitchManySubscriber(s, alternatives); + SwitchManySubscriber parent = new SwitchManySubscriber<>(s, alternatives); s.onSubscribe(parent); parent.drain(source); } @Override public Publisher apply(Flowable upstream) { - return new FlowableSwitchIfEmptyManyArray(upstream, alternatives); + return new FlowableSwitchIfEmptyManyArray<>(upstream, alternatives); } static final class SwitchManySubscriber @@ -72,7 +72,7 @@ static final class SwitchManySubscriber this.downstream = downstream; this.alternatives = alternatives; this.requested = new AtomicLong(); - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirst.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirst.java index bea00151..0770fbb3 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirst.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchOnFirst.java @@ -16,13 +16,13 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -51,12 +51,12 @@ final class FlowableSwitchOnFirst extends Flowable implements FlowableTran @Override protected void subscribeActual(Subscriber s) { - source.subscribe(new SwitchOnFirstSubscriber(s, predicate, selector)); + source.subscribe(new SwitchOnFirstSubscriber<>(s, predicate, selector)); } @Override public Publisher apply(Flowable upstream) { - return new FlowableSwitchOnFirst(upstream, predicate, selector); + return new FlowableSwitchOnFirst<>(upstream, predicate, selector); } static final class SwitchOnFirstSubscriber extends AtomicBoolean @@ -83,7 +83,7 @@ static final class SwitchOnFirstSubscriber extends AtomicBoolean this.downstream = downstream; this.predicate = predicate; this.selector = selector; - this.secondary = new SwitchOnSecondarySubscriber(downstream); + this.secondary = new SwitchOnSecondarySubscriber<>(downstream); } @Override @@ -103,7 +103,7 @@ public void onNext(T t) { try { if (predicate.test(t)) { - resume = ObjectHelper.requireNonNull(selector.apply(t), "The selector returned a null Publisher"); + resume = Objects.requireNonNull(selector.apply(t), "The selector returned a null Publisher"); } } catch (Throwable ex) { upstream.cancel(); @@ -176,7 +176,7 @@ static final class SwitchOnSecondarySubscriber extends AtomicLong SwitchOnSecondarySubscriber(Subscriber downstream) { this.downstream = downstream; - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLast.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLast.java index fedf3a8f..5ddc3bd9 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLast.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTimeoutLast.java @@ -58,16 +58,16 @@ final class FlowableTimeoutLast extends Flowable @Override public Publisher apply(Flowable upstream) { - return new FlowableTimeoutLast(upstream, timeout, unit, scheduler, fromStart); + return new FlowableTimeoutLast<>(upstream, timeout, unit, scheduler, fromStart); } @Override protected void subscribeActual(Subscriber s) { - SerializedSubscriber serial = new SerializedSubscriber(s); + SerializedSubscriber serial = new SerializedSubscriber<>(s); if (fromStart) { - source.subscribe(new TimeoutStartLast(serial, timeout, unit, scheduler)); + source.subscribe(new TimeoutStartLast<>(serial, timeout, unit, scheduler)); } else { - source.subscribe(new TimeoutLast(serial, timeout, unit, scheduler.createWorker())); + source.subscribe(new TimeoutLast<>(serial, timeout, unit, scheduler.createWorker())); } } @@ -98,7 +98,7 @@ static final class TimeoutLast this.worker = worker; this.task = new SequentialDisposable(); this.index = new AtomicLong(); - this.value = new AtomicReference(); + this.value = new AtomicReference<>(); } @Override @@ -205,7 +205,7 @@ static final class TimeoutStartLast this.scheduler = scheduler; this.task = new SequentialDisposable(); this.once = new AtomicBoolean(); - this.value = new AtomicReference(); + this.value = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTransformers.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTransformers.java index 7a38d679..7751bf5d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableTransformers.java @@ -113,9 +113,9 @@ public static FlowableTransformer valve(Publisher other, bool @SchedulerSupport(SchedulerSupport.NONE) @BackpressureSupport(BackpressureKind.PASS_THROUGH) public static FlowableTransformer valve(Publisher other, boolean defaultOpen, int bufferSize) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - return new FlowableValve(null, other, defaultOpen, bufferSize); + return new FlowableValve<>(null, other, defaultOpen, bufferSize); } /** @@ -149,7 +149,7 @@ public static FlowableTransformer> bufferWhile(Predicate> FlowableTransformer bufferWhile(Predicate predicate, Supplier bufferSupplier) { - return new FlowableBufferPredicate(null, predicate, FlowableBufferPredicate.Mode.BEFORE, bufferSupplier); + return new FlowableBufferPredicate<>(null, predicate, FlowableBufferPredicate.Mode.BEFORE, bufferSupplier); } /** @@ -183,7 +183,7 @@ public static FlowableTransformer> bufferUntil(Predicate> FlowableTransformer bufferUntil(Predicate predicate, Supplier bufferSupplier) { - return new FlowableBufferPredicate(null, predicate, FlowableBufferPredicate.Mode.AFTER, bufferSupplier); + return new FlowableBufferPredicate<>(null, predicate, FlowableBufferPredicate.Mode.AFTER, bufferSupplier); } /** @@ -217,7 +217,7 @@ public static FlowableTransformer> bufferSplit(Predicate> FlowableTransformer bufferSplit(Predicate predicate, Supplier bufferSupplier) { - return new FlowableBufferPredicate(null, predicate, FlowableBufferPredicate.Mode.SPLIT, bufferSupplier); + return new FlowableBufferPredicate<>(null, predicate, FlowableBufferPredicate.Mode.SPLIT, bufferSupplier); } /** @@ -405,9 +405,9 @@ public static FlowableTransformer spanout(long initialDelay, long betw @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.CUSTOM) public static FlowableTransformer spanout(long initialDelay, long betweenDelay, TimeUnit unit, Scheduler scheduler, boolean delayError) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - return new FlowableSpanout(null, initialDelay, betweenDelay, unit, scheduler, delayError, Flowable.bufferSize()); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); + return new FlowableSpanout<>(null, initialDelay, betweenDelay, unit, scheduler, delayError, Flowable.bufferSize()); } /** @@ -423,8 +423,8 @@ public static FlowableTransformer spanout(long initialDelay, long betw @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public static FlowableTransformer mapFilter(BiConsumer> consumer) { - ObjectHelper.requireNonNull(consumer, "consumer is null"); - return new FlowableMapFilter(null, consumer); + Objects.requireNonNull(consumer, "consumer is null"); + return new FlowableMapFilter<>(null, consumer); } /** @@ -459,11 +459,11 @@ public static FlowableTransformer onBackpressureTimeout(long timeout, @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.CUSTOM) public static FlowableTransformer onBackpressureTimeout(long timeout, TimeUnit unit, Scheduler scheduler, Consumer onEvict) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - ObjectHelper.requireNonNull(onEvict, "onEvict is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(onEvict, "onEvict is null"); - return new FlowableOnBackpressureTimeout(null, Integer.MAX_VALUE, timeout, unit, scheduler, onEvict); + return new FlowableOnBackpressureTimeout<>(null, Integer.MAX_VALUE, timeout, unit, scheduler, onEvict); } /** @@ -502,11 +502,11 @@ public static FlowableTransformer onBackpressureTimeout(long timeout, @SchedulerSupport(SchedulerSupport.CUSTOM) public static FlowableTransformer onBackpressureTimeout(int maxSize, long timeout, TimeUnit unit, Scheduler scheduler, Consumer onEvict) { ObjectHelper.verifyPositive(maxSize, "maxSize"); - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - ObjectHelper.requireNonNull(onEvict, "onEvict is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(onEvict, "onEvict is null"); - return new FlowableOnBackpressureTimeout(null, maxSize, timeout, unit, scheduler, onEvict); + return new FlowableOnBackpressureTimeout<>(null, maxSize, timeout, unit, scheduler, onEvict); } /** @@ -528,7 +528,7 @@ public static FlowableTransformer onBackpressureTimeout(int maxSize, l @SchedulerSupport(SchedulerSupport.NONE) public static FlowableTransformer every(long keep) { ObjectHelper.verifyPositive(keep, "keep"); - return new FlowableEvery(null, keep); + return new FlowableEvery<>(null, keep); } /** @@ -549,7 +549,7 @@ public static FlowableTransformer every(long keep) { @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public static FlowableTransformer cacheLast() { - return new FlowableCacheLast(null); + return new FlowableCacheLast<>(null); } /** @@ -584,9 +584,9 @@ public static FlowableTransformer timeoutLast(long timeout, TimeUnit u @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.CUSTOM) public static FlowableTransformer timeoutLast(long timeout, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - return new FlowableTimeoutLast(null, timeout, unit, scheduler, false); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); + return new FlowableTimeoutLast<>(null, timeout, unit, scheduler, false); } /** @@ -621,9 +621,9 @@ public static FlowableTransformer timeoutLastAbsolute(long timeout, Ti @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.CUSTOM) public static FlowableTransformer timeoutLastAbsolute(long timeout, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - return new FlowableTimeoutLast(null, timeout, unit, scheduler, true); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); + return new FlowableTimeoutLast<>(null, timeout, unit, scheduler, true); } /** @@ -669,9 +669,9 @@ public static FlowableTransformer debounceFirst(long timeout, TimeUnit @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.CUSTOM) public static FlowableTransformer debounceFirst(long timeout, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - return new FlowableDebounceFirst(null, timeout, unit, scheduler); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); + return new FlowableDebounceFirst<>(null, timeout, unit, scheduler); } /** @@ -710,10 +710,10 @@ public static FlowableTransformer switchFlatMap(Function FlowableTransformer switchFlatMap(Function> mapper, int maxActive, int bufferSize) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(maxActive, "maxActive"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - return new FlowableSwitchFlatMap(null, mapper, maxActive, bufferSize); + return new FlowableSwitchFlatMap<>(null, mapper, maxActive, bufferSize); } /** @@ -761,7 +761,7 @@ public static FlowableTransformer flatMapSync(Function FlowableTransformer flatMapSync(Function> mapper, int maxConcurrency, int bufferSize, boolean depthFirst) { - return new FlowableFlatMapSync(null, mapper, maxConcurrency, bufferSize, depthFirst); + return new FlowableFlatMapSync<>(null, mapper, maxConcurrency, bufferSize, depthFirst); } /** @@ -818,7 +818,7 @@ public static FlowableTransformer flatMapAsync(Function FlowableTransformer flatMapAsync(Function> mapper, Scheduler scheduler, int maxConcurrency, int bufferSize, boolean depthFirst) { - return new FlowableFlatMapAsync(null, mapper, maxConcurrency, bufferSize, depthFirst, scheduler); + return new FlowableFlatMapAsync<>(null, mapper, maxConcurrency, bufferSize, depthFirst, scheduler); } /** @@ -830,8 +830,9 @@ public static FlowableTransformer flatMapAsync(Function FlowableTransformer switchIfEmptyArray(Publisher... alternatives) { - return new FlowableSwitchIfEmptyManyArray(null, alternatives); + return new FlowableSwitchIfEmptyManyArray<>(null, alternatives); } /** @@ -844,7 +845,7 @@ public static FlowableTransformer switchIfEmptyArray(Publisher FlowableTransformer switchIfEmpty(Iterable> alternatives) { - return new FlowableSwitchIfEmptyMany(null, alternatives); + return new FlowableSwitchIfEmptyMany<>(null, alternatives); } /** @@ -892,10 +893,10 @@ public static FlowableTransformer expand(Function FlowableTransformer expand(Function> expander, ExpandStrategy strategy, int capacityHint) { - ObjectHelper.requireNonNull(expander, "expander is null"); - ObjectHelper.requireNonNull(strategy, "strategy is null"); + Objects.requireNonNull(expander, "expander is null"); + Objects.requireNonNull(strategy, "strategy is null"); ObjectHelper.verifyPositive(capacityHint, "capacityHint"); - return new FlowableExpand(null, expander, strategy, capacityHint, false); + return new FlowableExpand<>(null, expander, strategy, capacityHint, false); } /** @@ -946,10 +947,10 @@ public static FlowableTransformer expandDelayError(Function FlowableTransformer expandDelayError(Function> expander, ExpandStrategy strategy, int capacityHint) { - ObjectHelper.requireNonNull(expander, "expander is null"); - ObjectHelper.requireNonNull(strategy, "strategy is null"); + Objects.requireNonNull(expander, "expander is null"); + Objects.requireNonNull(strategy, "strategy is null"); ObjectHelper.verifyPositive(capacityHint, "capacityHint"); - return new FlowableExpand(null, expander, strategy, capacityHint, true); + return new FlowableExpand<>(null, expander, strategy, capacityHint, true); } /** @@ -1031,10 +1032,10 @@ public static FlowableTransformer mapAsync(Function FlowableTransformer mapAsync(Function> mapper, BiFunction combiner, int bufferSize) { - ObjectHelper.requireNonNull("mapper", "mapper is null"); - ObjectHelper.requireNonNull("combiner", "combiner is null"); + Objects.requireNonNull("mapper", "mapper is null"); + Objects.requireNonNull("combiner", "combiner is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - return new FlowableMapAsync(null, mapper, combiner, bufferSize); + return new FlowableMapAsync<>(null, mapper, combiner, bufferSize); } /** @@ -1068,9 +1069,9 @@ public static FlowableTransformer filterAsync(Function FlowableTransformer filterAsync(Function> asyncPredicate, int bufferSize) { - ObjectHelper.requireNonNull("asyncPredicate", "asyncPredicate is null"); + Objects.requireNonNull("asyncPredicate", "asyncPredicate is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - return new FlowableFilterAsync(null, asyncPredicate, bufferSize); + return new FlowableFilterAsync<>(null, asyncPredicate, bufferSize); } /** @@ -1099,10 +1100,10 @@ public static FlowableTransformer coalesce(Supplier containerSup * @since 0.17.3 */ public static FlowableTransformer coalesce(Supplier containerSupplier, BiConsumer coalescer, int bufferSize) { - ObjectHelper.requireNonNull(containerSupplier, "containerSupplier is null"); - ObjectHelper.requireNonNull(coalescer, "coalescer is null"); + Objects.requireNonNull(containerSupplier, "containerSupplier is null"); + Objects.requireNonNull(coalescer, "coalescer is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - return new FlowableCoalesce(null, containerSupplier, coalescer, bufferSize); + return new FlowableCoalesce<>(null, containerSupplier, coalescer, bufferSize); } /** @@ -1135,7 +1136,7 @@ public static FlowableTransformer> windowWhile(Predicate FlowableTransformer> windowWhile(final Predicate predicate, int bufferSize) { - return new FlowableWindowPredicate(null, predicate, FlowableWindowPredicate.Mode.BEFORE, bufferSize); + return new FlowableWindowPredicate<>(null, predicate, FlowableWindowPredicate.Mode.BEFORE, bufferSize); } /** @@ -1168,7 +1169,7 @@ public static FlowableTransformer> windowUntil(Predicate FlowableTransformer> windowUntil(Predicate predicate, int bufferSize) { - return new FlowableWindowPredicate(null, predicate, FlowableWindowPredicate.Mode.AFTER, bufferSize); + return new FlowableWindowPredicate<>(null, predicate, FlowableWindowPredicate.Mode.AFTER, bufferSize); } /** @@ -1201,7 +1202,7 @@ public static FlowableTransformer> windowSplit(Predicate FlowableTransformer> windowSplit(Predicate predicate, int bufferSize) { - return new FlowableWindowPredicate(null, predicate, FlowableWindowPredicate.Mode.SPLIT, bufferSize); + return new FlowableWindowPredicate<>(null, predicate, FlowableWindowPredicate.Mode.SPLIT, bufferSize); } /** @@ -1216,7 +1217,7 @@ public static FlowableTransformer> windowSplit(Predicate FlowableTransformer indexOf(Predicate predicate) { - return new FlowableIndexOf(null, predicate); + return new FlowableIndexOf<>(null, predicate); } /** @@ -1247,7 +1248,7 @@ public static FlowableTransformer indexOf(Predicate pred @SchedulerSupport(SchedulerSupport.CUSTOM) @BackpressureSupport(BackpressureKind.FULL) public static FlowableTransformer requestObserveOn(Scheduler scheduler) { - return new FlowableRequestObserveOn(null, ObjectHelper.requireNonNull(scheduler, "scheduler == null")); + return new FlowableRequestObserveOn<>(null, Objects.requireNonNull(scheduler, "scheduler == null")); } /** @@ -1297,7 +1298,7 @@ public static FlowableTransformer requestSample(long period, TimeUnit * @since 0.18.6 */ public static FlowableTransformer requestSample(long initialDelay, long period, TimeUnit unit, Scheduler scheduler) { - return new FlowableRequestSampleTime(null, initialDelay, period, unit, scheduler); + return new FlowableRequestSampleTime<>(null, initialDelay, period, unit, scheduler); } /** @@ -1322,7 +1323,7 @@ public static FlowableTransformer requestSample(long initialDelay, lon * @since 0.18.6 */ public static FlowableTransformer requestSample(Publisher other) { - return new FlowableRequestSample(null, other); + return new FlowableRequestSample<>(null, other); } /** @@ -1354,10 +1355,10 @@ public static FlowableTransformer partialCollect( Consumer cleaner, int prefetch ) { - ObjectHelper.requireNonNull(handler, "handler is null"); - ObjectHelper.requireNonNull(cleaner, "cleaner is null"); + Objects.requireNonNull(handler, "handler is null"); + Objects.requireNonNull(cleaner, "cleaner is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); - return new FlowablePartialCollect(null, handler, cleaner, prefetch); + return new FlowablePartialCollect<>(null, handler, cleaner, prefetch); } /** @@ -1370,8 +1371,8 @@ public static FlowableTransformer partialCollect( * @since 0.19.1 */ public static FlowableTransformer errorJump(FlowableTransformer transformer) { - ObjectHelper.requireNonNull(transformer, "transformer"); - return new FlowableErrorJump(null, transformer); + Objects.requireNonNull(transformer, "transformer"); + return new FlowableErrorJump<>(null, transformer); } /** @@ -1392,8 +1393,8 @@ public static FlowableTransformer errorJump(FlowableTransformer FlowableTransformer switchOnFirst(Predicate predicate, Function> selector) { - ObjectHelper.requireNonNull(predicate, "predicate"); - ObjectHelper.requireNonNull(selector, "selector"); - return new FlowableSwitchOnFirst(null, predicate, selector); + Objects.requireNonNull(predicate, "predicate"); + Objects.requireNonNull(selector, "selector"); + return new FlowableSwitchOnFirst<>(null, predicate, selector); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java index 5fa18546..125fee16 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java @@ -58,7 +58,7 @@ protected void subscribeActual(Subscriber s) { @Override public Subscriber apply(Subscriber subscriber) { - ValveMainSubscriber parent = new ValveMainSubscriber(subscriber, bufferSize, defaultOpen); + ValveMainSubscriber parent = new ValveMainSubscriber<>(subscriber, bufferSize, defaultOpen); subscriber.onSubscribe(parent); other.subscribe(parent.other); return parent; @@ -66,7 +66,7 @@ public Subscriber apply(Subscriber subscriber) { @Override public Publisher apply(Flowable upstream) { - return new FlowableValve(upstream, other, defaultOpen, bufferSize); + return new FlowableValve<>(upstream, other, defaultOpen, bufferSize); } static final class ValveMainSubscriber @@ -95,12 +95,12 @@ static final class ValveMainSubscriber ValveMainSubscriber(Subscriber downstream, int bufferSize, boolean defaultOpen) { this.downstream = downstream; - this.queue = new SpscLinkedArrayQueue(bufferSize); + this.queue = new SpscLinkedArrayQueue<>(bufferSize); this.gate = defaultOpen; this.other = new OtherSubscriber(); this.requested = new AtomicLong(); this.error = new AtomicThrowable(); - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicate.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicate.java index 9625bc10..3a0d0686 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicate.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicate.java @@ -65,12 +65,12 @@ enum Mode { @Override protected void subscribeActual(Subscriber> s) { - source.subscribe(new WindowPredicateSubscriber(s, predicate, mode, bufferSize)); + source.subscribe(new WindowPredicateSubscriber<>(s, predicate, mode, bufferSize)); } @Override public Publisher> apply(Flowable upstream) { - return new FlowableWindowPredicate(upstream, predicate, mode, bufferSize); + return new FlowableWindowPredicate<>(upstream, predicate, mode, bufferSize); } static final class WindowPredicateSubscriber @@ -108,7 +108,7 @@ static final class WindowPredicateSubscriber // In Mode.BEFORE windows are opened earlier and added to the 1-element drain "queue" if (mode == Mode.BEFORE) { requestedWindows = new AtomicLong(); - pending = new AtomicReference>(); + pending = new AtomicReference<>(); } else { requestedWindows = null; pending = null; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableZipLatest.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableZipLatest.java index 09f15021..94322ba1 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableZipLatest.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableZipLatest.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.operators; -import java.util.Arrays; +import java.util.*; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -25,7 +25,6 @@ import io.reactivex.rxjava3.core.Scheduler.Worker; 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.internal.util.*; @@ -83,7 +82,7 @@ protected void subscribeActual(Subscriber s) { if (n == 0) { Flowable.empty().observeOn(scheduler).subscribe(s); } else { - ZipLatestCoordinator zc = new ZipLatestCoordinator(s, n, scheduler.createWorker(), combiner); + ZipLatestCoordinator zc = new ZipLatestCoordinator<>(s, n, scheduler.createWorker(), combiner); s.onSubscribe(zc); zc.subscribe(srcs, n); @@ -122,7 +121,7 @@ static final class ZipLatestCoordinator extends AtomicReferenceArray im this.errors = new AtomicThrowable(); this.worker = worker; for (int i = 0; i < n; i++) { - subscribers[i] = new InnerSubscriber(this, i); + subscribers[i] = new InnerSubscriber<>(this, i); } this.combiner = combiner; } @@ -209,7 +208,7 @@ public void run() { R v; try { - v = ObjectHelper.requireNonNull(combiner.apply(array), "The combiner returned a null value"); + v = Objects.requireNonNull(combiner.apply(array), "The combiner returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); errors.tryAddThrowableOrReport(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java b/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java index 36797ceb..b8339cb3 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.operators; -import java.util.Comparator; +import java.util.*; import java.util.concurrent.TimeUnit; import org.reactivestreams.Publisher; @@ -49,6 +49,7 @@ private Flowables() { */ @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) + @SafeVarargs public static > Flowable orderedMerge(Publisher... sources) { return orderedMerge(Functions.naturalOrder(), false, Flowable.bufferSize(), sources); } @@ -65,6 +66,7 @@ public static > Flowable orderedMerge(Publish */ @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) + @SafeVarargs public static > Flowable orderedMerge(boolean delayErrors, Publisher... sources) { return orderedMerge(Functions.naturalOrder(), delayErrors, Flowable.bufferSize(), sources); } @@ -83,6 +85,7 @@ public static > Flowable orderedMerge(boolean */ @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) + @SafeVarargs public static > Flowable orderedMerge(boolean delayErrors, int prefetch, Publisher... sources) { return orderedMerge(Functions.naturalOrder(), delayErrors, prefetch, sources); } @@ -100,6 +103,7 @@ public static > Flowable orderedMerge(boolean */ @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) + @SafeVarargs public static Flowable orderedMerge(Comparator comparator, Publisher... sources) { return orderedMerge(comparator, false, Flowable.bufferSize(), sources); } @@ -118,6 +122,7 @@ public static Flowable orderedMerge(Comparator comparator, Pub */ @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) + @SafeVarargs public static Flowable orderedMerge(Comparator comparator, boolean delayErrors, Publisher... sources) { return orderedMerge(comparator, delayErrors, Flowable.bufferSize(), sources); } @@ -138,11 +143,12 @@ public static Flowable orderedMerge(Comparator comparator, boo */ @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) + @SafeVarargs public static Flowable orderedMerge(Comparator comparator, boolean delayErrors, int prefetch, Publisher... sources) { - ObjectHelper.requireNonNull(comparator, "comparator is null"); - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(comparator, "comparator is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); - return RxJavaPlugins.onAssembly(new FlowableOrderedMerge(sources, null, comparator, delayErrors, prefetch)); + return RxJavaPlugins.onAssembly(new FlowableOrderedMerge<>(sources, null, comparator, delayErrors, prefetch)); } /** @@ -197,10 +203,10 @@ public static Flowable orderedMerge(Iterable> sour @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable orderedMerge(Iterable> sources, Comparator comparator, boolean delayErrors, int prefetch) { - ObjectHelper.requireNonNull(comparator, "comparator is null"); - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(comparator, "comparator is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); - return RxJavaPlugins.onAssembly(new FlowableOrderedMerge(null, sources, comparator, delayErrors, prefetch)); + return RxJavaPlugins.onAssembly(new FlowableOrderedMerge<>(null, sources, comparator, delayErrors, prefetch)); } /** @@ -263,8 +269,8 @@ public static > Flowable orderedMerge(Iterabl @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable repeat(T item) { - ObjectHelper.requireNonNull(item, "item is null"); - return RxJavaPlugins.onAssembly(new FlowableRepeatScalar(item)); + Objects.requireNonNull(item, "item is null"); + return RxJavaPlugins.onAssembly(new FlowableRepeatScalar<>(item)); } /** @@ -278,8 +284,8 @@ public static Flowable repeat(T item) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable repeatSupplier(Supplier supplier) { - ObjectHelper.requireNonNull(supplier, "supplier is null"); - return RxJavaPlugins.onAssembly(new FlowableRepeatSupplier(supplier)); + Objects.requireNonNull(supplier, "supplier is null"); + return RxJavaPlugins.onAssembly(new FlowableRepeatSupplier<>(supplier)); } /** @@ -418,6 +424,7 @@ public static Flowable intervalBackpressure(long initialDelay, long period */ @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) + @SafeVarargs public static Flowable zipLatest(Function combiner, Publisher... sources) { return zipLatest(combiner, ImmediateThinScheduler.INSTANCE, sources); } @@ -454,10 +461,11 @@ public static Flowable zipLatest(Function Flowable zipLatest(Function combiner, Scheduler scheduler, Publisher... sources) { - ObjectHelper.requireNonNull(combiner, "combiner is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new FlowableZipLatest(sources, null, combiner, scheduler)); } @@ -530,9 +538,9 @@ public static Flowable zipLatest(Iterable Flowable zipLatest(Iterable> sources, Function combiner, Scheduler scheduler) { - ObjectHelper.requireNonNull(sources, "sources is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableZipLatest(null, sources, combiner, scheduler)); } @@ -610,10 +618,10 @@ public static Flowable zipLatest(Publisher source1, Publisher @SchedulerSupport(SchedulerSupport.CUSTOM) @SuppressWarnings("unchecked") public static Flowable zipLatest(Publisher source1, Publisher source2, BiFunction combiner, Scheduler scheduler) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableZipLatest( new Publisher[] { source1, source2 }, null, Functions.toFunction(combiner), scheduler)); @@ -700,11 +708,11 @@ public static Flowable zipLatest(Publisher source1, Publi public static Flowable zipLatest(Publisher source1, Publisher source2, Publisher source3, Function3 combiner, Scheduler scheduler) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableZipLatest( new Publisher[] { source1, source2, source3 }, null, Functions.toFunction(combiner), scheduler)); @@ -797,12 +805,12 @@ public static Flowable zipLatest(Publisher source1, P Publisher source3, Publisher source4, Function4 combiner, Scheduler scheduler) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableZipLatest( new Publisher[] { source1, source2, source3, source4 }, null, Functions.toFunction(combiner), scheduler)); @@ -934,9 +942,9 @@ public static Flowable zipLatest(Publisher source1, P @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable generateAsync(Supplier initialState, BiFunction, S> asyncGenerator, Consumer stateCleanup) { - ObjectHelper.requireNonNull(initialState, "initialState is null"); - ObjectHelper.requireNonNull(asyncGenerator, "asyncGenerator is null"); - ObjectHelper.requireNonNull(stateCleanup, "stateCleanup is null"); - return RxJavaPlugins.onAssembly(new FlowableGenerateAsync(initialState, asyncGenerator, stateCleanup)); + Objects.requireNonNull(initialState, "initialState is null"); + Objects.requireNonNull(asyncGenerator, "asyncGenerator is null"); + Objects.requireNonNull(stateCleanup, "stateCleanup is null"); + return RxJavaPlugins.onAssembly(new FlowableGenerateAsync<>(initialState, asyncGenerator, stateCleanup)); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletable.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletable.java index 0ef06357..fb2f9ccb 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalCompletable.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -23,7 +24,6 @@ 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 the signals of the upstream into CompletableSources and consumes them. @@ -52,7 +52,7 @@ final class MaybeFlatMapSignalCompletable extends Completable @Override public Completable apply(Maybe t) { - return new MaybeFlatMapSignalCompletable(t, onSuccessHandler, onErrorHandler, onCompleteHandler); + return new MaybeFlatMapSignalCompletable<>(t, onSuccessHandler, onErrorHandler, onCompleteHandler); } @Override @@ -105,7 +105,7 @@ public void onSuccess(T t) { CompletableSource next; try { - next = ObjectHelper.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null CompletableSource"); + next = Objects.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -120,7 +120,7 @@ public void onComplete() { CompletableSource next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null CompletableSource"); + next = Objects.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -135,7 +135,7 @@ public void onError(Throwable e) { CompletableSource next; try { - next = ObjectHelper.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null CompletableSource"); + next = Objects.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowable.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowable.java index a4d3b76a..5456eca6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalFlowable.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -25,7 +26,6 @@ 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.subscriptions.SubscriptionHelper; /** @@ -55,7 +55,7 @@ final class MaybeFlatMapSignalFlowable extends Flowable @Override public Flowable apply(Maybe t) { - return new MaybeFlatMapSignalFlowable(t, onSuccessHandler, onErrorHandler, onCompleteHandler); + return new MaybeFlatMapSignalFlowable<>(t, onSuccessHandler, onErrorHandler, onCompleteHandler); } @Override @@ -81,7 +81,7 @@ static final class FlatMapSignalConsumer Function> onSuccessHandler, Function> onErrorHandler, Supplier> onCompleteHandler) { - this.consumer = new SignalConsumer(downstream); + this.consumer = new SignalConsumer<>(downstream); this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; this.onCompleteHandler = onCompleteHandler; @@ -111,7 +111,7 @@ public void onSuccess(T t) { Publisher next; try { - next = ObjectHelper.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null Publisher"); + next = Objects.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -126,7 +126,7 @@ public void onComplete() { Publisher next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null Publisher"); + next = Objects.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -141,7 +141,7 @@ public void onError(Throwable e) { Publisher next; try { - next = ObjectHelper.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null Publisher"); + next = Objects.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybe.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybe.java index aa568cb9..8444ed75 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalMaybe.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -23,7 +24,6 @@ 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 the signals of the upstream into MaybeSources and consumes them. @@ -52,7 +52,7 @@ final class MaybeFlatMapSignalMaybe extends Maybe @Override public Maybe apply(Maybe t) { - return new MaybeFlatMapSignalMaybe(t, onSuccessHandler, onErrorHandler, onCompleteHandler); + return new MaybeFlatMapSignalMaybe<>(t, onSuccessHandler, onErrorHandler, onCompleteHandler); } @Override @@ -76,7 +76,7 @@ static final class FlatMapSignalConsumer Function> onSuccessHandler, Function> onErrorHandler, Supplier> onCompleteHandler) { - this.consumer = new SignalConsumer(downstream); + this.consumer = new SignalConsumer<>(downstream); this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; this.onCompleteHandler = onCompleteHandler; @@ -105,7 +105,7 @@ public void onSuccess(T t) { MaybeSource next; try { - next = ObjectHelper.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null MaybeSource"); + next = Objects.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -120,7 +120,7 @@ public void onComplete() { MaybeSource next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null MaybeSource"); + next = Objects.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -135,7 +135,7 @@ public void onError(Throwable e) { MaybeSource next; try { - next = ObjectHelper.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null MaybeSource"); + next = Objects.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservable.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservable.java index a42b09cc..83096350 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalObservable.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -23,7 +24,6 @@ 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 the signals of the upstream into ObservableSources and consumes them. @@ -52,7 +52,7 @@ final class MaybeFlatMapSignalObservable extends Observable @Override public Observable apply(Maybe t) { - return new MaybeFlatMapSignalObservable(t, onSuccessHandler, onErrorHandler, onCompleteHandler); + return new MaybeFlatMapSignalObservable<>(t, onSuccessHandler, onErrorHandler, onCompleteHandler); } @Override @@ -76,7 +76,7 @@ static final class FlatMapSignalConsumer Function> onSuccessHandler, Function> onErrorHandler, Supplier> onCompleteHandler) { - this.consumer = new SignalConsumer(downstream); + this.consumer = new SignalConsumer<>(downstream); this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; this.onCompleteHandler = onCompleteHandler; @@ -105,7 +105,7 @@ public void onSuccess(T t) { ObservableSource next; try { - next = ObjectHelper.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null ObservableSource"); + next = Objects.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -120,7 +120,7 @@ public void onComplete() { ObservableSource next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null ObservableSource"); + next = Objects.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -135,7 +135,7 @@ public void onError(Throwable e) { ObservableSource next; try { - next = ObjectHelper.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null ObservableSource"); + next = Objects.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingle.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingle.java index 2d209851..66bfb6b5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeFlatMapSignalSingle.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -23,7 +24,6 @@ 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 the signals of the upstream into SingleSources and consumes them. @@ -52,7 +52,7 @@ final class MaybeFlatMapSignalSingle extends Single @Override public Single apply(Maybe t) { - return new MaybeFlatMapSignalSingle(t, onSuccessHandler, onErrorHandler, onCompleteHandler); + return new MaybeFlatMapSignalSingle<>(t, onSuccessHandler, onErrorHandler, onCompleteHandler); } @Override @@ -76,7 +76,7 @@ static final class FlatMapSignalConsumer Function> onSuccessHandler, Function> onErrorHandler, Supplier> onCompleteHandler) { - this.consumer = new SignalConsumer(downstream); + this.consumer = new SignalConsumer<>(downstream); this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; this.onCompleteHandler = onCompleteHandler; @@ -105,7 +105,7 @@ public void onSuccess(T t) { SingleSource next; try { - next = ObjectHelper.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null SingleSource"); + next = Objects.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -120,7 +120,7 @@ public void onComplete() { SingleSource next; try { - next = ObjectHelper.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null SingleSource"); + next = Objects.requireNonNull(onCompleteHandler.get(), "The onCompleteHandler returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -135,7 +135,7 @@ public void onError(Throwable e) { SingleSource next; try { - next = ObjectHelper.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null SingleSource"); + next = Objects.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeTransformers.java b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeTransformers.java index 731075fb..e00b8b6f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/MaybeTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/MaybeTransformers.java @@ -16,9 +16,10 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; + import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Additional operators in the form of {@link MaybeTransformer}, @@ -53,9 +54,9 @@ public static MaybeTransformer flatMap( Function> onSuccessHandler, Function> onErrorHandler, Supplier> onCompleteHandler) { - ObjectHelper.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); - ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); - ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); - return new MaybeFlatMapSignalMaybe(null, onSuccessHandler, onErrorHandler, onCompleteHandler); + Objects.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); + Objects.requireNonNull(onErrorHandler, "onErrorHandler is null"); + Objects.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); + return new MaybeFlatMapSignalMaybe<>(null, onSuccessHandler, onErrorHandler, onCompleteHandler); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/Maybes.java b/src/main/java/hu/akarnokd/rxjava3/operators/Maybes.java index ef66825b..f96edb3d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/Maybes.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/Maybes.java @@ -16,11 +16,12 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; + import org.reactivestreams.Publisher; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Additional operators in the form of {@link MaybeConverter}s, @@ -54,10 +55,10 @@ public static MaybeConverter flatMapCompletable( Function onSuccessHandler, Function onErrorHandler, Supplier onCompleteHandler) { - ObjectHelper.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); - ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); - ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); - return new MaybeFlatMapSignalCompletable(null, onSuccessHandler, onErrorHandler, onCompleteHandler); + Objects.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); + Objects.requireNonNull(onErrorHandler, "onErrorHandler is null"); + Objects.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); + return new MaybeFlatMapSignalCompletable<>(null, onSuccessHandler, onErrorHandler, onCompleteHandler); } /** @@ -78,10 +79,10 @@ public static MaybeConverter> flatMapSingle( Function> onSuccessHandler, Function> onErrorHandler, Supplier> onCompleteHandler) { - ObjectHelper.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); - ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); - ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); - return new MaybeFlatMapSignalSingle(null, onSuccessHandler, onErrorHandler, onCompleteHandler); + Objects.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); + Objects.requireNonNull(onErrorHandler, "onErrorHandler is null"); + Objects.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); + return new MaybeFlatMapSignalSingle<>(null, onSuccessHandler, onErrorHandler, onCompleteHandler); } /** @@ -102,10 +103,10 @@ public static MaybeConverter> flatMapObservable( Function> onSuccessHandler, Function> onErrorHandler, Supplier> onCompleteHandler) { - ObjectHelper.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); - ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); - ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); - return new MaybeFlatMapSignalObservable(null, onSuccessHandler, onErrorHandler, onCompleteHandler); + Objects.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); + Objects.requireNonNull(onErrorHandler, "onErrorHandler is null"); + Objects.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); + return new MaybeFlatMapSignalObservable<>(null, onSuccessHandler, onErrorHandler, onCompleteHandler); } /** @@ -126,9 +127,9 @@ public static MaybeConverter> flatMapFlowable( Function> onSuccessHandler, Function> onErrorHandler, Supplier> onCompleteHandler) { - ObjectHelper.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); - ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); - ObjectHelper.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); - return new MaybeFlatMapSignalFlowable(null, onSuccessHandler, onErrorHandler, onCompleteHandler); + Objects.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); + Objects.requireNonNull(onErrorHandler, "onErrorHandler is null"); + Objects.requireNonNull(onCompleteHandler, "onCompleteHandler is null"); + return new MaybeFlatMapSignalFlowable<>(null, onSuccessHandler, onErrorHandler, onCompleteHandler); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableErrorJump.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableErrorJump.java index 9ac63874..93f70ca1 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableErrorJump.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableErrorJump.java @@ -16,13 +16,13 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Makes sure an upstream error skips the flow created with a @@ -48,18 +48,18 @@ final class ObservableErrorJump extends Observable implements Observabl @Override public ObservableSource apply(Observable upstream) { - return new ObservableErrorJump(upstream, transformer); + return new ObservableErrorJump<>(upstream, transformer); } @Override protected void subscribeActual(Observer observer) { - ErrorJumpFront front = new ErrorJumpFront(source, observer); + ErrorJumpFront front = new ErrorJumpFront<>(source, observer); ObservableSource downstream; try { - downstream = ObjectHelper.requireNonNull( + downstream = Objects.requireNonNull( transformer.apply(front), "The transformer returned a null Publisher"); } catch (Throwable ex) { @@ -83,7 +83,7 @@ static final class ErrorJumpFront extends Observable implements Observe ErrorJumpFront(Observable source, Observer downstream) { this.source = source; - this.middle = new AtomicReference>(); + this.middle = new AtomicReference<>(); this.end = new EndSubscriber(downstream); } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java index e336f238..44b949e3 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -23,7 +24,6 @@ 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; @@ -56,7 +56,7 @@ final class ObservableFilterAsync extends Observable @Override public ObservableSource apply(Observable upstream) { - return new ObservableFilterAsync(upstream, asyncPredicate, capacityHint); + return new ObservableFilterAsync<>(upstream, asyncPredicate, capacityHint); } @Override @@ -98,9 +98,9 @@ static final class FilterAsyncObserver extends AtomicInteger implements Obser int capacityHint) { this.downstream = downstream; this.asyncPredicate = asyncPredicate; - this.queue = new SpscLinkedArrayQueue(capacityHint); + this.queue = new SpscLinkedArrayQueue<>(capacityHint); this.errors = new AtomicThrowable(); - this.innerDisposable = new AtomicReference(); + this.innerDisposable = new AtomicReference<>(); } @Override @@ -178,7 +178,7 @@ public void drain() { ObservableSource innerSource; try { - innerSource = ObjectHelper.requireNonNull(asyncPredicate.apply(item), "The mapper returned a null ObservableSource"); + innerSource = Objects.requireNonNull(asyncPredicate.apply(item), "The mapper returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); disposed = true; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDrop.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDrop.java index aedc0db5..fc7bd0c6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDrop.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDrop.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -23,7 +24,6 @@ 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; /** @@ -46,7 +46,7 @@ final class ObservableFlatMapDrop extends Observable implements Observa @Override public ObservableSource apply(Observable upstream) { - return new ObservableFlatMapDrop(upstream, mapper); + return new ObservableFlatMapDrop<>(upstream, mapper); } @Override @@ -95,7 +95,7 @@ public void onNext(T t) { ObservableSource o; try { - o = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource"); + o = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.dispose(); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatest.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatest.java index b33a4ec2..12a7f2d4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatest.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatest.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -23,7 +24,6 @@ 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; /** @@ -47,7 +47,7 @@ final class ObservableFlatMapLatest extends Observable implements Obser @Override public ObservableSource apply(Observable upstream) { - return new ObservableFlatMapLatest(upstream, mapper); + return new ObservableFlatMapLatest<>(upstream, mapper); } @Override @@ -85,7 +85,7 @@ static final class FlatMapLatestObserver this.mapper = mapper; this.innerObserver = new FlatMapLatestInnerObserver(); this.errors = new AtomicThrowable(); - this.latest = new AtomicReference(); + this.latest = new AtomicReference<>(); } @Override @@ -167,7 +167,7 @@ void drain() { ObservableSource o; try { - o = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null ObservableSource"); + o = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.dispose(); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableIndexOf.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableIndexOf.java index c2af6a08..fa7e7f39 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableIndexOf.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableIndexOf.java @@ -41,7 +41,7 @@ final class ObservableIndexOf extends Observable @Override public ObservableSource apply(Observable upstream) { - return new ObservableIndexOf(upstream, predicate); + return new ObservableIndexOf<>(upstream, predicate); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java index 74669b25..0c891572 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -23,7 +24,6 @@ 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; @@ -62,7 +62,7 @@ final class ObservableMapAsync extends Observable @Override public ObservableSource apply(Observable upstream) { - return new ObservableMapAsync(upstream, mapper, combiner, capacityHint); + return new ObservableMapAsync<>(upstream, mapper, combiner, capacityHint); } @Override @@ -109,9 +109,9 @@ static final class MapAsyncObserver extends AtomicInteger implements Ob this.downstream = downstream; this.mapper = mapper; this.combiner = combiner; - this.queue = new SpscLinkedArrayQueue(capacityHint); + this.queue = new SpscLinkedArrayQueue<>(capacityHint); this.errors = new AtomicThrowable(); - this.innerDisposable = new AtomicReference(); + this.innerDisposable = new AtomicReference<>(); } @Override @@ -190,7 +190,7 @@ public void drain() { ObservableSource innerSource; try { - innerSource = ObjectHelper.requireNonNull(mapper.apply(item), "The mapper returned a null ObservableSource"); + innerSource = Objects.requireNonNull(mapper.apply(item), "The mapper returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); disposed = true; @@ -212,7 +212,7 @@ public void drain() { R result; try { - result = ObjectHelper.requireNonNull(combiner.apply(mainItem, innerItem), "The combiner returned a null value"); + result = Objects.requireNonNull(combiner.apply(mainItem, innerItem), "The combiner returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); disposed = true; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDrop.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDrop.java index 3bf78083..88e7faf5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDrop.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDrop.java @@ -43,7 +43,7 @@ final class ObservableObserveOnDrop extends Observable implements Observab @Override public ObservableSource apply(Observable upstream) { - return new ObservableObserveOnDrop(upstream, scheduler); + return new ObservableObserveOnDrop<>(upstream, scheduler); } @Override @@ -75,7 +75,7 @@ static final class ObserveOnDropObserver extends AtomicInteger ObserveOnDropObserver(Observer downstream, Worker worker) { this.downstream = downstream; this.worker = worker; - this.item = new AtomicReference(); + this.item = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatest.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatest.java index 9c534112..68f57d3d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatest.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatest.java @@ -44,7 +44,7 @@ final class ObservableObserveOnLatest extends Observable implements Observ @Override public ObservableSource apply(Observable upstream) { - return new ObservableObserveOnLatest(upstream, scheduler); + return new ObservableObserveOnLatest<>(upstream, scheduler); } @Override @@ -74,7 +74,7 @@ static final class ObserveOnDropObserver extends AtomicInteger ObserveOnDropObserver(Observer downstream, Worker worker) { this.downstream = downstream; this.worker = worker; - this.item = new AtomicReference(); + this.item = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableTransformers.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableTransformers.java index 49faa407..b6d1e739 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableTransformers.java @@ -16,6 +16,8 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; + import hu.akarnokd.rxjava3.util.BiFunctionSecondIdentity; import io.reactivex.rxjava3.annotations.*; import io.reactivex.rxjava3.core.*; @@ -52,8 +54,8 @@ private ObservableTransformers() { @CheckReturnValue @NonNull public static ObservableTransformer indexOf(@NonNull Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); - return new ObservableIndexOf(null, predicate); + Objects.requireNonNull(predicate, "predicate is null"); + return new ObservableIndexOf<>(null, predicate); } /** @@ -70,8 +72,8 @@ public static ObservableTransformer indexOf(@NonNull Predicate ObservableTransformer observeOnDrop(@NonNull Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - return new ObservableObserveOnDrop(null, scheduler); + Objects.requireNonNull(scheduler, "scheduler is null"); + return new ObservableObserveOnDrop<>(null, scheduler); } /** @@ -89,8 +91,8 @@ public static ObservableTransformer observeOnDrop(@NonNull Scheduler s @CheckReturnValue @NonNull public static ObservableTransformer observeOnLatest(@NonNull Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - return new ObservableObserveOnLatest(null, scheduler); + Objects.requireNonNull(scheduler, "scheduler is null"); + return new ObservableObserveOnLatest<>(null, scheduler); } /** @@ -108,8 +110,8 @@ public static ObservableTransformer observeOnLatest(@NonNull Scheduler @CheckReturnValue @NonNull public static ObservableTransformer flatMapDrop(Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); - return new ObservableFlatMapDrop(null, mapper); + Objects.requireNonNull(mapper, "mapper is null"); + return new ObservableFlatMapDrop<>(null, mapper); } /** @@ -128,8 +130,8 @@ public static ObservableTransformer flatMapDrop(Function ObservableTransformer flatMapLatest(Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); - return new ObservableFlatMapLatest(null, mapper); + Objects.requireNonNull(mapper, "mapper is null"); + return new ObservableFlatMapLatest<>(null, mapper); } /** @@ -142,8 +144,8 @@ public static ObservableTransformer flatMapLatest(Function ObservableTransformer errorJump(ObservableTransformer transformer) { - ObjectHelper.requireNonNull(transformer, "transformer"); - return new ObservableErrorJump(null, transformer); + Objects.requireNonNull(transformer, "transformer"); + return new ObservableErrorJump<>(null, transformer); } /** @@ -215,9 +217,9 @@ public static ObservableTransformer valve(ObservableSource ot */ @SchedulerSupport(SchedulerSupport.NONE) public static ObservableTransformer valve(ObservableSource other, boolean defaultOpen, int bufferSize) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - return new ObservableValve(null, other, defaultOpen, bufferSize); + return new ObservableValve<>(null, other, defaultOpen, bufferSize); } /** @@ -297,10 +299,10 @@ public static ObservableTransformer mapAsync(Function ObservableTransformer mapAsync(Function> mapper, BiFunction combiner, int capacityHint) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(combiner, "combiner is null"); ObjectHelper.verifyPositive(capacityHint, "capacityHint"); - return new ObservableMapAsync(null, mapper, combiner, capacityHint); + return new ObservableMapAsync<>(null, mapper, combiner, capacityHint); } /** @@ -334,8 +336,8 @@ public static ObservableTransformer filterAsync(Function ObservableTransformer filterAsync(Function> asyncPredicate, int bufferSize) { - ObjectHelper.requireNonNull("asyncPredicate", "asyncPredicate is null"); + Objects.requireNonNull("asyncPredicate", "asyncPredicate is null"); ObjectHelper.verifyPositive(bufferSize, "capacityHint"); - return new ObservableFilterAsync(null, asyncPredicate, bufferSize); + return new ObservableFilterAsync<>(null, asyncPredicate, bufferSize); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java index 0d644250..bebd2110 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java @@ -52,7 +52,7 @@ final class ObservableValve extends Observable implements ObservableTransf @Override protected void subscribeActual(Observer observer) { - ValveMainObserver parent = new ValveMainObserver(observer, bufferSize, defaultOpen); + ValveMainObserver parent = new ValveMainObserver<>(observer, bufferSize, defaultOpen); observer.onSubscribe(parent); other.subscribe(parent.other); source.subscribe(parent); @@ -60,7 +60,7 @@ protected void subscribeActual(Observer observer) { @Override public Observable apply(Observable upstream) { - return new ObservableValve(upstream, other, defaultOpen, bufferSize); + return new ObservableValve<>(upstream, other, defaultOpen, bufferSize); } static final class ValveMainObserver @@ -87,11 +87,11 @@ static final class ValveMainObserver ValveMainObserver(Observer downstream, int bufferSize, boolean defaultOpen) { this.downstream = downstream; - this.queue = new SpscLinkedArrayQueue(bufferSize); + this.queue = new SpscLinkedArrayQueue<>(bufferSize); this.gate = defaultOpen; this.other = new OtherSubscriber(); this.error = new AtomicThrowable(); - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletable.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletable.java index e707d488..fff9aa13 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalCompletable.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -23,7 +24,6 @@ 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 signals of the upstream into CompletableSources and consumes them. @@ -48,7 +48,7 @@ final class SingleFlatMapSignalCompletable extends Completable @Override public Completable apply(Single t) { - return new SingleFlatMapSignalCompletable(t, onSuccessHandler, onErrorHandler); + return new SingleFlatMapSignalCompletable<>(t, onSuccessHandler, onErrorHandler); } @Override @@ -97,7 +97,7 @@ public void onSuccess(T t) { CompletableSource next; try { - next = ObjectHelper.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null CompletableSource"); + next = Objects.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -112,7 +112,7 @@ public void onError(Throwable e) { CompletableSource next; try { - next = ObjectHelper.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null CompletableSource"); + next = Objects.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowable.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowable.java index 3130aeec..89a062fa 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalFlowable.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -25,7 +26,6 @@ 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; /** @@ -51,7 +51,7 @@ final class SingleFlatMapSignalFlowable extends Flowable @Override public Flowable apply(Single t) { - return new SingleFlatMapSignalFlowable(t, onSuccessHandler, onErrorHandler); + return new SingleFlatMapSignalFlowable<>(t, onSuccessHandler, onErrorHandler); } @Override @@ -74,7 +74,7 @@ static final class FlatMapSignalConsumer Subscriber downstream, Function> onSuccessHandler, Function> onErrorHandler) { - this.consumer = new SignalConsumer(downstream); + this.consumer = new SignalConsumer<>(downstream); this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; } @@ -103,7 +103,7 @@ public void onSuccess(T t) { Publisher next; try { - next = ObjectHelper.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null Publisher"); + next = Objects.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -118,7 +118,7 @@ public void onError(Throwable e) { Publisher next; try { - next = ObjectHelper.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null Publisher"); + next = Objects.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybe.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybe.java index efcdd263..e535298b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybe.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalMaybe.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -23,7 +24,6 @@ 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 signals of the upstream into MaybeSources and consumes them. @@ -48,7 +48,7 @@ final class SingleFlatMapSignalMaybe extends Maybe @Override public Maybe apply(Single t) { - return new SingleFlatMapSignalMaybe(t, onSuccessHandler, onErrorHandler); + return new SingleFlatMapSignalMaybe<>(t, onSuccessHandler, onErrorHandler); } @Override @@ -69,7 +69,7 @@ static final class FlatMapSignalConsumer MaybeObserver downstream, Function> onSuccessHandler, Function> onErrorHandler) { - this.consumer = new SignalConsumer(downstream); + this.consumer = new SignalConsumer<>(downstream); this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; } @@ -97,7 +97,7 @@ public void onSuccess(T t) { MaybeSource next; try { - next = ObjectHelper.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null MaybeSource"); + next = Objects.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -112,7 +112,7 @@ public void onError(Throwable e) { MaybeSource next; try { - next = ObjectHelper.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null MaybeSource"); + next = Objects.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservable.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservable.java index 6ef015c1..b5ca1794 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalObservable.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -23,7 +24,6 @@ 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 signals of the upstream into ObservableSources and consumes them. @@ -48,7 +48,7 @@ final class SingleFlatMapSignalObservable extends Observable @Override public Observable apply(Single t) { - return new SingleFlatMapSignalObservable(t, onSuccessHandler, onErrorHandler); + return new SingleFlatMapSignalObservable<>(t, onSuccessHandler, onErrorHandler); } @Override @@ -69,7 +69,7 @@ static final class FlatMapSignalConsumer Observer downstream, Function> onSuccessHandler, Function> onErrorHandler) { - this.consumer = new SignalConsumer(downstream); + this.consumer = new SignalConsumer<>(downstream); this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; } @@ -97,7 +97,7 @@ public void onSuccess(T t) { ObservableSource next; try { - next = ObjectHelper.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null ObservableSource"); + next = Objects.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -112,7 +112,7 @@ public void onError(Throwable e) { ObservableSource next; try { - next = ObjectHelper.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null ObservableSource"); + next = Objects.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingle.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingle.java index 2bdaf799..c3ce9036 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingle.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleFlatMapSignalSingle.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -23,7 +24,6 @@ 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 signals of the upstream into SingleSources and consumes them. @@ -48,7 +48,7 @@ final class SingleFlatMapSignalSingle extends Single @Override public Single apply(Single t) { - return new SingleFlatMapSignalSingle(t, onSuccessHandler, onErrorHandler); + return new SingleFlatMapSignalSingle<>(t, onSuccessHandler, onErrorHandler); } @Override @@ -69,7 +69,7 @@ static final class FlatMapSignalConsumer SingleObserver downstream, Function> onSuccessHandler, Function> onErrorHandler) { - this.consumer = new SignalConsumer(downstream); + this.consumer = new SignalConsumer<>(downstream); this.onSuccessHandler = onSuccessHandler; this.onErrorHandler = onErrorHandler; } @@ -97,7 +97,7 @@ public void onSuccess(T t) { SingleSource next; try { - next = ObjectHelper.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null SingleSource"); + next = Objects.requireNonNull(onSuccessHandler.apply(t), "The onSuccessHandler returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); @@ -112,7 +112,7 @@ public void onError(Throwable e) { SingleSource next; try { - next = ObjectHelper.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null SingleSource"); + next = Objects.requireNonNull(onErrorHandler.apply(e), "The onErrorHandler returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); consumer.onError(ex); diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/SingleTransformers.java b/src/main/java/hu/akarnokd/rxjava3/operators/SingleTransformers.java index aa3e65a4..e741117c 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/SingleTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/SingleTransformers.java @@ -16,9 +16,10 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; + import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Additional operators in the form of {@link SingleTransformer}, @@ -50,8 +51,8 @@ private SingleTransformers() { public static SingleTransformer flatMap( Function> onSuccessHandler, Function> onErrorHandler) { - ObjectHelper.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); - ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); - return new SingleFlatMapSignalSingle(null, onSuccessHandler, onErrorHandler); + Objects.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); + Objects.requireNonNull(onErrorHandler, "onErrorHandler is null"); + return new SingleFlatMapSignalSingle<>(null, onSuccessHandler, onErrorHandler); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/Singles.java b/src/main/java/hu/akarnokd/rxjava3/operators/Singles.java index e1e9debf..980c076d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/Singles.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/Singles.java @@ -16,11 +16,12 @@ package hu.akarnokd.rxjava3.operators; +import java.util.Objects; + import org.reactivestreams.Publisher; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Additional operators in the form of {@link SingleConverter}s, @@ -51,9 +52,9 @@ private Singles() { public static SingleConverter flatMapCompletable( Function onSuccessHandler, Function onErrorHandler) { - ObjectHelper.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); - ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); - return new SingleFlatMapSignalCompletable(null, onSuccessHandler, onErrorHandler); + Objects.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); + Objects.requireNonNull(onErrorHandler, "onErrorHandler is null"); + return new SingleFlatMapSignalCompletable<>(null, onSuccessHandler, onErrorHandler); } /** @@ -71,9 +72,9 @@ public static SingleConverter flatMapCompletable( public static SingleConverter> flatMapMaybe( Function> onSuccessHandler, Function> onErrorHandler) { - ObjectHelper.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); - ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); - return new SingleFlatMapSignalMaybe(null, onSuccessHandler, onErrorHandler); + Objects.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); + Objects.requireNonNull(onErrorHandler, "onErrorHandler is null"); + return new SingleFlatMapSignalMaybe<>(null, onSuccessHandler, onErrorHandler); } /** @@ -91,9 +92,9 @@ public static SingleConverter> flatMapMaybe( public static SingleConverter> flatMapObservable( Function> onSuccessHandler, Function> onErrorHandler) { - ObjectHelper.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); - ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); - return new SingleFlatMapSignalObservable(null, onSuccessHandler, onErrorHandler); + Objects.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); + Objects.requireNonNull(onErrorHandler, "onErrorHandler is null"); + return new SingleFlatMapSignalObservable<>(null, onSuccessHandler, onErrorHandler); } /** @@ -111,8 +112,8 @@ public static SingleConverter> flatMapObservable( public static SingleConverter> flatMapFlowable( Function> onSuccessHandler, Function> onErrorHandler) { - ObjectHelper.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); - ObjectHelper.requireNonNull(onErrorHandler, "onErrorHandler is null"); - return new SingleFlatMapSignalFlowable(null, onSuccessHandler, onErrorHandler); + Objects.requireNonNull(onSuccessHandler, "onSuccessHandler is null"); + Objects.requireNonNull(onErrorHandler, "onErrorHandler is null"); + return new SingleFlatMapSignalFlowable<>(null, onSuccessHandler, onErrorHandler); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMerge.java b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMerge.java index c7a26745..ce1fc8d9 100644 --- a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMerge.java +++ b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelOrderedMerge.java @@ -54,7 +54,7 @@ final class ParallelOrderedMerge extends Flowable { @Override protected void subscribeActual(Subscriber s) { - final BasicMergeSubscription parent = new BasicMergeSubscription(s, comparator, this.source.parallelism(), prefetch, delayErrors); + final BasicMergeSubscription parent = new BasicMergeSubscription<>(s, comparator, this.source.parallelism(), prefetch, delayErrors); s.onSubscribe(parent); parent.subscribe(this.source); } diff --git a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java index 8a1d6aa9..93d8bdec 100644 --- a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.parallel; -import java.util.Comparator; +import java.util.*; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.internal.functions.*; @@ -116,10 +116,10 @@ public static Flowable orderedMerge(ParallelFlowable source, Comparato * @since 0.17.9 */ public static Flowable orderedMerge(ParallelFlowable source, Comparator comparator, boolean delayErrors, int prefetch) { - ObjectHelper.requireNonNull(comparator, "comparator is null"); - ObjectHelper.requireNonNull(source, "sources is null"); + Objects.requireNonNull(comparator, "comparator is null"); + Objects.requireNonNull(source, "sources is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); - return RxJavaPlugins.onAssembly(new ParallelOrderedMerge(source, comparator, delayErrors, prefetch)); + return RxJavaPlugins.onAssembly(new ParallelOrderedMerge<>(source, comparator, delayErrors, prefetch)); } /** @@ -129,7 +129,7 @@ public static Flowable orderedMerge(ParallelFlowable source, Comparato * @since 0.16.3 */ public static ParallelTransformer sumInteger() { - return new ParallelSumInteger(null); + return new ParallelSumInteger<>(null); } /** @@ -139,7 +139,7 @@ public static ParallelTransformer sumInteger() { * @since 0.16.3 */ public static ParallelTransformer sumLong() { - return new ParallelSumLong(null); + return new ParallelSumLong<>(null); } /** @@ -149,6 +149,6 @@ public static ParallelTransformer sumLong() { * @since 0.16.3 */ public static ParallelTransformer sumDouble() { - return new ParallelSumDouble(null); + return new ParallelSumDouble<>(null); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessor.java b/src/main/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessor.java index 86cf194b..d1d7ba9f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessor.java +++ b/src/main/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessor.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.processors; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -24,7 +25,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.core.Scheduler.Worker; import io.reactivex.rxjava3.disposables.Disposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.*; @@ -102,7 +102,7 @@ public static DispatchWorkProcessor create(Scheduler scheduler, boolean d * @return the new DispatchWorkSubject instance */ public static DispatchWorkProcessor create(Scheduler scheduler, int capacityHint, boolean delayErrors) { - return new DispatchWorkProcessor(capacityHint, delayErrors, scheduler, false); + return new DispatchWorkProcessor<>(capacityHint, delayErrors, scheduler, false); } /** @@ -116,7 +116,7 @@ public static DispatchWorkProcessor create(Scheduler scheduler, int capac * @return the new DispatchWorkSubject instance */ public static DispatchWorkProcessor createUnbounded(Scheduler scheduler, int capacityHint, boolean delayErrors) { - return new DispatchWorkProcessor(capacityHint, delayErrors, scheduler, true); + return new DispatchWorkProcessor<>(capacityHint, delayErrors, scheduler, true); } final SimplePlainQueue queue; @@ -146,12 +146,12 @@ public static DispatchWorkProcessor createUnbounded(Scheduler scheduler, @SuppressWarnings("unchecked") DispatchWorkProcessor(int capacityHint, boolean delayErrors, Scheduler scheduler, boolean unbounded) { - this.queue = new SpmcLinkedArrayQueue(capacityHint); + this.queue = new SpmcLinkedArrayQueue<>(capacityHint); this.delayErrors = delayErrors; this.wip = new AtomicInteger(); - this.upstream = new AtomicReference(); - this.error = new AtomicReference(); - this.observers = new AtomicReference[]>(EMPTY); + this.upstream = new AtomicReference<>(); + this.error = new AtomicReference<>(); + this.observers = new AtomicReference<>(EMPTY); this.scheduler = scheduler; this.prefetch = unbounded ? Long.MAX_VALUE : capacityHint; this.requestedUpstream = new AtomicLong(); @@ -178,7 +178,7 @@ public void onNext(T t) { @SuppressWarnings("unchecked") @Override public void onError(Throwable e) { - ObjectHelper.requireNonNull(e, "e is null"); + Objects.requireNonNull(e, "e is null"); if (error.compareAndSet(null, e)) { for (WorkDisposable wd : observers.getAndSet(TERMINATED)) { wd.drain(); @@ -200,7 +200,7 @@ public void onComplete() { @Override protected void subscribeActual(Subscriber subscriber) { - WorkDisposable wd = new WorkDisposable(subscriber, this, scheduler.createWorker(), delayErrors); + WorkDisposable wd = new WorkDisposable<>(subscriber, this, scheduler.createWorker(), delayErrors); subscriber.onSubscribe(wd); if (add(wd)) { if (wd.isCancelled()) { diff --git a/src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessors.java b/src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessors.java index c36a79e7..5601fc98 100644 --- a/src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessors.java +++ b/src/main/java/hu/akarnokd/rxjava3/processors/FlowableProcessors.java @@ -16,10 +16,11 @@ package hu.akarnokd.rxjava3.processors; +import java.util.Objects; + import org.reactivestreams.Processor; import io.reactivex.rxjava3.annotations.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.processors.FlowableProcessor; /** @@ -44,7 +45,7 @@ public static FlowableProcessor wrap(Processor processor) { if (processor instanceof FlowableProcessor) { return (FlowableProcessor)processor; } - return new FlowableProcessorWrap(ObjectHelper.requireNonNull(processor, "processor is null")); + return new FlowableProcessorWrap<>(Objects.requireNonNull(processor, "processor is null")); } /** @@ -65,6 +66,6 @@ public static FlowableProcessor refCount(FlowableProcessor processor) if (processor instanceof RefCountProcessor) { return processor; } - return new RefCountProcessor(ObjectHelper.requireNonNull(processor, "processor is null")); + return new RefCountProcessor<>(Objects.requireNonNull(processor, "processor is null")); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/processors/RefCountProcessor.java b/src/main/java/hu/akarnokd/rxjava3/processors/RefCountProcessor.java index e4020f6b..99e0ed52 100644 --- a/src/main/java/hu/akarnokd/rxjava3/processors/RefCountProcessor.java +++ b/src/main/java/hu/akarnokd/rxjava3/processors/RefCountProcessor.java @@ -45,8 +45,8 @@ @SuppressWarnings("unchecked") RefCountProcessor(FlowableProcessor actual) { this.actual = actual; - this.upstream = new AtomicReference(); - this.subscribers = new AtomicReference[]>(EMPTY); + this.upstream = new AtomicReference<>(); + this.subscribers = new AtomicReference<>(EMPTY); } @Override @@ -75,7 +75,7 @@ public void onComplete() { @Override protected void subscribeActual(Subscriber s) { - RefCountSubscriber rcs = new RefCountSubscriber(s, this); + RefCountSubscriber rcs = new RefCountSubscriber<>(s, this); if (!add(rcs)) { EmptySubscription.error(new IllegalStateException("RefCountProcessor terminated"), s); return; diff --git a/src/main/java/hu/akarnokd/rxjava3/schedulers/BlockingScheduler.java b/src/main/java/hu/akarnokd/rxjava3/schedulers/BlockingScheduler.java index b9989e32..03ca6f21 100644 --- a/src/main/java/hu/akarnokd/rxjava3/schedulers/BlockingScheduler.java +++ b/src/main/java/hu/akarnokd/rxjava3/schedulers/BlockingScheduler.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.schedulers; +import java.util.Objects; import java.util.concurrent.*; import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; @@ -24,7 +25,7 @@ import io.reactivex.rxjava3.disposables.*; import io.reactivex.rxjava3.functions.Action; import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; -import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.internal.functions.Functions; import io.reactivex.rxjava3.plugins.RxJavaPlugins; import io.reactivex.rxjava3.schedulers.Schedulers; @@ -83,7 +84,7 @@ public void run() throws Exception { volatile Thread thread; public BlockingScheduler() { - this.queue = new ConcurrentLinkedQueue(); + this.queue = new ConcurrentLinkedQueue<>(); this.lock = new ReentrantLock(); this.condition = this.lock.newCondition(); this.running = new AtomicBoolean(); @@ -110,7 +111,7 @@ public void execute() { * @param action the action to execute */ public void execute(Action action) { - ObjectHelper.requireNonNull(action, "action is null"); + Objects.requireNonNull(action, "action is null"); if (!running.get() && running.compareAndSet(false, true)) { thread = Thread.currentThread(); queue.offer(action); @@ -170,10 +171,10 @@ void cancelAll() { @Override public Disposable scheduleDirect(Runnable run, long delay, TimeUnit unit) { - ObjectHelper.requireNonNull(run, "run is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(run, "run is null"); + Objects.requireNonNull(unit, "unit is null"); if (shutdown.get()) { - return Disposables.disposed(); + return Disposable.disposed(); } final BlockingDirectTask task = new BlockingDirectTask(run); @@ -194,7 +195,7 @@ public void run() { } }, delay, unit); - if (d == Disposables.disposed()) { + if (d == Disposable.disposed()) { return d; } @@ -312,11 +313,11 @@ public boolean isDisposed() { @Override public Disposable schedule(Runnable run, long delay, TimeUnit unit) { - ObjectHelper.requireNonNull(run, "run is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(run, "run is null"); + Objects.requireNonNull(unit, "unit is null"); if (shutdown.get() || isDisposed()) { - return Disposables.disposed(); + return Disposable.disposed(); } final BlockingTask task = new BlockingTask(run); @@ -338,7 +339,7 @@ public void run() { } }, delay, unit); - if (d == Disposables.disposed()) { + if (d == Disposable.disposed()) { return d; } diff --git a/src/main/java/hu/akarnokd/rxjava3/schedulers/ParallelScheduler.java b/src/main/java/hu/akarnokd/rxjava3/schedulers/ParallelScheduler.java index bcd56fec..8c020454 100644 --- a/src/main/java/hu/akarnokd/rxjava3/schedulers/ParallelScheduler.java +++ b/src/main/java/hu/akarnokd/rxjava3/schedulers/ParallelScheduler.java @@ -94,7 +94,7 @@ public ParallelScheduler(int parallelism, ThreadFactory factory, boolean trackin this.parallelism = parallelism; this.factory = factory; this.tracking = tracking; - this.pool = new AtomicReference(SHUTDOWN); + this.pool = new AtomicReference<>(SHUTDOWN); start(); } @@ -164,12 +164,12 @@ public Worker createWorker() { public Disposable scheduleDirect(Runnable run) { ScheduledExecutorService exec = pick(); if (exec == REJECTING) { - return Disposables.disposed(); + return Disposable.disposed(); } try { - return Disposables.fromFuture(exec.submit(RxJavaPlugins.onSchedule(run))); + return Disposable.fromFuture(exec.submit(RxJavaPlugins.onSchedule(run))); } catch (RejectedExecutionException ex) { - return Disposables.disposed(); + return Disposable.disposed(); } } @@ -177,12 +177,12 @@ public Disposable scheduleDirect(Runnable run) { public Disposable scheduleDirect(Runnable run, long delay, TimeUnit unit) { ScheduledExecutorService exec = pick(); if (exec == REJECTING) { - return Disposables.disposed(); + return Disposable.disposed(); } try { - return Disposables.fromFuture(exec.schedule(RxJavaPlugins.onSchedule(run), delay, unit)); + return Disposable.fromFuture(exec.schedule(RxJavaPlugins.onSchedule(run), delay, unit)); } catch (RejectedExecutionException ex) { - return Disposables.disposed(); + return Disposable.disposed(); } } @@ -190,12 +190,12 @@ public Disposable scheduleDirect(Runnable run, long delay, TimeUnit unit) { public Disposable schedulePeriodicallyDirect(Runnable run, long initialDelay, long period, TimeUnit unit) { ScheduledExecutorService exec = pick(); if (exec == REJECTING) { - return Disposables.disposed(); + return Disposable.disposed(); } try { - return Disposables.fromFuture(exec.scheduleAtFixedRate(RxJavaPlugins.onSchedule(run), initialDelay, period, unit)); + return Disposable.fromFuture(exec.scheduleAtFixedRate(RxJavaPlugins.onSchedule(run), initialDelay, period, unit)); } catch (RejectedExecutionException ex) { - return Disposables.disposed(); + return Disposable.disposed(); } } @@ -230,7 +230,7 @@ public Disposable schedule(Runnable run) { // just let it fall through } } - return Disposables.disposed(); + return Disposable.disposed(); } @Override @@ -244,7 +244,7 @@ public Disposable schedule(Runnable run, long delay, TimeUnit unit) { // just let it fall through } } - return Disposables.disposed(); + return Disposable.disposed(); } // Not implementing a custom schedulePeriodically as it would require tracking the Future. @@ -319,7 +319,7 @@ public Disposable schedule(Runnable run) { } } } - return Disposables.disposed(); + return Disposable.disposed(); } @Override @@ -336,7 +336,7 @@ public Disposable schedule(Runnable run, long delay, TimeUnit unit) { } } } - return Disposables.disposed(); + return Disposable.disposed(); } static final class TrackedAction @@ -348,9 +348,9 @@ static final class TrackedAction static final Future DISPOSED; static { - FINISHED = new FutureTask(Functions.EMPTY_RUNNABLE, null); + FINISHED = new FutureTask<>(Functions.EMPTY_RUNNABLE, null); FINISHED.cancel(false); - DISPOSED = new FutureTask(Functions.EMPTY_RUNNABLE, null); + DISPOSED = new FutureTask<>(Functions.EMPTY_RUNNABLE, null); DISPOSED.cancel(false); } @@ -363,7 +363,7 @@ static final class TrackedAction TrackedAction(Runnable actual, DisposableContainer parent) { this.actual = actual; this.lazySet(parent); - this.future = new AtomicReference>(); + this.future = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/schedulers/SharedScheduler.java b/src/main/java/hu/akarnokd/rxjava3/schedulers/SharedScheduler.java index b48851e7..8dc4f6ac 100644 --- a/src/main/java/hu/akarnokd/rxjava3/schedulers/SharedScheduler.java +++ b/src/main/java/hu/akarnokd/rxjava3/schedulers/SharedScheduler.java @@ -21,7 +21,7 @@ import io.reactivex.rxjava3.core.Scheduler; import io.reactivex.rxjava3.disposables.*; -import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * A Scheduler implementation that uses one of the Workers from another Scheduler @@ -109,7 +109,7 @@ public boolean isDisposed() { @Override public Disposable schedule(Runnable run, long delay, TimeUnit unit) { if (isDisposed() || worker.isDisposed()) { - return Disposables.disposed(); + return Disposable.disposed(); } SharedAction sa = new SharedAction(run, tasks); tasks.add(sa); @@ -142,7 +142,7 @@ static final class SharedAction SharedAction(Runnable actual, DisposableContainer parent) { this.actual = actual; this.lazySet(parent); - this.future = new AtomicReference(); + this.future = new AtomicReference<>(); } @Override diff --git a/src/main/java/hu/akarnokd/rxjava3/string/FlowableSplit.java b/src/main/java/hu/akarnokd/rxjava3/string/FlowableSplit.java index 3aae4bf7..dfb7de14 100644 --- a/src/main/java/hu/akarnokd/rxjava3/string/FlowableSplit.java +++ b/src/main/java/hu/akarnokd/rxjava3/string/FlowableSplit.java @@ -101,7 +101,7 @@ static final class SplitSubscriber this.pattern = pattern; this.bufferSize = bufferSize; this.limit = bufferSize - (bufferSize >> 2); - this.queue = new SpscArrayQueue(bufferSize); + this.queue = new SpscArrayQueue<>(bufferSize); this.requested = new AtomicLong(); } diff --git a/src/main/java/hu/akarnokd/rxjava3/string/StringFlowable.java b/src/main/java/hu/akarnokd/rxjava3/string/StringFlowable.java index 8da50728..778eeb60 100644 --- a/src/main/java/hu/akarnokd/rxjava3/string/StringFlowable.java +++ b/src/main/java/hu/akarnokd/rxjava3/string/StringFlowable.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.string; +import java.util.Objects; import java.util.regex.Pattern; import io.reactivex.rxjava3.core.*; @@ -37,7 +38,7 @@ private StringFlowable() { * @return the new Flowable instance */ public static Flowable characters(CharSequence string) { - ObjectHelper.requireNonNull(string, "string is null"); + Objects.requireNonNull(string, "string is null"); return RxJavaPlugins.onAssembly(new FlowableCharSequence(string)); } @@ -63,7 +64,7 @@ public static FlowableTransformer split(Pattern pattern) { * @since 0.13.0 */ public static FlowableTransformer split(Pattern pattern, int bufferSize) { - ObjectHelper.requireNonNull(pattern, "pattern is null"); + Objects.requireNonNull(pattern, "pattern is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return new FlowableSplit(null, pattern, bufferSize); } diff --git a/src/main/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubject.java b/src/main/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubject.java index 75caf584..e6c73f1f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubject.java +++ b/src/main/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubject.java @@ -16,6 +16,7 @@ package hu.akarnokd.rxjava3.subjects; +import java.util.Objects; import java.util.concurrent.atomic.*; import hu.akarnokd.rxjava3.util.SpmcLinkedArrayQueue; @@ -23,7 +24,6 @@ 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.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; import io.reactivex.rxjava3.internal.util.ExceptionHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -88,7 +88,7 @@ public static DispatchWorkSubject create(Scheduler scheduler, boolean del * @return the new DispatchWorkSubject instance */ public static DispatchWorkSubject create(Scheduler scheduler, int capacityHint, boolean delayErrors) { - return new DispatchWorkSubject(capacityHint, delayErrors, scheduler); + return new DispatchWorkSubject<>(capacityHint, delayErrors, scheduler); } final SimplePlainQueue queue; @@ -112,12 +112,12 @@ public static DispatchWorkSubject create(Scheduler scheduler, int capacit @SuppressWarnings("unchecked") DispatchWorkSubject(int capacityHint, boolean delayErrors, Scheduler scheduler) { - this.queue = new SpmcLinkedArrayQueue(capacityHint); + this.queue = new SpmcLinkedArrayQueue<>(capacityHint); this.delayErrors = delayErrors; this.wip = new AtomicInteger(); - this.upstream = new AtomicReference(); - this.error = new AtomicReference(); - this.observers = new AtomicReference[]>(EMPTY); + this.upstream = new AtomicReference<>(); + this.error = new AtomicReference<>(); + this.observers = new AtomicReference<>(EMPTY); this.scheduler = scheduler; } @@ -139,7 +139,7 @@ public void onNext(T t) { @SuppressWarnings("unchecked") @Override public void onError(Throwable e) { - ObjectHelper.requireNonNull(e, "e is null"); + Objects.requireNonNull(e, "e is null"); if (error.compareAndSet(null, e)) { for (WorkDisposable wd : observers.getAndSet(TERMINATED)) { wd.drain(); @@ -161,7 +161,7 @@ public void onComplete() { @Override protected void subscribeActual(Observer observer) { - WorkDisposable wd = new WorkDisposable(observer, this, scheduler.createWorker(), delayErrors); + WorkDisposable wd = new WorkDisposable<>(observer, this, scheduler.createWorker(), delayErrors); observer.onSubscribe(wd); if (add(wd)) { if (wd.isDisposed()) { diff --git a/src/main/java/hu/akarnokd/rxjava3/subjects/RefCountSubject.java b/src/main/java/hu/akarnokd/rxjava3/subjects/RefCountSubject.java index 9f735e84..59cb3289 100644 --- a/src/main/java/hu/akarnokd/rxjava3/subjects/RefCountSubject.java +++ b/src/main/java/hu/akarnokd/rxjava3/subjects/RefCountSubject.java @@ -44,8 +44,8 @@ @SuppressWarnings("unchecked") RefCountSubject(Subject actual) { this.actual = actual; - this.upstream = new AtomicReference(); - this.observers = new AtomicReference[]>(EMPTY); + this.upstream = new AtomicReference<>(); + this.observers = new AtomicReference<>(EMPTY); } @Override @@ -74,7 +74,7 @@ public void onComplete() { @Override protected void subscribeActual(Observer observer) { - RefCountObserver rcs = new RefCountObserver(observer, this); + RefCountObserver rcs = new RefCountObserver<>(observer, this); if (!add(rcs)) { EmptyDisposable.error(new IllegalStateException("RefCountSubject terminated"), observer); return; diff --git a/src/main/java/hu/akarnokd/rxjava3/subjects/Subjects.java b/src/main/java/hu/akarnokd/rxjava3/subjects/Subjects.java index 6f8eb052..ce6a382e 100644 --- a/src/main/java/hu/akarnokd/rxjava3/subjects/Subjects.java +++ b/src/main/java/hu/akarnokd/rxjava3/subjects/Subjects.java @@ -16,8 +16,9 @@ package hu.akarnokd.rxjava3.subjects; +import java.util.Objects; + import io.reactivex.rxjava3.annotations.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.subjects.Subject; /** @@ -48,6 +49,6 @@ public static Subject refCount(Subject subject) { if (subject instanceof RefCountSubject) { return subject; } - return new RefCountSubject(ObjectHelper.requireNonNull(subject, "subject is null")); + return new RefCountSubject<>(Objects.requireNonNull(subject, "subject is null")); } } diff --git a/src/main/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubject.java b/src/main/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubject.java index 5d4be951..cf972a56 100644 --- a/src/main/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubject.java +++ b/src/main/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubject.java @@ -16,12 +16,12 @@ package hu.akarnokd.rxjava3.subjects; +import java.util.Objects; import java.util.concurrent.atomic.*; 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.SimplePlainQueue; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.util.ExceptionHelper; @@ -90,7 +90,7 @@ public static UnicastWorkSubject create(boolean delayErrors) { * @return the new UnicastWorkSubject instance */ public static UnicastWorkSubject create(int capacityHint, boolean delayErrors) { - return new UnicastWorkSubject(capacityHint, delayErrors); + return new UnicastWorkSubject<>(capacityHint, delayErrors); } final SimplePlainQueue queue; @@ -108,12 +108,12 @@ public static UnicastWorkSubject create(int capacityHint, boolean delayEr T item; UnicastWorkSubject(int capacityHint, boolean delayErrors) { - this.queue = new SpscLinkedArrayQueue(capacityHint); + this.queue = new SpscLinkedArrayQueue<>(capacityHint); this.delayErrors = delayErrors; - this.consumer = new AtomicReference(); - this.upstream = new AtomicReference(); + this.consumer = new AtomicReference<>(); + this.upstream = new AtomicReference<>(); this.wip = new AtomicInteger(); - this.error = new AtomicReference(); + this.error = new AtomicReference<>(); } @Override @@ -123,7 +123,7 @@ public void onSubscribe(Disposable d) { @Override public void onNext(T t) { - ObjectHelper.requireNonNull(t, "t is null"); + Objects.requireNonNull(t, "t is null"); if (error.get() == null) { queue.offer(t); drain(); @@ -132,7 +132,7 @@ public void onNext(T t) { @Override public void onError(Throwable e) { - ObjectHelper.requireNonNull(e, "e is null"); + Objects.requireNonNull(e, "e is null"); if (error.compareAndSet(null, e)) { drain(); } else { diff --git a/src/main/java/hu/akarnokd/rxjava3/util/CompositeSubscription.java b/src/main/java/hu/akarnokd/rxjava3/util/CompositeSubscription.java index 70a8cecb..020c7b63 100644 --- a/src/main/java/hu/akarnokd/rxjava3/util/CompositeSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/CompositeSubscription.java @@ -35,7 +35,7 @@ public boolean add(Subscription s) { if (!cancelled) { OpenHashSet h = set; if (h == null) { - h = new OpenHashSet(); + h = new OpenHashSet<>(); set = h; } h.add(s); diff --git a/src/main/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueue.java b/src/main/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueue.java index d609aca4..39b4d220 100644 --- a/src/main/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueue.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueue.java @@ -16,9 +16,9 @@ package hu.akarnokd.rxjava3.util; +import java.util.Objects; import java.util.concurrent.atomic.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; /** @@ -38,12 +38,12 @@ public final class SpmcLinkedArrayQueue implements SimplePlainQueue { public SpmcLinkedArrayQueue(int capacity) { ARA a = new ARA(Math.max(2, capacity) + 1); this.producerArray = a; - this.consumerArray = new AtomicReference(a); + this.consumerArray = new AtomicReference<>(a); } @Override public boolean offer(T value) { - ObjectHelper.requireNonNull(value, "value is null"); + Objects.requireNonNull(value, "value is null"); ARA pa = producerArray; int pi = producerIndex; @@ -63,8 +63,8 @@ public boolean offer(T value) { @Override public boolean offer(T v1, T v2) { - ObjectHelper.requireNonNull(v1, "v1 is null"); - ObjectHelper.requireNonNull(v2, "v2 is null"); + Objects.requireNonNull(v1, "v1 is null"); + Objects.requireNonNull(v2, "v2 is null"); ARA pa = producerArray; int pi = producerIndex; diff --git a/src/main/java/hu/akarnokd/rxjava3/util/SpscOneQueue.java b/src/main/java/hu/akarnokd/rxjava3/util/SpscOneQueue.java index 2434719b..b61ccf3b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/util/SpscOneQueue.java +++ b/src/main/java/hu/akarnokd/rxjava3/util/SpscOneQueue.java @@ -16,9 +16,9 @@ package hu.akarnokd.rxjava3.util; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; /** @@ -33,7 +33,7 @@ public final class SpscOneQueue extends AtomicReference @Override public boolean offer(T value) { - ObjectHelper.requireNonNull(value, "value is null"); + Objects.requireNonNull(value, "value is null"); if (get() == null) { lazySet(value); return true; diff --git a/src/test/java/hu/akarnokd/rxjava3/async/AsyncFlowableTest.java b/src/test/java/hu/akarnokd/rxjava3/async/AsyncFlowableTest.java index 8fb4a598..84652fd1 100644 --- a/src/test/java/hu/akarnokd/rxjava3/async/AsyncFlowableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/async/AsyncFlowableTest.java @@ -84,7 +84,7 @@ static final class MultiFunction SimpleCallable, Function, BiFunction, Function3, Function4, Function5, Function6, Function7, Function8, Function9, Supplier { - final AtomicReference state = new AtomicReference(); + final AtomicReference state = new AtomicReference<>(); void setState(String s) { state.set(s); @@ -359,8 +359,9 @@ public void toAsyncConsumer9() { @Test public void toAsyncConsumerN() { MultiFunction f = new MultiFunction(); + Consumer f2 = f; - AsyncFlowable.toAsyncArray((Consumer)f) + AsyncFlowable.toAsyncArray(f2) .apply(new Object[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }) .test() .awaitDone(5, TimeUnit.SECONDS) @@ -659,8 +660,9 @@ public void toAsyncConsumer9Scheduler() { @Test public void toAsyncConsumerNScheduler() { MultiFunction f = new MultiFunction(); + Consumer f2 = f; - AsyncFlowable.toAsyncArray((Consumer)f, Schedulers.single()) + AsyncFlowable.toAsyncArray(f2, Schedulers.single()) .apply(new Object[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }) .test() .awaitDone(5, TimeUnit.SECONDS) @@ -815,7 +817,7 @@ public void toAsyncFunctionNScheduler() { @Test public void startFuture() { - final FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, 1); + final FutureTask ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, 1); ft.run(); AsyncFlowable.startFuture(new Supplier>() { @Override @@ -830,7 +832,7 @@ public Future get() throws Exception { @Test public void startFutureNull() { - final FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, null); + final FutureTask ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, null); ft.run(); AsyncFlowable.startFuture(new Supplier>() { @Override @@ -845,7 +847,7 @@ public Future get() throws Exception { @Test public void startFutureCustomScheduler() { - final FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, 1); + final FutureTask ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, 1); ft.run(); AsyncFlowable.startFuture(new Supplier>() { @Override @@ -860,7 +862,7 @@ public Future get() throws Exception { @Test public void deferFuture() { - final FutureTask> ft = new FutureTask>(Functions.EMPTY_RUNNABLE, Flowable.just(1)); + final FutureTask> ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, Flowable.just(1)); ft.run(); AsyncFlowable.deferFuture(new Supplier>>() { @@ -876,7 +878,7 @@ public Future> get() throws Exception { @Test public void deferFutureCustomScheduler() { - final FutureTask> ft = new FutureTask>(Functions.EMPTY_RUNNABLE, Flowable.just(1)); + final FutureTask> ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, Flowable.just(1)); ft.run(); AsyncFlowable.deferFuture(new Supplier>>() { @@ -892,7 +894,7 @@ public Future> get() throws Exception { @Test public void forEachFutureC1() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); assertNull(AsyncFlowable.forEachFuture(Flowable.range(1, 5), new Consumer() { @Override @@ -907,7 +909,7 @@ public void accept(Integer v) throws Exception { @Test public void forEachFutureC1Error() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); try { AsyncFlowable.forEachFuture(Flowable.error(new IOException()), new Consumer() { @@ -928,7 +930,7 @@ public void accept(Integer v) throws Exception { @Test public void forEachFutureC1C2() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); assertNull(AsyncFlowable.forEachFuture(Flowable.range(1, 5), new Consumer() { @Override @@ -948,7 +950,7 @@ public void accept(Throwable e) throws Exception { @Test public void forEachFutureC1C2Error() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); try { AsyncFlowable.forEachFuture(Flowable.error(new IOException()), new Consumer() { @Override @@ -973,7 +975,7 @@ public void accept(Throwable e) throws Exception { @Test public void forEachFutureC1C2A3() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); assertNull(AsyncFlowable.forEachFuture(Flowable.range(1, 5), new Consumer() { @Override @@ -998,7 +1000,7 @@ public void run() throws Exception { @Test public void forEachFutureC1C2A3Error() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); try { AsyncFlowable.forEachFuture(Flowable.error(new IOException()), new Consumer() { @Override @@ -1028,7 +1030,7 @@ public void run() throws Exception { @Test public void forEachFutureC1Scheduler() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); assertNull(AsyncFlowable.forEachFuture(Flowable.range(1, 5), new Consumer() { @Override @@ -1043,7 +1045,7 @@ public void accept(Integer v) throws Exception { @Test public void forEachFutureC1ErrorScheduler() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); try { AsyncFlowable.forEachFuture(Flowable.error(new IOException()), new Consumer() { @@ -1064,7 +1066,7 @@ public void accept(Integer v) throws Exception { @Test public void forEachFutureC1C2Scheduler() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); assertNull(AsyncFlowable.forEachFuture(Flowable.range(1, 5), new Consumer() { @Override @@ -1084,7 +1086,7 @@ public void accept(Throwable e) throws Exception { @Test public void forEachFutureC1C2ErrorScheduler() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); try { AsyncFlowable.forEachFuture(Flowable.error(new IOException()), new Consumer() { @Override @@ -1109,7 +1111,7 @@ public void accept(Throwable e) throws Exception { @Test public void forEachFutureC1C2A3Scheduler() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); assertNull(AsyncFlowable.forEachFuture(Flowable.range(1, 5), new Consumer() { @Override @@ -1134,7 +1136,7 @@ public void run() throws Exception { @Test public void forEachFutureC1C2A3ErrorScheduler() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); try { AsyncFlowable.forEachFuture(Flowable.error(new IOException()), new Consumer() { @Override @@ -1165,7 +1167,7 @@ public void run() throws Exception { @Test public void runAsync() { - AsyncFlowable.runAsync(Schedulers.single(), new BiConsumer, Disposable>() { + AsyncFlowable.runAsync(Schedulers.single(), new BiConsumer, Disposable>() { @Override public void accept(Subscriber s, Disposable d) throws Exception { Thread.sleep(200); @@ -1187,7 +1189,7 @@ public void accept(Subscriber s, Disposable d) throws Exception public void runAsyncProcessor() { AsyncFlowable.runAsync(Schedulers.single(), UnicastProcessor.create(), - new BiConsumer, Disposable>() { + new BiConsumer, Disposable>() { @Override public void accept(Subscriber s, Disposable d) throws Exception { s.onNext(1); diff --git a/src/test/java/hu/akarnokd/rxjava3/async/AsyncObservableTest.java b/src/test/java/hu/akarnokd/rxjava3/async/AsyncObservableTest.java index ab6ec9b2..5638ee6f 100644 --- a/src/test/java/hu/akarnokd/rxjava3/async/AsyncObservableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/async/AsyncObservableTest.java @@ -224,8 +224,9 @@ public void toAsyncConsumer9() { @Test public void toAsyncConsumerN() { MultiFunction f = new MultiFunction(); + Consumer f2 = f; - AsyncObservable.toAsyncArray((Consumer)f) + AsyncObservable.toAsyncArray(f2) .apply(new Object[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }) .test() .awaitDone(5, TimeUnit.SECONDS) @@ -524,8 +525,9 @@ public void toAsyncConsumer9Scheduler() { @Test public void toAsyncConsumerNScheduler() { MultiFunction f = new MultiFunction(); + Consumer f2 = f; - AsyncObservable.toAsyncArray((Consumer)f, Schedulers.single()) + AsyncObservable.toAsyncArray(f2, Schedulers.single()) .apply(new Object[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }) .test() .awaitDone(5, TimeUnit.SECONDS) @@ -680,7 +682,7 @@ public void toAsyncFunctionNScheduler() { @Test public void startFuture() { - final FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, 1); + final FutureTask ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, 1); ft.run(); AsyncObservable.startFuture(new Supplier>() { @Override @@ -695,7 +697,7 @@ public Future get() throws Exception { @Test public void startFutureNull() { - final FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, null); + final FutureTask ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, null); ft.run(); AsyncObservable.startFuture(new Supplier>() { @Override @@ -710,7 +712,7 @@ public Future get() throws Exception { @Test public void startFutureCustomScheduler() { - final FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, 1); + final FutureTask ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, 1); ft.run(); AsyncObservable.startFuture(new Supplier>() { @Override @@ -725,7 +727,7 @@ public Future get() throws Exception { @Test public void deferFuture() { - final FutureTask> ft = new FutureTask>(Functions.EMPTY_RUNNABLE, Observable.just(1)); + final FutureTask> ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, Observable.just(1)); ft.run(); AsyncObservable.deferFuture(new Supplier>>() { @@ -741,7 +743,7 @@ public Future> get() throws Exception { @Test public void deferFutureCustomScheduler() { - final FutureTask> ft = new FutureTask>(Functions.EMPTY_RUNNABLE, Observable.just(1)); + final FutureTask> ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, Observable.just(1)); ft.run(); AsyncObservable.deferFuture(new Supplier>>() { @@ -757,7 +759,7 @@ public Future> get() throws Exception { @Test public void forEachFutureC1() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); assertNull(AsyncObservable.forEachFuture(Observable.range(1, 5), new Consumer() { @Override @@ -772,7 +774,7 @@ public void accept(Integer v) throws Exception { @Test public void forEachFutureC1Error() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); try { AsyncObservable.forEachFuture(Observable.error(new IOException()), new Consumer() { @@ -793,7 +795,7 @@ public void accept(Integer v) throws Exception { @Test public void forEachFutureC1C2() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); assertNull(AsyncObservable.forEachFuture(Observable.range(1, 5), new Consumer() { @Override @@ -813,7 +815,7 @@ public void accept(Throwable e) throws Exception { @Test public void forEachFutureC1C2Error() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); try { AsyncObservable.forEachFuture(Observable.error(new IOException()), new Consumer() { @Override @@ -838,7 +840,7 @@ public void accept(Throwable e) throws Exception { @Test public void forEachFutureC1C2A3() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); assertNull(AsyncObservable.forEachFuture(Observable.range(1, 5), new Consumer() { @Override @@ -863,7 +865,7 @@ public void run() throws Exception { @Test public void forEachFutureC1C2A3Error() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); try { AsyncObservable.forEachFuture(Observable.error(new IOException()), new Consumer() { @Override @@ -893,7 +895,7 @@ public void run() throws Exception { @Test public void forEachFutureC1Scheduler() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); assertNull(AsyncObservable.forEachFuture(Observable.range(1, 5), new Consumer() { @Override @@ -908,7 +910,7 @@ public void accept(Integer v) throws Exception { @Test public void forEachFutureC1ErrorScheduler() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); try { AsyncObservable.forEachFuture(Observable.error(new IOException()), new Consumer() { @@ -929,7 +931,7 @@ public void accept(Integer v) throws Exception { @Test public void forEachFutureC1C2Scheduler() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); assertNull(AsyncObservable.forEachFuture(Observable.range(1, 5), new Consumer() { @Override @@ -949,7 +951,7 @@ public void accept(Throwable e) throws Exception { @Test public void forEachFutureC1C2ErrorScheduler() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); try { AsyncObservable.forEachFuture(Observable.error(new IOException()), new Consumer() { @Override @@ -974,7 +976,7 @@ public void accept(Throwable e) throws Exception { @Test public void forEachFutureC1C2A3Scheduler() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); assertNull(AsyncObservable.forEachFuture(Observable.range(1, 5), new Consumer() { @Override @@ -999,7 +1001,7 @@ public void run() throws Exception { @Test public void forEachFutureC1C2A3ErrorScheduler() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); try { AsyncObservable.forEachFuture(Observable.error(new IOException()), new Consumer() { @Override @@ -1030,7 +1032,7 @@ public void run() throws Exception { @Test public void runAsync() { - AsyncObservable.runAsync(Schedulers.single(), new BiConsumer, Disposable>() { + AsyncObservable.runAsync(Schedulers.single(), new BiConsumer, Disposable>() { @Override public void accept(Observer observer, Disposable d) throws Exception { Thread.sleep(200); @@ -1052,7 +1054,7 @@ public void accept(Observer observer, Disposable d) throws Excep public void runAsyncProcessor() { AsyncObservable.runAsync(Schedulers.single(), UnicastSubject.create(), - new BiConsumer, Disposable>() { + new BiConsumer, Disposable>() { @Override public void accept(Observer observer, Disposable d) throws Exception { observer.onNext(1); diff --git a/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoProcessorTest.java b/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoProcessorTest.java index b8aab940..5241a00d 100644 --- a/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoProcessorTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoProcessorTest.java @@ -231,7 +231,7 @@ public void onNextNpe() { @Test public void crossCancelComplete() { - final TestSubscriber ts1 = new TestSubscriber(); + final TestSubscriber ts1 = new TestSubscriber<>(); TestSubscriber ts2 = new TestSubscriber() { @Override @@ -253,7 +253,7 @@ public void onComplete() { @Test public void crossCancelError() { - final TestSubscriber ts1 = new TestSubscriber(); + final TestSubscriber ts1 = new TestSubscriber<>(); TestSubscriber ts2 = new TestSubscriber() { @Override diff --git a/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoTest.java b/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoTest.java index f5c8acce..dfe10439 100644 --- a/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoTest.java @@ -189,7 +189,7 @@ public void run() throws Exception { public void fromFuture() { final int[] counter = { 0 }; - FutureTask ft = new FutureTask(new Callable() { + FutureTask ft = new FutureTask<>(new Callable() { @Override public Void call() throws Exception { counter[0]++; @@ -210,7 +210,7 @@ public Void call() throws Exception { public void fromFutureThrows() { final int[] counter = { 0 }; - FutureTask ft = new FutureTask(new Callable() { + FutureTask ft = new FutureTask<>(new Callable() { @Override public Void call() throws Exception { counter[0]++; @@ -231,7 +231,7 @@ public Void call() throws Exception { public void fromFutureWithTimeout() { final int[] counter = { 0 }; - FutureTask ft = new FutureTask(new Callable() { + FutureTask ft = new FutureTask<>(new Callable() { @Override public Void call() throws Exception { counter[0]++; @@ -252,7 +252,7 @@ public Void call() throws Exception { public void fromFutureWithTimeoutError() { final int[] counter = { 0 }; - FutureTask ft = new FutureTask(new Callable() { + FutureTask ft = new FutureTask<>(new Callable() { @Override public Void call() throws Exception { counter[0]++; @@ -273,7 +273,7 @@ public Void call() throws Exception { public void fromFutureWithTimeoutDoTimeout() { final int[] counter = { 0 }; - FutureTask ft = new FutureTask(new Callable() { + FutureTask ft = new FutureTask<>(new Callable() { @Override public Void call() throws Exception { counter[0]++; @@ -2239,7 +2239,7 @@ protected void subscribeActual(Subscriber s) { @Test public void subscribeWith() { - TestSubscriber ts = new TestSubscriber(); + TestSubscriber ts = new TestSubscriber<>(); Assert.assertSame(ts, Nono.complete().subscribeWith(ts)); } diff --git a/src/test/java/hu/akarnokd/rxjava3/basetypes/PerhapsTest.java b/src/test/java/hu/akarnokd/rxjava3/basetypes/PerhapsTest.java index acd75905..3b24ca79 100644 --- a/src/test/java/hu/akarnokd/rxjava3/basetypes/PerhapsTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/basetypes/PerhapsTest.java @@ -115,7 +115,7 @@ public Object apply(Integer v) throws Exception { @Test public void fromFuture() { - FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, 1); + FutureTask ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, 1); ft.run(); Perhaps.fromFuture(ft) @@ -125,7 +125,7 @@ public void fromFuture() { @Test public void fromFutureNull() { - FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, null); + FutureTask ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, null); ft.run(); Perhaps.fromFuture(ft) @@ -135,7 +135,7 @@ public void fromFutureNull() { @Test public void fromFutureTimeout() { - FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, 1); + FutureTask ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, 1); Perhaps.fromFuture(ft, 1, TimeUnit.MILLISECONDS) .test() @@ -144,7 +144,7 @@ public void fromFutureTimeout() { @Test public void fromFutureCrash() { - FutureTask ft = new FutureTask(new Callable() { + FutureTask ft = new FutureTask<>(new Callable() { @Override public Integer call() throws Exception { throw new IOException(); @@ -423,7 +423,6 @@ public void fromSingleBackpressured() { .assertResult(1); } - @SuppressWarnings("unchecked") @Test public void ambIterable1() { PerhapsProcessor sp1 = PerhapsProcessor.create(); @@ -445,7 +444,6 @@ public void ambIterable1() { assertFalse(sp2.hasSubscribers()); } - @SuppressWarnings("unchecked") @Test public void ambIterable2() { PerhapsProcessor sp1 = PerhapsProcessor.create(); @@ -467,7 +465,6 @@ public void ambIterable2() { assertFalse(sp2.hasSubscribers()); } - @SuppressWarnings("unchecked") @Test public void ambIterable1Error() { PerhapsProcessor sp1 = PerhapsProcessor.create(); @@ -489,7 +486,6 @@ public void ambIterable1Error() { assertFalse(sp2.hasSubscribers()); } - @SuppressWarnings("unchecked") @Test public void ambIterable2Error() { PerhapsProcessor sp1 = PerhapsProcessor.create(); @@ -511,7 +507,6 @@ public void ambIterable2Error() { assertFalse(sp2.hasSubscribers()); } - @SuppressWarnings("unchecked") @Test public void ambArray1() { PerhapsProcessor sp1 = PerhapsProcessor.create(); @@ -533,7 +528,6 @@ public void ambArray1() { assertFalse(sp2.hasSubscribers()); } - @SuppressWarnings("unchecked") @Test public void ambArray2() { PerhapsProcessor sp1 = PerhapsProcessor.create(); @@ -555,7 +549,6 @@ public void ambArray2() { assertFalse(sp2.hasSubscribers()); } - @SuppressWarnings("unchecked") @Test public void ambArray1Error() { PerhapsProcessor sp1 = PerhapsProcessor.create(); @@ -577,7 +570,6 @@ public void ambArray1Error() { assertFalse(sp2.hasSubscribers()); } - @SuppressWarnings("unchecked") @Test public void ambArray2Error() { PerhapsProcessor sp1 = PerhapsProcessor.create(); @@ -599,7 +591,6 @@ public void ambArray2Error() { assertFalse(sp2.hasSubscribers()); } - @SuppressWarnings("unchecked") @Test public void concatIterable() { Perhaps.concat(Arrays.asList(Perhaps.just(1), Perhaps.just(2))) @@ -607,7 +598,6 @@ public void concatIterable() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void concatIterableError() { Perhaps.concat(Arrays.asList(Perhaps.just(1), Perhaps.error(new IOException()))) @@ -615,7 +605,6 @@ public void concatIterableError() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void concatIterableError2() { Perhaps.concat(Arrays.asList(Perhaps.error(new IOException()), Perhaps.just(2))) @@ -661,7 +650,6 @@ public void concatPublisherError3() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void concatArray() { Perhaps.concatArray(Perhaps.just(1), Perhaps.just(2)) @@ -669,7 +657,6 @@ public void concatArray() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void concatArrayError() { Perhaps.concatArray(Perhaps.just(1), Perhaps.error(new IOException())) @@ -677,7 +664,6 @@ public void concatArrayError() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void concatArrayError2() { Perhaps.concatArray(Perhaps.error(new IOException()), Perhaps.just(2)) @@ -685,7 +671,6 @@ public void concatArrayError2() { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void concatIterableDelayError() { Perhaps.concatDelayError(Arrays.asList(Perhaps.just(1), Perhaps.just(2))) @@ -693,7 +678,6 @@ public void concatIterableDelayError() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void concatIterableDelayErrorError() { Perhaps.concatDelayError(Arrays.asList(Perhaps.just(1), Perhaps.error(new IOException()))) @@ -701,7 +685,6 @@ public void concatIterableDelayErrorError() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void concatIterableDelayErrorError2() { Perhaps.concatDelayError(Arrays.asList(Perhaps.error(new IOException()), Perhaps.just(2))) @@ -747,7 +730,6 @@ public void concatDelayErrorPublisherError3() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void concatArrayDelayError() { Perhaps.concatArrayDelayError(Perhaps.just(1), Perhaps.just(2)) @@ -755,7 +737,6 @@ public void concatArrayDelayError() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void concatArrayDelayErrorError() { Perhaps.concatArrayDelayError(Perhaps.just(1), Perhaps.error(new IOException())) @@ -763,7 +744,6 @@ public void concatArrayDelayErrorError() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void concatArrayDelayErrorError2() { Perhaps.concatArrayDelayError(Perhaps.error(new IOException()), Perhaps.just(2)) @@ -771,7 +751,6 @@ public void concatArrayDelayErrorError2() { .assertFailure(IOException.class, 2); } - @SuppressWarnings("unchecked") @Test public void mergeIterable() { Perhaps.merge(Arrays.asList(Perhaps.just(1), Perhaps.just(2))) @@ -779,7 +758,6 @@ public void mergeIterable() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void mergeIterableError() { Perhaps.merge(Arrays.asList(Perhaps.just(1), Perhaps.error(new IOException()))) @@ -787,7 +765,6 @@ public void mergeIterableError() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void mergeIterableError2() { Perhaps.merge(Arrays.asList(Perhaps.error(new IOException()), Perhaps.just(2))) @@ -833,7 +810,6 @@ public void mergePublisherError3() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void mergeArray() { Perhaps.mergeArray(Perhaps.just(1), Perhaps.just(2)) @@ -841,7 +817,6 @@ public void mergeArray() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void mergeArrayError() { Perhaps.mergeArray(Perhaps.just(1), Perhaps.error(new IOException())) @@ -849,7 +824,6 @@ public void mergeArrayError() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void mergeArrayError2() { Perhaps.mergeArray(Perhaps.error(new IOException()), Perhaps.just(2)) @@ -857,7 +831,6 @@ public void mergeArrayError2() { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void mergeIterableDelayError() { Perhaps.mergeDelayError(Arrays.asList(Perhaps.just(1), Perhaps.just(2))) @@ -865,7 +838,6 @@ public void mergeIterableDelayError() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void mergeIterableDelayErrorError() { Perhaps.mergeDelayError(Arrays.asList(Perhaps.just(1), Perhaps.error(new IOException()))) @@ -873,7 +845,6 @@ public void mergeIterableDelayErrorError() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void mergeIterableDelayErrorError2() { Perhaps.mergeDelayError(Arrays.asList(Perhaps.error(new IOException()), Perhaps.just(2))) @@ -919,7 +890,6 @@ public void mergeDelayErrorPublisherError3() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void mergeArrayDelayError() { Perhaps.mergeArrayDelayError(Perhaps.just(1), Perhaps.just(2)) @@ -927,7 +897,6 @@ public void mergeArrayDelayError() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void mergeArrayDelayErrorError() { Perhaps.mergeArrayDelayError(Perhaps.just(1), Perhaps.error(new IOException())) @@ -935,7 +904,6 @@ public void mergeArrayDelayErrorError() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void mergeArrayDelayErrorError2() { Perhaps.mergeArrayDelayError(Perhaps.error(new IOException()), Perhaps.just(2)) @@ -990,7 +958,6 @@ public void usingNonEager() { assertEquals(1, count); } - @SuppressWarnings("unchecked") @Test public void zip() { Perhaps.zip(Arrays.asList(Perhaps.just(1), Perhaps.just(2)), new Function() { @@ -1003,7 +970,6 @@ public Object apply(Object[] a) throws Exception { .assertResult("12"); } - @SuppressWarnings("unchecked") @Test public void zipError1() { Perhaps.zip(Arrays.asList(Perhaps.error(new IOException()), Perhaps.just(2)), new Function() { @@ -1016,7 +982,6 @@ public Object apply(Object[] a) throws Exception { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void zipError2() { Perhaps.zip(Arrays.asList(Perhaps.just(1), Perhaps.error(new IOException())), new Function() { @@ -1029,7 +994,6 @@ public Object apply(Object[] a) throws Exception { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void zipArray() { Perhaps.zipArray(new Function() { @@ -1042,7 +1006,6 @@ public Object apply(Object[] a) throws Exception { .assertResult("12"); } - @SuppressWarnings("unchecked") @Test public void zipArrayError1() { Perhaps.zipArray(new Function() { @@ -1055,7 +1018,6 @@ public Object apply(Object[] a) throws Exception { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void zipArrayError2() { Perhaps.zipArray(new Function() { @@ -2607,7 +2569,6 @@ public void mergeMaxConcurrent() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void mergeIterableMaxConcurrent() { Perhaps.merge(Arrays.asList(Perhaps.just(1), Perhaps.just(2)), 1) @@ -2615,7 +2576,6 @@ public void mergeIterableMaxConcurrent() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void mergeArrayMaxConcurrent() { Perhaps.mergeArray(1, Perhaps.just(1), Perhaps.just(2)) @@ -2623,7 +2583,6 @@ public void mergeArrayMaxConcurrent() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void mergeArrayDelayErrorMaxConcurrent() { Perhaps.mergeArrayDelayError(1, Perhaps.just(1), Perhaps.just(2)) @@ -2631,7 +2590,6 @@ public void mergeArrayDelayErrorMaxConcurrent() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void mergeIterableDelayErrorMaxConcurrent() { Perhaps.mergeDelayError(Arrays.asList(Perhaps.just(1), Perhaps.just(2)), 1) diff --git a/src/test/java/hu/akarnokd/rxjava3/basetypes/SoloTest.java b/src/test/java/hu/akarnokd/rxjava3/basetypes/SoloTest.java index 8209e401..24cbc28b 100644 --- a/src/test/java/hu/akarnokd/rxjava3/basetypes/SoloTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/basetypes/SoloTest.java @@ -364,7 +364,6 @@ public void fromSingleBackpressured() { .assertResult(1); } - @SuppressWarnings("unchecked") @Test public void ambIterable1() { SoloProcessor sp1 = SoloProcessor.create(); @@ -386,7 +385,6 @@ public void ambIterable1() { assertFalse(sp2.hasSubscribers()); } - @SuppressWarnings("unchecked") @Test public void ambIterable2() { SoloProcessor sp1 = SoloProcessor.create(); @@ -408,7 +406,6 @@ public void ambIterable2() { assertFalse(sp2.hasSubscribers()); } - @SuppressWarnings("unchecked") @Test public void ambIterable1Error() { SoloProcessor sp1 = SoloProcessor.create(); @@ -430,7 +427,6 @@ public void ambIterable1Error() { assertFalse(sp2.hasSubscribers()); } - @SuppressWarnings("unchecked") @Test public void ambIterable2Error() { SoloProcessor sp1 = SoloProcessor.create(); @@ -452,7 +448,6 @@ public void ambIterable2Error() { assertFalse(sp2.hasSubscribers()); } - @SuppressWarnings("unchecked") @Test public void ambArray1() { SoloProcessor sp1 = SoloProcessor.create(); @@ -474,7 +469,6 @@ public void ambArray1() { assertFalse(sp2.hasSubscribers()); } - @SuppressWarnings("unchecked") @Test public void ambArray2() { SoloProcessor sp1 = SoloProcessor.create(); @@ -496,7 +490,6 @@ public void ambArray2() { assertFalse(sp2.hasSubscribers()); } - @SuppressWarnings("unchecked") @Test public void ambArray1Error() { SoloProcessor sp1 = SoloProcessor.create(); @@ -518,7 +511,6 @@ public void ambArray1Error() { assertFalse(sp2.hasSubscribers()); } - @SuppressWarnings("unchecked") @Test public void ambArray2Error() { SoloProcessor sp1 = SoloProcessor.create(); @@ -540,7 +532,6 @@ public void ambArray2Error() { assertFalse(sp2.hasSubscribers()); } - @SuppressWarnings("unchecked") @Test public void concatIterable() { Solo.concat(Arrays.asList(Solo.just(1), Solo.just(2))) @@ -548,7 +539,6 @@ public void concatIterable() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void concatIterableError() { Solo.concat(Arrays.asList(Solo.just(1), Solo.error(new IOException()))) @@ -556,7 +546,6 @@ public void concatIterableError() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void concatIterableError2() { Solo.concat(Arrays.asList(Solo.error(new IOException()), Solo.just(2))) @@ -602,7 +591,6 @@ public void concatPublisherError3() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void concatArray() { Solo.concatArray(Solo.just(1), Solo.just(2)) @@ -610,7 +598,6 @@ public void concatArray() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void concatArrayError() { Solo.concatArray(Solo.just(1), Solo.error(new IOException())) @@ -618,7 +605,6 @@ public void concatArrayError() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void concatArrayError2() { Solo.concatArray(Solo.error(new IOException()), Solo.just(2)) @@ -626,7 +612,6 @@ public void concatArrayError2() { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void concatIterableDelayError() { Solo.concatDelayError(Arrays.asList(Solo.just(1), Solo.just(2))) @@ -634,7 +619,6 @@ public void concatIterableDelayError() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void concatIterableDelayErrorError() { Solo.concatDelayError(Arrays.asList(Solo.just(1), Solo.error(new IOException()))) @@ -642,7 +626,6 @@ public void concatIterableDelayErrorError() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void concatIterableDelayErrorError2() { Solo.concatDelayError(Arrays.asList(Solo.error(new IOException()), Solo.just(2))) @@ -688,7 +671,6 @@ public void concatDelayErrorPublisherError3() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void concatArrayDelayError() { Solo.concatArrayDelayError(Solo.just(1), Solo.just(2)) @@ -696,7 +678,6 @@ public void concatArrayDelayError() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void concatArrayDelayErrorError() { Solo.concatArrayDelayError(Solo.just(1), Solo.error(new IOException())) @@ -704,7 +685,6 @@ public void concatArrayDelayErrorError() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void concatArrayDelayErrorError2() { Solo.concatArrayDelayError(Solo.error(new IOException()), Solo.just(2)) @@ -712,7 +692,6 @@ public void concatArrayDelayErrorError2() { .assertFailure(IOException.class, 2); } - @SuppressWarnings("unchecked") @Test public void mergeIterable() { Solo.merge(Arrays.asList(Solo.just(1), Solo.just(2))) @@ -720,7 +699,6 @@ public void mergeIterable() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void mergeIterableError() { Solo.merge(Arrays.asList(Solo.just(1), Solo.error(new IOException()))) @@ -728,7 +706,6 @@ public void mergeIterableError() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void mergeIterableError2() { Solo.merge(Arrays.asList(Solo.error(new IOException()), Solo.just(2))) @@ -774,7 +751,6 @@ public void mergePublisherError3() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void mergeArray() { Solo.mergeArray(Solo.just(1), Solo.just(2)) @@ -782,7 +758,6 @@ public void mergeArray() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void mergeArrayError() { Solo.mergeArray(Solo.just(1), Solo.error(new IOException())) @@ -790,7 +765,6 @@ public void mergeArrayError() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void mergeArrayError2() { Solo.mergeArray(Solo.error(new IOException()), Solo.just(2)) @@ -798,7 +772,6 @@ public void mergeArrayError2() { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void mergeIterableDelayError() { Solo.mergeDelayError(Arrays.asList(Solo.just(1), Solo.just(2))) @@ -806,7 +779,6 @@ public void mergeIterableDelayError() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void mergeIterableDelayErrorError() { Solo.mergeDelayError(Arrays.asList(Solo.just(1), Solo.error(new IOException()))) @@ -814,7 +786,6 @@ public void mergeIterableDelayErrorError() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void mergeIterableDelayErrorError2() { Solo.mergeDelayError(Arrays.asList(Solo.error(new IOException()), Solo.just(2))) @@ -860,7 +831,6 @@ public void mergeDelayErrorPublisherError3() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void mergeArrayDelayError() { Solo.mergeArrayDelayError(Solo.just(1), Solo.just(2)) @@ -868,7 +838,6 @@ public void mergeArrayDelayError() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void mergeArrayDelayErrorError() { Solo.mergeArrayDelayError(Solo.just(1), Solo.error(new IOException())) @@ -876,7 +845,6 @@ public void mergeArrayDelayErrorError() { .assertFailure(IOException.class, 1); } - @SuppressWarnings("unchecked") @Test public void mergeArrayDelayErrorError2() { Solo.mergeArrayDelayError(Solo.error(new IOException()), Solo.just(2)) @@ -931,7 +899,6 @@ public void usingNonEager() { assertEquals(1, count); } - @SuppressWarnings("unchecked") @Test public void zip() { Solo.zip(Arrays.asList(Solo.just(1), Solo.just(2)), new Function() { @@ -944,7 +911,6 @@ public Object apply(Object[] a) throws Exception { .assertResult("12"); } - @SuppressWarnings("unchecked") @Test public void zipError1() { Solo.zip(Arrays.asList(Solo.error(new IOException()), Solo.just(2)), new Function() { @@ -957,7 +923,6 @@ public Object apply(Object[] a) throws Exception { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void zipError2() { Solo.zip(Arrays.asList(Solo.just(1), Solo.error(new IOException())), new Function() { @@ -970,7 +935,6 @@ public Object apply(Object[] a) throws Exception { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void zipArray() { Solo.zipArray(new Function() { @@ -983,7 +947,6 @@ public Object apply(Object[] a) throws Exception { .assertResult("12"); } - @SuppressWarnings("unchecked") @Test public void zipArrayError1() { Solo.zipArray(new Function() { @@ -996,7 +959,6 @@ public Object apply(Object[] a) throws Exception { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void zipArrayError2() { Solo.zipArray(new Function() { @@ -2479,7 +2441,7 @@ public void blockingSubscribeThreeArgError() { @Test public void fromFuture() { - FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, 1); + FutureTask ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, 1); ft.run(); Solo.fromFuture(ft) @@ -2489,7 +2451,7 @@ public void fromFuture() { @Test public void fromFutureNull() { - FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, null); + FutureTask ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, null); ft.run(); Solo.fromFuture(ft) @@ -2499,7 +2461,7 @@ public void fromFutureNull() { @Test public void fromFutureTimeout() { - FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, 1); + FutureTask ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, 1); Solo.fromFuture(ft, 1, TimeUnit.MILLISECONDS) .test() @@ -2508,7 +2470,7 @@ public void fromFutureTimeout() { @Test public void fromFutureCrash() { - FutureTask ft = new FutureTask(new Callable() { + FutureTask ft = new FutureTask<>(new Callable() { @Override public Integer call() throws Exception { throw new IOException(); diff --git a/src/test/java/hu/akarnokd/rxjava3/consumers/CompletableConsumersTest.java b/src/test/java/hu/akarnokd/rxjava3/consumers/CompletableConsumersTest.java index 5d2e5530..65ba1329 100644 --- a/src/test/java/hu/akarnokd/rxjava3/consumers/CompletableConsumersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/consumers/CompletableConsumersTest.java @@ -38,7 +38,7 @@ public class CompletableConsumersTest implements Consumer, Action { final CompletableSubject processor = CompletableSubject.create(); - final List events = new ArrayList(); + final List events = new ArrayList<>(); @Override public void run() throws Exception { @@ -198,10 +198,10 @@ public void badSource() { @Override protected void subscribeActual( CompletableObserver observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onComplete(); - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onComplete(); observer.onError(new IOException()); } diff --git a/src/test/java/hu/akarnokd/rxjava3/consumers/FlowableConsumersTest.java b/src/test/java/hu/akarnokd/rxjava3/consumers/FlowableConsumersTest.java index 0da94456..cab9dd95 100644 --- a/src/test/java/hu/akarnokd/rxjava3/consumers/FlowableConsumersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/consumers/FlowableConsumersTest.java @@ -40,7 +40,7 @@ public class FlowableConsumersTest implements Consumer, Action { final PublishProcessor processor = PublishProcessor.create(); - final List events = new ArrayList(); + final List events = new ArrayList<>(); @Override public void run() throws Exception { diff --git a/src/test/java/hu/akarnokd/rxjava3/consumers/MaybeConsumersTest.java b/src/test/java/hu/akarnokd/rxjava3/consumers/MaybeConsumersTest.java index 0e2db7d5..792a4a8b 100644 --- a/src/test/java/hu/akarnokd/rxjava3/consumers/MaybeConsumersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/consumers/MaybeConsumersTest.java @@ -38,7 +38,7 @@ public class MaybeConsumersTest implements Consumer, Action { final MaybeSubject processor = MaybeSubject.create(); - final List events = new ArrayList(); + final List events = new ArrayList<>(); @Override public void run() throws Exception { @@ -238,10 +238,10 @@ public void badSource() { @Override protected void subscribeActual( MaybeObserver observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onComplete(); - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onSuccess(2); observer.onComplete(); observer.onError(new IOException()); diff --git a/src/test/java/hu/akarnokd/rxjava3/consumers/ObservableConsumersTest.java b/src/test/java/hu/akarnokd/rxjava3/consumers/ObservableConsumersTest.java index 6d65b5d5..165a2bac 100644 --- a/src/test/java/hu/akarnokd/rxjava3/consumers/ObservableConsumersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/consumers/ObservableConsumersTest.java @@ -39,7 +39,7 @@ public class ObservableConsumersTest implements Consumer, Action { final PublishSubject processor = PublishSubject.create(); - final List events = new ArrayList(); + final List events = new ArrayList<>(); @Override public void run() throws Exception { @@ -291,11 +291,11 @@ public void badSource() { @Override protected void subscribeActual( Observer observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onNext(1); observer.onComplete(); - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onNext(2); observer.onComplete(); observer.onError(new IOException()); diff --git a/src/test/java/hu/akarnokd/rxjava3/consumers/SingleConsumersTest.java b/src/test/java/hu/akarnokd/rxjava3/consumers/SingleConsumersTest.java index 5b249b87..d3d5cc20 100644 --- a/src/test/java/hu/akarnokd/rxjava3/consumers/SingleConsumersTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/consumers/SingleConsumersTest.java @@ -38,7 +38,7 @@ public class SingleConsumersTest implements Consumer { final SingleSubject processor = SingleSubject.create(); - final List events = new ArrayList(); + final List events = new ArrayList<>(); @Override public void accept(Object t) throws Exception { @@ -158,10 +158,10 @@ public void badSource() { @Override protected void subscribeActual( SingleObserver observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onSuccess(1); - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onSuccess(2); observer.onError(new IOException()); } diff --git a/src/test/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidatorTest.java b/src/test/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidatorTest.java index 0e85c5c6..a0bedc98 100644 --- a/src/test/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidatorTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/debug/validator/RxJavaProtocolValidatorTest.java @@ -26,7 +26,7 @@ import hu.akarnokd.rxjava3.functions.PlainConsumer; import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.rxjava3.core.*; -import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.flowables.ConnectableFlowable; import io.reactivex.rxjava3.functions.Consumer; import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription; @@ -70,8 +70,8 @@ protected void subscribeActual(CompletableObserver observer) { observer.onError(null); observer.onError(new IOException()); observer.onSubscribe(null); - observer.onSubscribe(Disposables.empty()); - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); + observer.onSubscribe(Disposable.empty()); observer.onComplete(); } }; @@ -116,8 +116,8 @@ protected void subscribeActual(MaybeObserver observer) { observer.onSuccess(null); observer.onSuccess(1); observer.onSubscribe(null); - observer.onSubscribe(Disposables.empty()); - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); + observer.onSubscribe(Disposable.empty()); observer.onComplete(); observer.onSuccess(2); } @@ -173,8 +173,8 @@ protected void subscribeActual(SingleObserver observer) { observer.onSuccess(null); observer.onSuccess(1); observer.onSubscribe(null); - observer.onSubscribe(Disposables.empty()); - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); + observer.onSubscribe(Disposable.empty()); observer.onSuccess(2); } }; @@ -226,8 +226,8 @@ protected void subscribeActual(Observer observer) { observer.onNext(null); observer.onNext(1); observer.onSubscribe(null); - observer.onSubscribe(Disposables.empty()); - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); + observer.onSubscribe(Disposable.empty()); observer.onComplete(); observer.onNext(2); } @@ -408,8 +408,8 @@ protected void subscribeActual(Observer observer) { observer.onNext(null); observer.onNext(1); observer.onSubscribe(null); - observer.onSubscribe(Disposables.empty()); - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); + observer.onSubscribe(Disposable.empty()); observer.onComplete(); observer.onNext(2); } diff --git a/src/test/java/hu/akarnokd/rxjava3/expr/StatementCompletableTest.java b/src/test/java/hu/akarnokd/rxjava3/expr/StatementCompletableTest.java index dc22d9a8..5774bde6 100644 --- a/src/test/java/hu/akarnokd/rxjava3/expr/StatementCompletableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/expr/StatementCompletableTest.java @@ -95,7 +95,7 @@ public void testSimple() { Completable source2 = Completable.complete(); Completable defaultSource = Completable.error(new RuntimeException("Forced Failure")); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put(1, source1); map.put(2, source2); @@ -111,7 +111,7 @@ public void testDefaultCase() { Completable source1 = Completable.error(new RuntimeException("Forced Failure")); Completable source2 = Completable.complete(); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put(1, source1); @SuppressWarnings("unchecked") @@ -126,7 +126,7 @@ public void testCaseSelectorThrows() { Completable source1 = Completable.complete(); Completable defaultSource = Completable.complete(); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put(1, source1); @SuppressWarnings("unchecked") @@ -196,7 +196,7 @@ public void testChosenCompletableThrows() { Completable source2 = Completable.error(new RuntimeException("Forced failure")); Completable defaultSource = Completable.complete(); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put(1, source1); map.put(2, source2); diff --git a/src/test/java/hu/akarnokd/rxjava3/expr/StatementFlowableTest.java b/src/test/java/hu/akarnokd/rxjava3/expr/StatementFlowableTest.java index be120f6d..2afcfcf1 100644 --- a/src/test/java/hu/akarnokd/rxjava3/expr/StatementFlowableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/expr/StatementFlowableTest.java @@ -81,7 +81,8 @@ public boolean getAsBoolean() { }; } - void observe(Flowable source, T... values) { + @SafeVarargs + static void observe(Flowable source, T... values) { source.test().assertResult(values); } @@ -89,7 +90,8 @@ void observeSequence(Flowable source, Iterable values) { source.test().assertValueSequence(values).assertNoErrors().assertComplete(); } - void observeError(Flowable source, Class error, T... valuesBeforeError) { + @SafeVarargs + static void observeError(Flowable source, Class error, T... valuesBeforeError) { source.test().assertFailure(error, valuesBeforeError); } @@ -102,7 +104,7 @@ public void testSimple() { Flowable source1 = Flowable.just(1, 2, 3); Flowable source2 = Flowable.just(4, 5, 6); - Map> map = new HashMap>(); + Map> map = new HashMap<>(); map.put(1, source1); map.put(2, source2); @@ -118,7 +120,7 @@ public void testDefaultCase() { Flowable source1 = Flowable.just(1, 2, 3); Flowable source2 = Flowable.just(4, 5, 6); - Map> map = new HashMap>(); + Map> map = new HashMap<>(); map.put(1, source1); Flowable result = StatementFlowable.switchCase(func, map, source2); @@ -132,7 +134,7 @@ public void testDefaultCase() { public void testCaseSelectorThrows() { Flowable source1 = Flowable.just(1, 2, 3); - Map> map = new HashMap>(); + Map> map = new HashMap<>(); map.put(1, source1); Flowable result = StatementFlowable.switchCase(funcError, map); @@ -196,7 +198,7 @@ public void testChosenFlowableThrows() { Flowable source1 = Flowable.just(1, 2, 3); Flowable source2 = Flowable.error(new RuntimeException("Forced failure")); - Map> map = new HashMap>(); + Map> map = new HashMap<>(); map.put(1, source1); map.put(2, source2); @@ -322,7 +324,7 @@ public boolean getAsBoolean() { public void testDoWhileManyTimes() { Flowable source1 = Flowable.just(1, 2, 3).subscribeOn(Schedulers.trampoline()); - List expected = new ArrayList(numRecursion * 3); + List expected = new ArrayList<>(numRecursion * 3); for (int i = 0; i < numRecursion; i++) { expected.add(1); expected.add(2); @@ -362,7 +364,7 @@ public void testWhileDoZeroTimes() { public void testWhileDoManyTimes() { Flowable source1 = Flowable.just(1, 2, 3).subscribeOn(Schedulers.trampoline()); - List expected = new ArrayList(numRecursion * 3); + List expected = new ArrayList<>(numRecursion * 3); for (int i = 0; i < numRecursion; i++) { expected.add(1); expected.add(2); diff --git a/src/test/java/hu/akarnokd/rxjava3/expr/StatementMaybeTest.java b/src/test/java/hu/akarnokd/rxjava3/expr/StatementMaybeTest.java index 5523f5b6..e08a6397 100644 --- a/src/test/java/hu/akarnokd/rxjava3/expr/StatementMaybeTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/expr/StatementMaybeTest.java @@ -84,13 +84,11 @@ void observe(Maybe source) { source.test().assertNoValues().assertNoErrors(); } - @SuppressWarnings("unchecked") - void observe(Maybe source, T value) { + static void observe(Maybe source, T value) { source.test().assertResult(value); } - @SuppressWarnings("unchecked") - void observeError(Maybe source, Class error) { + static void observeError(Maybe source, Class error) { source.test().assertFailure(error); } @@ -99,7 +97,7 @@ public void testSimple() { Maybe source1 = Maybe.just(1); Maybe source2 = Maybe.just(2); - Map> map = new HashMap>(); + Map> map = new HashMap<>(); map.put(1, source1); map.put(2, source2); @@ -115,7 +113,7 @@ public void testDefaultCase() { Maybe source1 = Maybe.just(1); Maybe defaultSource = Maybe.just(2); - Map> map = new HashMap>(); + Map> map = new HashMap<>(); map.put(1, source1); Maybe result = StatementMaybe.switchCase(func, map, defaultSource); @@ -129,7 +127,7 @@ public void testDefaultCase() { public void testCaseSelectorThrows() { Maybe source1 = Maybe.just(1); - Map> map = new HashMap>(); + Map> map = new HashMap<>(); map.put(1, source1); Maybe result = StatementMaybe.switchCase(funcError, map); @@ -193,7 +191,7 @@ public void testChosenMaybeThrows() { Maybe source1 = Maybe.just(1); Maybe source2 = Maybe.error(new RuntimeException("Forced failure")); - Map> map = new HashMap>(); + Map> map = new HashMap<>(); map.put(1, source1); map.put(2, source2); diff --git a/src/test/java/hu/akarnokd/rxjava3/expr/StatementObservableTest.java b/src/test/java/hu/akarnokd/rxjava3/expr/StatementObservableTest.java index a0037ba0..aa27056e 100644 --- a/src/test/java/hu/akarnokd/rxjava3/expr/StatementObservableTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/expr/StatementObservableTest.java @@ -81,7 +81,8 @@ public boolean getAsBoolean() { }; } - void observe(Observable source, T... values) { + @SafeVarargs + static void observe(Observable source, T... values) { source.test().assertResult(values); } @@ -89,7 +90,8 @@ void observeSequence(Observable source, Iterable values) { source.test().assertValueSequence(values).assertNoErrors().assertComplete(); } - void observeError(Observable source, Class error, T... valuesBeforeError) { + @SafeVarargs + static void observeError(Observable source, Class error, T... valuesBeforeError) { source.test().assertFailure(error, valuesBeforeError); } @@ -102,7 +104,7 @@ public void testSimple() { Observable source1 = Observable.just(1, 2, 3); Observable source2 = Observable.just(4, 5, 6); - Map> map = new HashMap>(); + Map> map = new HashMap<>(); map.put(1, source1); map.put(2, source2); @@ -118,7 +120,7 @@ public void testDefaultCase() { Observable source1 = Observable.just(1, 2, 3); Observable source2 = Observable.just(4, 5, 6); - Map> map = new HashMap>(); + Map> map = new HashMap<>(); map.put(1, source1); Observable result = StatementObservable.switchCase(func, map, source2); @@ -132,7 +134,7 @@ public void testDefaultCase() { public void testCaseSelectorThrows() { Observable source1 = Observable.just(1, 2, 3); - Map> map = new HashMap>(); + Map> map = new HashMap<>(); map.put(1, source1); Observable result = StatementObservable.switchCase(funcError, map); @@ -196,7 +198,7 @@ public void testChosenObservableThrows() { Observable source1 = Observable.just(1, 2, 3); Observable source2 = Observable.error(new RuntimeException("Forced failure")); - Map> map = new HashMap>(); + Map> map = new HashMap<>(); map.put(1, source1); map.put(2, source2); @@ -322,7 +324,7 @@ public boolean getAsBoolean() { public void testDoWhileManyTimes() { Observable source1 = Observable.just(1, 2, 3).subscribeOn(Schedulers.trampoline()); - List expected = new ArrayList(numRecursion * 3); + List expected = new ArrayList<>(numRecursion * 3); for (int i = 0; i < numRecursion; i++) { expected.add(1); expected.add(2); @@ -362,7 +364,7 @@ public void testWhileDoZeroTimes() { public void testWhileDoManyTimes() { Observable source1 = Observable.just(1, 2, 3).subscribeOn(Schedulers.trampoline()); - List expected = new ArrayList(numRecursion * 3); + List expected = new ArrayList<>(numRecursion * 3); for (int i = 0; i < numRecursion; i++) { expected.add(1); expected.add(2); diff --git a/src/test/java/hu/akarnokd/rxjava3/expr/StatementSingleTest.java b/src/test/java/hu/akarnokd/rxjava3/expr/StatementSingleTest.java index be36bce1..ce9735e5 100644 --- a/src/test/java/hu/akarnokd/rxjava3/expr/StatementSingleTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/expr/StatementSingleTest.java @@ -80,12 +80,10 @@ public boolean getAsBoolean() { }; } - @SuppressWarnings("unchecked") void observe(Single source, T value) { source.test().assertResult(value); } - @SuppressWarnings("unchecked") void observeError(Single source, Class error) { source.test().assertFailure(error); } @@ -96,7 +94,7 @@ public void testSimple() { Single source2 = Single.just(2); Single defaultSource = Single.just(Integer.MAX_VALUE); - Map> map = new HashMap>(); + Map> map = new HashMap<>(); map.put(1, source1); map.put(2, source2); @@ -111,7 +109,7 @@ public void testDefaultCase() { Single source1 = Single.just(1); Single source2 = Single.just(2); - Map> map = new HashMap>(); + Map> map = new HashMap<>(); map.put(1, source1); Single result = StatementSingle.switchCase(func, map, source2); @@ -126,7 +124,7 @@ public void testCaseSelectorThrows() { Single source1 = Single.just(1); Single defaultSource = Single.just(Integer.MAX_VALUE); - Map> map = new HashMap>(); + Map> map = new HashMap<>(); map.put(1, source1); Single result = StatementSingle.switchCase(funcError, map, defaultSource); @@ -193,7 +191,7 @@ public void testChosenSingleThrows() { Single source2 = Single.error(new RuntimeException("Forced failure")); Single defaultSource = Single.just(Integer.MAX_VALUE); - Map> map = new HashMap>(); + Map> map = new HashMap<>(); map.put(1, source1); map.put(2, source2); diff --git a/src/test/java/hu/akarnokd/rxjava3/joins/OperatorJoinsTest.java b/src/test/java/hu/akarnokd/rxjava3/joins/OperatorJoinsTest.java index e430ee23..2cd6dd5d 100644 --- a/src/test/java/hu/akarnokd/rxjava3/joins/OperatorJoinsTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/joins/OperatorJoinsTest.java @@ -184,7 +184,7 @@ public R apply(Integer t1, Integer t2) { return call(); } } - ThrowFunc throwFunc = new ThrowFunc(); + ThrowFunc throwFunc = new ThrowFunc<>(); Observable some = Observable.just(1); @@ -447,7 +447,7 @@ public void whenComplicated() { JoinObservable.from(ys).and(zs).then(sub2) // 4-7=-3, 5-8=-3, 6-9=-3 ).toObservable(); - TestObserver to = new TestObserver(observer); + TestObserver to = new TestObserver<>(observer); m.subscribe(to); xs.onNext(1); // t == 210, xs[1], ys[], zs[] diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java index fe88066e..9d23105f 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicateTest.java @@ -31,7 +31,6 @@ public class FlowableBufferPredicateTest { - @SuppressWarnings("unchecked") @Test public void whileNormal() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -50,7 +49,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void whileNormalHidden() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6).hide() @@ -69,7 +67,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void whileNormalBackpressured() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -96,7 +93,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void whileMatchBegin() { Flowable.just(-1, 1, 2) @@ -113,7 +109,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void untilNormal() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -132,7 +127,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void untilNormalHidden() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6).hide() @@ -151,7 +145,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void untilNormalBackpressured() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -178,7 +171,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void untilMatchBegin() { Flowable.just(-1, 1, 2) @@ -195,7 +187,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void emptyWhile() { Flowable.empty() @@ -209,7 +200,6 @@ public boolean test(Integer v) throws Exception { .assertResult(); } - @SuppressWarnings("unchecked") @Test public void emptyUntil() { Flowable.empty() @@ -223,7 +213,6 @@ public boolean test(Integer v) throws Exception { .assertResult(); } - @SuppressWarnings("unchecked") @Test public void errorWhile() { Flowable.error(new IOException()) @@ -237,7 +226,6 @@ public boolean test(Integer v) throws Exception { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void errorUntil() { Flowable.error(new IOException()) @@ -251,7 +239,6 @@ public boolean test(Integer v) throws Exception { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void whileTake() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -269,7 +256,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void untilTake() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -287,7 +273,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void predicateCrash() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -301,7 +286,6 @@ public boolean test(Integer v) throws Exception { .assertFailure(IllegalArgumentException.class); } - @SuppressWarnings("unchecked") @Test public void bufferSupplierCrash0() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -320,7 +304,6 @@ public List get() throws Exception { .assertFailure(IllegalArgumentException.class); } - @SuppressWarnings("unchecked") @Test public void bufferSupplierCrash1() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -336,14 +319,13 @@ public List get() throws Exception { if (c++ == 1) { throw new IllegalArgumentException(); } - return new ArrayList(); + return new ArrayList<>(); } })) .test() .assertFailure(IllegalArgumentException.class, Arrays.asList(1, 2, -1)); } - @SuppressWarnings("unchecked") @Test public void bufferSupplierCrash2() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -359,14 +341,13 @@ public List get() throws Exception { if (c++ == 1) { throw new IllegalArgumentException(); } - return new ArrayList(); + return new ArrayList<>(); } })) .test() .assertFailure(IllegalArgumentException.class, Arrays.asList(1, 2)); } - @SuppressWarnings("unchecked") @Test public void bufferSupplierCrash3() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -382,14 +363,13 @@ public List get() throws Exception { if (c++ == 1) { throw new IllegalArgumentException(); } - return new ArrayList(); + return new ArrayList<>(); } })) .test() .assertFailure(IllegalArgumentException.class, Arrays.asList(1, 2)); } - @SuppressWarnings("unchecked") @Test public void doubleError() { List errors = TestHelper.trackPluginErrors(); @@ -417,7 +397,6 @@ public boolean test(Integer v) throws Exception { } } - @SuppressWarnings("unchecked") @Test public void splitNormal() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -436,7 +415,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void splitNormalHidden() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6).hide() @@ -455,7 +433,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void splitNormalBackpressured() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -482,7 +459,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void splitMatchBegin() { Flowable.just(-1, 1, 2) @@ -499,7 +475,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void untilAlways() { Flowable.range(1, 5) diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableCoalesceTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableCoalesceTest.java index 19008b78..79c454be 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableCoalesceTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableCoalesceTest.java @@ -58,7 +58,6 @@ public void accept(List a, Integer b) throws Exception { }; @Test - @SuppressWarnings("unchecked") public void empty() { Flowable.empty() .compose(FlowableTransformers.coalesce(listSupplier, listAdd)) @@ -76,7 +75,6 @@ public void never() { } @Test - @SuppressWarnings("unchecked") public void error() { Flowable.error(new IOException()) .compose(FlowableTransformers.coalesce(listSupplier, listAdd)) @@ -85,7 +83,6 @@ public void error() { } @Test - @SuppressWarnings("unchecked") public void coalescerCrash() { Flowable.just(1) .compose(FlowableTransformers.coalesce(listSupplier, listAddCrash)) @@ -94,7 +91,6 @@ public void coalescerCrash() { } @Test - @SuppressWarnings("unchecked") public void range() { Flowable.range(1, 5) .compose(FlowableTransformers.coalesce(listSupplier, listAdd)) @@ -103,7 +99,6 @@ public void range() { } @Test - @SuppressWarnings("unchecked") public void take() { Flowable.range(1, 5) .compose(FlowableTransformers.coalesce(listSupplier, listAdd)) @@ -113,7 +108,6 @@ public void take() { } @Test - @SuppressWarnings("unchecked") public void rangeBackpressured() { Flowable.range(1, 5) .compose(FlowableTransformers.coalesce(listSupplier, listAdd)) @@ -124,7 +118,6 @@ public void rangeBackpressured() { } @Test - @SuppressWarnings("unchecked") public void rangeBackpressuredMixed() { Flowable.range(1, 5) .compose(FlowableTransformers.coalesce(listSupplier, listAdd)) @@ -135,7 +128,6 @@ public void rangeBackpressuredMixed() { } @Test - @SuppressWarnings("unchecked") public void onNextRequestRace() { for (int i = 0; i < 1000; i++) { final PublishProcessor pp = PublishProcessor.create(); @@ -167,7 +159,6 @@ public void run() { } @Test - @SuppressWarnings("unchecked") public void slowPathQueueUse() { final PublishProcessor pp = PublishProcessor.create(); @@ -190,7 +181,6 @@ public void onNext(List t) { } @Test - @SuppressWarnings("unchecked") public void slowPathQueueUseCrash() { final PublishProcessor pp = PublishProcessor.create(); diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableErrorJumpTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableErrorJumpTest.java index dafb6aca..9a3b4bbb 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableErrorJumpTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableErrorJumpTest.java @@ -68,7 +68,6 @@ public Publisher apply(Flowable v) { } @Test - @SuppressWarnings("unchecked") public void errorJump() { Flowable.range(1, 5) .concatWith(Flowable.error(new TestException())) diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableExpandTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableExpandTest.java index 6ae2e481..4ba2aac5 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableExpandTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableExpandTest.java @@ -187,7 +187,7 @@ static final class Node { Node(String name, Node... nodes) { this.name = name; - this.children = new ArrayList(); + this.children = new ArrayList<>(); for (Node n : nodes) { children.add(n); } @@ -364,7 +364,7 @@ public void depthFirstCancel() { final PublishProcessor pp = PublishProcessor.create(); - final TestSubscriber ts = new TestSubscriber(); + final TestSubscriber ts = new TestSubscriber<>(); FlowableSubscriber s = new FlowableSubscriber() { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsyncTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsyncTest.java index 0500f62c..5c2cbed2 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsyncTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableGenerateAsyncTest.java @@ -263,7 +263,7 @@ public void accept(SyncRange state) throws Throwable { @Test public void take() { final AtomicBoolean cancelled1 = new AtomicBoolean(); - final AtomicReference> emitterRef = new AtomicReference>(); + final AtomicReference> emitterRef = new AtomicReference<>(); final AtomicInteger cleanup = new AtomicInteger(); Flowables.generateAsync( diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeoutTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeoutTest.java index 08957b94..9ad87ee4 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeoutTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOnBackpressureTimeoutTest.java @@ -32,7 +32,7 @@ public class FlowableOnBackpressureTimeoutTest implements Consumer { - final List evicted = Collections.synchronizedList(new ArrayList()); + final List evicted = Collections.synchronizedList(new ArrayList<>()); @Override public void accept(Object t) throws Exception { @@ -234,7 +234,7 @@ public void evictCancels() { PublishProcessor pp = PublishProcessor.create(); - final TestSubscriber ts = new TestSubscriber(0L); + final TestSubscriber ts = new TestSubscriber<>(0L); pp .compose(FlowableTransformers.onBackpressureTimeout(10, 1, TimeUnit.SECONDS, scheduler, new Consumer() { @@ -261,7 +261,7 @@ public void evictThrows() { PublishProcessor pp = PublishProcessor.create(); - final TestSubscriber ts = new TestSubscriber(0L); + final TestSubscriber ts = new TestSubscriber<>(0L); pp .compose(FlowableTransformers.onBackpressureTimeout(10, 1, TimeUnit.SECONDS, scheduler, new Consumer() { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMergeTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMergeTest.java index 520673a3..569c2b0e 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMergeTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableOrderedMergeTest.java @@ -31,7 +31,6 @@ public class FlowableOrderedMergeTest { - @SuppressWarnings("unchecked") @Test public void normal1() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -40,7 +39,6 @@ public void normal1() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void normal2() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -49,7 +47,6 @@ public void normal2() { .assertResult(1, 2, 3, 4, 5, 6, 7, 8); } - @SuppressWarnings("unchecked") @Test public void normal3() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -58,7 +55,6 @@ public void normal3() { .assertResult(1, 2, 3, 4, 5, 6, 7); } - @SuppressWarnings("unchecked") @Test public void normal4() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -67,7 +63,6 @@ public void normal4() { .assertResult(1, 1, 3, 3, 5, 5, 7, 7); } - @SuppressWarnings("unchecked") @Test public void normal1Hidden() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -76,7 +71,6 @@ public void normal1Hidden() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void normal2Hidden() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -85,7 +79,6 @@ public void normal2Hidden() { .assertResult(1, 2, 3, 4, 5, 6, 7, 8); } - @SuppressWarnings("unchecked") @Test public void normal3Hidden() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -94,7 +87,6 @@ public void normal3Hidden() { .assertResult(1, 2, 3, 4, 5, 6, 7); } - @SuppressWarnings("unchecked") @Test public void normal4Hidden() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -103,7 +95,6 @@ public void normal4Hidden() { .assertResult(1, 1, 3, 3, 5, 5, 7, 7); } - @SuppressWarnings("unchecked") @Test public void backpressure1() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -113,7 +104,6 @@ public void backpressure1() { .assertResult(1, 2, 3, 4, 5, 6, 7, 8); } - @SuppressWarnings("unchecked") @Test public void backpressure2() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -123,7 +113,6 @@ public void backpressure2() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void backpressure3() { Flowables.orderedMerge(Functions.naturalComparator(), false, 1, @@ -133,7 +122,6 @@ public void backpressure3() { .assertResult(1, 2, 3, 4, 5, 6, 7, 8); } - @SuppressWarnings("unchecked") @Test public void take() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -143,7 +131,6 @@ public void take() { .assertResult(1, 2, 3, 4, 5); } - @SuppressWarnings("unchecked") @Test public void firstErrors() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -153,7 +140,6 @@ public void firstErrors() { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void firstErrorsBackpressured() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -163,7 +149,6 @@ public void firstErrorsBackpressured() { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void secondErrors() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -174,7 +159,6 @@ public void secondErrors() { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void secondErrorsBackpressured() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -185,7 +169,6 @@ public void secondErrorsBackpressured() { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void bothError() { List errors = TestHelper.trackPluginErrors(); @@ -204,7 +187,6 @@ public void bothError() { } } - @SuppressWarnings("unchecked") @Test public void bothErrorDelayed() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -226,7 +208,6 @@ public boolean test(Throwable error) throws Throwable { }); } - @SuppressWarnings("unchecked") @Test public void bothErrorDelayedBackpressured() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -248,7 +229,6 @@ public boolean test(Throwable error) throws Throwable { }); } - @SuppressWarnings("unchecked") @Test public void nonEmptyBothErrorDelayed() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -270,7 +250,6 @@ public boolean test(Throwable error) throws Throwable { }); } - @SuppressWarnings("unchecked") @Test public void nonEmptyBothErrorDelayed2() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -293,7 +272,6 @@ public boolean test(Throwable error) throws Throwable { }); } - @SuppressWarnings("unchecked") @Test public void never() { TestSubscriber ts = Flowables.orderedMerge(Functions.naturalComparator(), @@ -304,7 +282,6 @@ public void never() { ts.assertEmpty(); } - @SuppressWarnings("unchecked") @Test public void fusedThrowsInDrainLoop() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -319,7 +296,6 @@ public Integer apply(Integer v) throws Exception { .assertFailure(IllegalArgumentException.class); } - @SuppressWarnings("unchecked") @Test public void fusedThrowsInDrainLoopDelayed() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -335,7 +311,6 @@ public Integer apply(Integer v) throws Exception { .assertFailure(IllegalArgumentException.class, 2, 3); } - @SuppressWarnings("unchecked") @Test public void fusedThrowsInPostEmissionCheck() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -350,7 +325,6 @@ public Integer apply(Integer v) throws Exception { .assertFailure(IllegalArgumentException.class); } - @SuppressWarnings("unchecked") @Test public void fusedThrowsInPostEmissionCheckErrorDelayed() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -367,7 +341,6 @@ public Integer apply(Integer v) throws Exception { .assertFailure(IllegalArgumentException.class, 2, 3); } - @SuppressWarnings("unchecked") @Test public void iterable() { Flowables.orderedMerge(Arrays.asList(Flowable.just(1, 3, 5, 7), Flowable.just(2, 4, 6, 8)), @@ -386,7 +359,6 @@ public void iterableEmpty() { .assertResult(); } - @SuppressWarnings("unchecked") @Test public void iterableSingleton() { Flowables.orderedMerge(Arrays.asList(Flowable.just(1, 3, 5, 7)), @@ -396,7 +368,6 @@ public void iterableSingleton() { .assertResult(1, 3, 5, 7); } - @SuppressWarnings("unchecked") @Test public void iterableDelayErrors() { Flowables.orderedMerge(Arrays.asList(Flowable.just(1, 3, 5, 7), Flowable.just(2, 4, 6, 8)), @@ -406,7 +377,6 @@ public void iterableDelayErrors() { .assertResult(1, 2, 3, 4, 5, 6, 7, 8); } - @SuppressWarnings("unchecked") @Test public void iterableDelayErrorsAndPrefetch() { Flowables.orderedMerge(Arrays.asList(Flowable.just(1, 3, 5, 7), Flowable.just(2, 4, 6, 8)), @@ -418,7 +388,7 @@ public void iterableDelayErrorsAndPrefetch() { @Test public void iterableMany() { - List> sources = new ArrayList>(); + List> sources = new ArrayList<>(); for (int i = 0; i < 32; i++) { sources.add(Flowable.just(i)); @@ -434,7 +404,6 @@ public void iterableMany() { 24, 25, 26, 27, 28, 29, 30, 31); } - @SuppressWarnings("unchecked") @Test public void iterableNull() { Flowables.orderedMerge(Arrays.asList(Flowable.just(1, 3, 5, 7), null), @@ -444,7 +413,6 @@ public void iterableNull() { .assertFailure(NullPointerException.class); } - @SuppressWarnings("unchecked") @Test public void nullSecond() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -453,7 +421,6 @@ public void nullSecond() { .assertFailure(NullPointerException.class); } - @SuppressWarnings("unchecked") @Test public void nullSecondDelayErrors() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -463,7 +430,6 @@ public void nullSecondDelayErrors() { .assertFailure(NullPointerException.class, 1); } - @SuppressWarnings("unchecked") @Test public void nullFirst() { Flowables.orderedMerge(Functions.naturalComparator(), @@ -472,7 +438,6 @@ public void nullFirst() { .assertFailure(NullPointerException.class); } - @SuppressWarnings("unchecked") @Test public void comparatorThrows() { Flowables.orderedMerge(new Comparator() { @@ -486,7 +451,6 @@ public int compare(Integer a, Integer b) { .assertFailure(IllegalArgumentException.class); } - @SuppressWarnings("unchecked") @Test public void selfComparableArray() { Flowables.orderedMerge( @@ -495,7 +459,6 @@ public void selfComparableArray() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void selfComparableArrayDelayError() { Flowables.orderedMerge(true, @@ -504,7 +467,6 @@ public void selfComparableArrayDelayError() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void selfComparableArrayDelayErrorPrefetch() { Flowables.orderedMerge(true, 1, @@ -513,7 +475,6 @@ public void selfComparableArrayDelayErrorPrefetch() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void selfComparableIterable() { Flowables.orderedMerge( @@ -522,7 +483,6 @@ public void selfComparableIterable() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void selfComparableIterableDelayError() { Flowables.orderedMerge( @@ -533,7 +493,6 @@ public void selfComparableIterableDelayError() { .assertResult(1, 2); } - @SuppressWarnings("unchecked") @Test public void selfComparableIterableDelayErrorPrefetch() { Flowables.orderedMerge( diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyTest.java index 7492cb05..0fa04cce 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyTest.java @@ -28,7 +28,6 @@ public class FlowableSwitchIfEmptyManyTest { - @SuppressWarnings("unchecked") @Test public void normalNonEmpty() { Flowable.range(1, 5) @@ -37,7 +36,6 @@ public void normalNonEmpty() { .assertResult(1, 2, 3, 4, 5); } - @SuppressWarnings("unchecked") @Test public void error() { Flowable.error(new IOException()) @@ -46,7 +44,6 @@ public void error() { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void nullAlternative() { Flowable.empty() @@ -55,7 +52,6 @@ public void nullAlternative() { .assertFailure(NullPointerException.class); } - @SuppressWarnings("unchecked") @Test public void normalNonEmptyBackpressured() { Flowable.range(1, 5) @@ -65,7 +61,6 @@ public void normalNonEmptyBackpressured() { .assertResult(1, 2, 3, 4, 5); } - @SuppressWarnings("unchecked") @Test public void normalNonEmptyBackpressured2() { Flowable.range(1, 5) @@ -165,7 +160,6 @@ public void normalBackpressured2() { } } - @SuppressWarnings("unchecked") @Test public void take() { Flowable.range(1, 5) @@ -175,7 +169,6 @@ public void take() { .assertResult(1, 2, 3); } - @SuppressWarnings("unchecked") @Test public void take2() { Flowable.empty() @@ -185,7 +178,6 @@ public void take2() { .assertResult(10, 11, 12); } - @SuppressWarnings("unchecked") @Test public void cancel() { Flowable.range(1, 5) diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicateTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicateTest.java index 8184bbf5..c975c076 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicateTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicateTest.java @@ -42,7 +42,6 @@ public Single> apply(Flowable f) { }; } - @SuppressWarnings("unchecked") @Test public void whileNormal() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -62,7 +61,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void whileNormalHidden() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6).hide() @@ -82,7 +80,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void whileNormalBackpressured() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -129,7 +126,6 @@ public boolean test(Integer v) throws Exception { .assertValueCount(4); } - @SuppressWarnings("unchecked") @Test public void whileMatchBegin() { Flowable.just(-1, 1, 2) @@ -147,7 +143,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void untilNormal() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -167,7 +162,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void untilNormalHidden() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6).hide() @@ -187,7 +181,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void untilNormalBackpressured() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -234,7 +227,6 @@ public boolean test(Integer v) throws Exception { .assertValueCount(4); } - @SuppressWarnings("unchecked") @Test public void untilMatchBegin() { Flowable.just(-1, 1, 2) @@ -278,7 +270,6 @@ public boolean test(Integer v) throws Exception { .assertNoValues(); } - @SuppressWarnings("unchecked") @Test public void errorWhile() { Flowable.error(new IOException()) @@ -293,7 +284,6 @@ public boolean test(Integer v) throws Exception { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void errorUntil() { Flowable.error(new IOException()) @@ -308,7 +298,6 @@ public boolean test(Integer v) throws Exception { .assertFailure(IOException.class); } - @SuppressWarnings("unchecked") @Test public void whileTake() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -327,7 +316,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void untilTake() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -346,7 +334,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void predicateCrash() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -361,7 +348,6 @@ public boolean test(Integer v) throws Exception { .assertFailure(IllegalArgumentException.class); } - @SuppressWarnings("unchecked") @Test public void doubleError() { List errors = TestHelper.trackPluginErrors(); @@ -390,7 +376,6 @@ public boolean test(Integer v) throws Exception { } } - @SuppressWarnings("unchecked") @Test public void splitNormal() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -410,7 +395,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void splitNormalHidden() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6).hide() @@ -430,7 +414,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void splitNormalBackpressured() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) @@ -477,7 +460,6 @@ public boolean test(Integer v) throws Exception { .assertValueCount(4); } - @SuppressWarnings("unchecked") @Test public void splitMatchBegin() { Flowable.just(-1, 1, 2) @@ -495,7 +477,6 @@ public boolean test(Integer v) throws Exception { ); } - @SuppressWarnings("unchecked") @Test public void cancellation() { Flowable.just(1, 2, -1, 3, 4, 5, -1, -1, 6) diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableZipLatestTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableZipLatestTest.java index bf209dbe..970a99fb 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableZipLatestTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableZipLatestTest.java @@ -126,7 +126,6 @@ public void zipLatest4c() { .assertResult("[2, 3, 6, 7]"); } - @SuppressWarnings("unchecked") @Test public void zipLatestArrayEmpty() { Flowables.zipLatest(toString) @@ -134,7 +133,6 @@ public void zipLatestArrayEmpty() { .assertResult(); } - @SuppressWarnings("unchecked") @Test public void zipLatestArrayEmptyScheduler() { Flowables.zipLatest(toString, Schedulers.single()) @@ -158,7 +156,6 @@ public void zipLatestIterableEmptyScheduler() { .assertResult(); } - @SuppressWarnings("unchecked") @Test public void zipLatestArray() { TestScheduler scheduler = new TestScheduler(); @@ -182,7 +179,6 @@ public void zipLatestArray() { ts.assertResult("[2, 4]", "[4, 5]", "[6, 6]"); } - @SuppressWarnings("unchecked") @Test public void zipLatestIterable() { TestScheduler scheduler = new TestScheduler(); @@ -210,8 +206,8 @@ public void zipLatestIterable() { @Test public void zipLatestIterableMany() { int n = 20; - List> sources = new ArrayList>(); - List results = new ArrayList(); + List> sources = new ArrayList<>(); + List results = new ArrayList<>(); for (int i = 0; i < n; i++) { sources.add(Flowable.just(i)); results.add(i); @@ -222,7 +218,6 @@ public void zipLatestIterableMany() { .assertResult(results.toString()); } - @SuppressWarnings("unchecked") @Test public void zipLatestTake2() { TestScheduler scheduler = new TestScheduler(); @@ -543,7 +538,7 @@ public void terminationRace() { final PublishProcessor pp1 = PublishProcessor.create(); final PublishProcessor pp2 = PublishProcessor.create(); - TestSubscriberEx ts = new TestSubscriberEx(); + TestSubscriberEx ts = new TestSubscriberEx<>(); Flowables.zipLatest(pp1, pp2, toString2).subscribe(ts); diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableErrorJumpTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableErrorJumpTest.java index 47e721c5..99f6aa09 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableErrorJumpTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableErrorJumpTest.java @@ -68,7 +68,6 @@ public ObservableSource apply(Observable v) { } @Test - @SuppressWarnings("unchecked") public void errorJump() { Observable.range(1, 5) .concatWith(Observable.error(new TestException())) diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsyncTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsyncTest.java index 630b836e..b0820f8c 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsyncTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsyncTest.java @@ -26,7 +26,7 @@ import hu.akarnokd.rxjava3.test.*; import io.reactivex.rxjava3.core.*; -import io.reactivex.rxjava3.disposables.Disposables; +import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.observers.TestObserver; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -263,7 +263,7 @@ public ObservableSource apply(Integer v) @Override protected void subscribeActual( Observer observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onNext(true); observer.onNext(false); observer.onError(new TestException()); @@ -289,7 +289,7 @@ public void mainErrorsAfterInnerErrors() { @Override protected void subscribeActual( Observer observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onNext(1); observer.onError(new TestException("outer")); } @@ -315,13 +315,13 @@ public ObservableSource apply(Integer v) public void innerErrorsAfterMainErrors() { List errors = TestHelper.trackPluginErrors(); try { - final AtomicReference> refInner = new AtomicReference>(); + final AtomicReference> refInner = new AtomicReference<>(); new Observable() { @Override protected void subscribeActual( Observer observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onNext(1); observer.onError(new TestException("outer")); refInner.get().onError(new TestException("inner")); @@ -335,7 +335,7 @@ public ObservableSource apply(Integer v) @Override protected void subscribeActual( Observer observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); refInner.set(observer); } }; diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDropTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDropTest.java index 74d49e7a..aa5e8493 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDropTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapDropTest.java @@ -26,7 +26,7 @@ import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.rxjava3.core.*; -import io.reactivex.rxjava3.disposables.Disposables; +import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.observers.TestObserver; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -205,7 +205,7 @@ public void lateErrorOuter() { @Override protected void subscribeActual( Observer observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onError(new IOException("first")); observer.onError(new IOException("second")); } @@ -231,7 +231,7 @@ public ObservableSource apply(Integer v) public void lateErrorInner() { List errors = TestHelper.trackPluginErrors(); try { - final AtomicReference> ref = new AtomicReference>(); + final AtomicReference> ref = new AtomicReference<>(); TestObserver to = Observable.just(1) .compose(ObservableTransformers.flatMapDrop(new Function>() { @@ -242,7 +242,7 @@ public ObservableSource apply(Integer v) @Override protected void subscribeActual( Observer observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); ref.set(observer); } }; diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatestTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatestTest.java index 23c8fc01..7a351245 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatestTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableFlatMapLatestTest.java @@ -26,7 +26,7 @@ import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.rxjava3.core.*; -import io.reactivex.rxjava3.disposables.Disposables; +import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.observers.TestObserver; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -211,7 +211,7 @@ public void lateErrorOuter() { @Override protected void subscribeActual( Observer observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onError(new IOException("first")); observer.onError(new IOException("second")); } @@ -237,7 +237,7 @@ public ObservableSource apply(Integer v) public void lateErrorInner() { List errors = TestHelper.trackPluginErrors(); try { - final AtomicReference> ref = new AtomicReference>(); + final AtomicReference> ref = new AtomicReference<>(); TestObserver to = Observable.just(1) .compose(ObservableTransformers.flatMapLatest(new Function>() { @@ -248,7 +248,7 @@ public ObservableSource apply(Integer v) @Override protected void subscribeActual( Observer observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); ref.set(observer); } }; @@ -271,7 +271,7 @@ protected void subscribeActual( @Test public void disposeWhileInDrain() { - final TestObserver to = new TestObserver(); + final TestObserver to = new TestObserver<>(); Observable.just(1) .compose(ObservableTransformers.flatMapLatest(new Function>() { diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableIndexOfTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableIndexOfTest.java index cec57b32..70591809 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableIndexOfTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableIndexOfTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import io.reactivex.rxjava3.core.*; -import io.reactivex.rxjava3.disposables.Disposables; +import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.functions.Predicate; public class ObservableIndexOfTest { @@ -70,7 +70,7 @@ public void foundWithUnconditionalOnCompleteAfter() { new Observable() { @Override protected void subscribeActual(Observer observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onNext(10); observer.onComplete(); } diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableMapAsyncTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableMapAsyncTest.java index 88add71a..6471140b 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableMapAsyncTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableMapAsyncTest.java @@ -26,7 +26,7 @@ import hu.akarnokd.rxjava3.test.*; import io.reactivex.rxjava3.core.*; -import io.reactivex.rxjava3.disposables.Disposables; +import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.observers.TestObserver; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -284,7 +284,7 @@ public ObservableSource apply(Integer v) @Override protected void subscribeActual( Observer observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onNext(2); observer.onNext(3); observer.onError(new TestException()); @@ -310,7 +310,7 @@ public void mainErrorsAfterInnerErrors() { @Override protected void subscribeActual( Observer observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onNext(1); observer.onError(new TestException("outer")); } @@ -336,13 +336,13 @@ public ObservableSource apply(Integer v) public void innerErrorsAfterMainErrors() { List errors = TestHelper.trackPluginErrors(); try { - final AtomicReference> refInner = new AtomicReference>(); + final AtomicReference> refInner = new AtomicReference<>(); new Observable() { @Override protected void subscribeActual( Observer observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onNext(1); observer.onError(new TestException("outer")); refInner.get().onError(new TestException("inner")); @@ -356,7 +356,7 @@ public ObservableSource apply(Integer v) @Override protected void subscribeActual( Observer observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); refInner.set(observer); } }; diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDropTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDropTest.java index dac7c63b..5b5225a1 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDropTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnDropTest.java @@ -33,7 +33,7 @@ public class ObservableObserveOnDropTest { @Test public void normal() { - TestObserver to = Observable.range(1, 1000000) + TestObserver to = Observable.range(1, 1000000) .compose(ObservableTransformers.observeOnDrop(Schedulers.computation())) .test() .awaitDone(5, TimeUnit.SECONDS) diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatestTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatestTest.java index b76f633b..8e5d7204 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatestTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/ObservableObserveOnLatestTest.java @@ -33,7 +33,7 @@ public class ObservableObserveOnLatestTest { @Test public void normal() { - TestObserver to = Observable.range(1, 1000000) + TestObserver to = Observable.range(1, 1000000) .compose(ObservableTransformers.observeOnLatest(Schedulers.computation())) .test() .awaitDone(5, TimeUnit.SECONDS) diff --git a/src/test/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessorTest.java b/src/test/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessorTest.java index eab73892..d3db7967 100644 --- a/src/test/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessorTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/processors/DispatchWorkProcessorTest.java @@ -232,7 +232,7 @@ public void addRemoveRace() { final TestSubscriber ts = dws.test(); - final TestSubscriber ts2 = new TestSubscriber(); + final TestSubscriber ts2 = new TestSubscriber<>(); Runnable r1 = new Runnable() { @Override @@ -264,7 +264,7 @@ public void doubleConsume() { @Override public HashSet apply(List a, List b) throws Exception { - HashSet set = new HashSet(); + HashSet set = new HashSet<>(); set.addAll(a); set.addAll(b); return set; @@ -368,7 +368,7 @@ public void longBackpressured() { @Override public HashSet apply(List a, List b) throws Exception { - HashSet set = new HashSet(); + HashSet set = new HashSet<>(); set.addAll(a); set.addAll(b); return set; @@ -406,7 +406,7 @@ public void longBackpressured2() { @Override public HashSet apply(List a, List b) throws Exception { - HashSet set = new HashSet(); + HashSet set = new HashSet<>(); set.addAll(a); set.addAll(b); return set; @@ -453,7 +453,7 @@ public void accept(Integer v) throws Exception { @Override public HashSet apply(List a, List b) throws Exception { - HashSet set = new HashSet(); + HashSet set = new HashSet<>(); set.addAll(a); set.addAll(b); return set; diff --git a/src/test/java/hu/akarnokd/rxjava3/processors/RefCountProcessorTest.java b/src/test/java/hu/akarnokd/rxjava3/processors/RefCountProcessorTest.java index b1eefe6a..e286a4c6 100644 --- a/src/test/java/hu/akarnokd/rxjava3/processors/RefCountProcessorTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/processors/RefCountProcessorTest.java @@ -195,7 +195,7 @@ public void cancelTwice() { assertTrue(source.hasSubscribers()); - final TestSubscriber ts = new TestSubscriber(); + final TestSubscriber ts = new TestSubscriber<>(); rcp.subscribe(new FlowableSubscriber() { @@ -239,7 +239,7 @@ public void cancelTwiceDontCancelUp() { TestSubscriber ts0 = rcp.test(); - final TestSubscriber ts = new TestSubscriber(); + final TestSubscriber ts = new TestSubscriber<>(); rcp.subscribe(new FlowableSubscriber() { diff --git a/src/test/java/hu/akarnokd/rxjava3/schedulers/BlockingSchedulerTest.java b/src/test/java/hu/akarnokd/rxjava3/schedulers/BlockingSchedulerTest.java index a77bbc3f..471e2712 100644 --- a/src/test/java/hu/akarnokd/rxjava3/schedulers/BlockingSchedulerTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/schedulers/BlockingSchedulerTest.java @@ -36,7 +36,7 @@ public class BlockingSchedulerTest { - TestSubscriber ts = new TestSubscriber(); + TestSubscriber ts = new TestSubscriber<>(); @Test(timeout = 10000) public void workerUntimed() { diff --git a/src/test/java/hu/akarnokd/rxjava3/schedulers/ParallelSchedulerTest.java b/src/test/java/hu/akarnokd/rxjava3/schedulers/ParallelSchedulerTest.java index 9a198b66..fa202a16 100644 --- a/src/test/java/hu/akarnokd/rxjava3/schedulers/ParallelSchedulerTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/schedulers/ParallelSchedulerTest.java @@ -126,27 +126,27 @@ protected void shutdown(Scheduler s) throws InterruptedException { w.dispose(); - assertSame(Disposables.disposed(), w.schedule(this)); + assertSame(Disposable.disposed(), w.schedule(this)); - assertSame(Disposables.disposed(), w.schedule(this, 100, TimeUnit.MILLISECONDS)); + assertSame(Disposable.disposed(), w.schedule(this, 100, TimeUnit.MILLISECONDS)); - assertSame(Disposables.disposed(), w.schedulePeriodically(this, 100, 100, TimeUnit.MILLISECONDS)); + assertSame(Disposable.disposed(), w.schedulePeriodically(this, 100, 100, TimeUnit.MILLISECONDS)); s.shutdown(); - assertSame(Disposables.disposed(), s.scheduleDirect(this)); + assertSame(Disposable.disposed(), s.scheduleDirect(this)); - assertSame(Disposables.disposed(), s.scheduleDirect(this, 100, TimeUnit.MILLISECONDS)); + assertSame(Disposable.disposed(), s.scheduleDirect(this, 100, TimeUnit.MILLISECONDS)); - assertSame(Disposables.disposed(), s.schedulePeriodicallyDirect(this, 100, 100, TimeUnit.MILLISECONDS)); + assertSame(Disposable.disposed(), s.schedulePeriodicallyDirect(this, 100, 100, TimeUnit.MILLISECONDS)); w = s.createWorker(); - assertSame(Disposables.disposed(), w.schedule(this)); + assertSame(Disposable.disposed(), w.schedule(this)); - assertSame(Disposables.disposed(), w.schedule(this, 100, TimeUnit.MILLISECONDS)); + assertSame(Disposable.disposed(), w.schedule(this, 100, TimeUnit.MILLISECONDS)); - assertSame(Disposables.disposed(), w.schedulePeriodically(this, 100, 100, TimeUnit.MILLISECONDS)); + assertSame(Disposable.disposed(), w.schedulePeriodically(this, 100, 100, TimeUnit.MILLISECONDS)); assertEquals(0, calls.get()); @@ -285,19 +285,19 @@ private void shutdownBacking(ParallelScheduler s) { exec.shutdown(); } - assertSame(Disposables.disposed(), s.scheduleDirect(this)); + assertSame(Disposable.disposed(), s.scheduleDirect(this)); - assertSame(Disposables.disposed(), s.scheduleDirect(this, 100, TimeUnit.MILLISECONDS)); + assertSame(Disposable.disposed(), s.scheduleDirect(this, 100, TimeUnit.MILLISECONDS)); - assertSame(Disposables.disposed(), s.schedulePeriodicallyDirect(this, 100, 100, TimeUnit.MILLISECONDS)); + assertSame(Disposable.disposed(), s.schedulePeriodicallyDirect(this, 100, 100, TimeUnit.MILLISECONDS)); Worker w = s.createWorker(); - assertSame(Disposables.disposed(), w.schedule(this)); + assertSame(Disposable.disposed(), w.schedule(this)); - assertSame(Disposables.disposed(), w.schedule(this, 100, TimeUnit.MILLISECONDS)); + assertSame(Disposable.disposed(), w.schedule(this, 100, TimeUnit.MILLISECONDS)); - assertSame(Disposables.disposed(), w.schedulePeriodically(this, 100, 100, TimeUnit.MILLISECONDS)); + assertSame(Disposable.disposed(), w.schedulePeriodically(this, 100, 100, TimeUnit.MILLISECONDS)); assertEquals(0, calls.get()); } @@ -353,7 +353,7 @@ public void setFutureRace2() { for (int i = 0; i < 1000; i++) { final CompositeDisposable cd = new CompositeDisposable(); final TrackedAction tt = new TrackedAction(this, cd); - final FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, null); + final FutureTask ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, null); Runnable r1 = new Runnable() { @Override @@ -382,7 +382,7 @@ public void setFutureRace3() { for (int i = 0; i < 1000; i++) { final CompositeDisposable cd = new CompositeDisposable(); final TrackedAction tt = new TrackedAction(this, cd); - final FutureTask ft = new FutureTask(Functions.EMPTY_RUNNABLE, null); + final FutureTask ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, null); Runnable r1 = new Runnable() { @Override diff --git a/src/test/java/hu/akarnokd/rxjava3/schedulers/SharedSchedulerTest.java b/src/test/java/hu/akarnokd/rxjava3/schedulers/SharedSchedulerTest.java index 96fdf50b..43225692 100644 --- a/src/test/java/hu/akarnokd/rxjava3/schedulers/SharedSchedulerTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/schedulers/SharedSchedulerTest.java @@ -46,7 +46,7 @@ public void run() { public void normal() { SharedScheduler scheduler = new SharedScheduler(Schedulers.io()); try { - final Set threads = new HashSet(); + final Set threads = new HashSet<>(); for (int i = 0; i < 100; i++) { Flowable.just(1).subscribeOn(scheduler) @@ -69,7 +69,7 @@ public Object apply(Integer v) throws Exception { public void delay() { SharedScheduler scheduler = new SharedScheduler(Schedulers.io()); try { - final Set threads = new HashSet(); + final Set threads = new HashSet<>(); for (int i = 0; i < 100; i++) { Flowable.just(1).delay(1, TimeUnit.MILLISECONDS, scheduler) @@ -185,9 +185,9 @@ public void direct() { Worker worker = scheduler.createWorker(); worker.dispose(); - assertSame(Disposables.disposed(), worker.schedule(this)); + assertSame(Disposable.disposed(), worker.schedule(this)); - assertSame(Disposables.disposed(), worker.schedule(this, 1, TimeUnit.MILLISECONDS)); + assertSame(Disposable.disposed(), worker.schedule(this, 1, TimeUnit.MILLISECONDS)); } @Test @@ -236,7 +236,7 @@ public void disposeSetFutureRace() { for (int i = 0; i < 1000; i++) { final SharedAction sa = new SharedAction(this, new CompositeDisposable()); - final Disposable d = Disposables.empty(); + final Disposable d = Disposable.empty(); Runnable r1 = new Runnable() { @Override @@ -263,7 +263,7 @@ public void runSetFutureRace() { for (int i = 0; i < 1000; i++) { final SharedAction sa = new SharedAction(this, new CompositeDisposable()); - final Disposable d = Disposables.empty(); + final Disposable d = Disposable.empty(); Runnable r1 = new Runnable() { @Override diff --git a/src/test/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubjectTest.java b/src/test/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubjectTest.java index 63ce7b29..d14b5a18 100644 --- a/src/test/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubjectTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/subjects/DispatchWorkSubjectTest.java @@ -26,7 +26,7 @@ import hu.akarnokd.rxjava3.test.*; import io.reactivex.rxjava3.core.Single; -import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.functions.BiFunction; import io.reactivex.rxjava3.observers.TestObserver; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -123,7 +123,7 @@ public void dispose() { assertFalse(dws.isDisposed()); - Disposable d = Disposables.empty(); + Disposable d = Disposable.empty(); dws.onSubscribe(d); @@ -230,7 +230,7 @@ public void addRemoveRace() { final TestObserver to = dws.test(); - final TestObserver to2 = new TestObserver(); + final TestObserver to2 = new TestObserver<>(); Runnable r1 = new Runnable() { @Override @@ -262,7 +262,7 @@ public void doubleConsume() { @Override public HashSet apply(List a, List b) throws Exception { - HashSet set = new HashSet(); + HashSet set = new HashSet<>(); set.addAll(a); set.addAll(b); return set; diff --git a/src/test/java/hu/akarnokd/rxjava3/subjects/RefCountSubjectTest.java b/src/test/java/hu/akarnokd/rxjava3/subjects/RefCountSubjectTest.java index ae360ff0..19ab077d 100644 --- a/src/test/java/hu/akarnokd/rxjava3/subjects/RefCountSubjectTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/subjects/RefCountSubjectTest.java @@ -21,7 +21,7 @@ import hu.akarnokd.rxjava3.test.TestHelper; import io.reactivex.rxjava3.core.Observer; -import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.observers.TestObserver; import io.reactivex.rxjava3.schedulers.Schedulers; import io.reactivex.rxjava3.subjects.*; @@ -192,7 +192,7 @@ public void cancelTwice() { assertTrue(source.hasObservers()); - final TestObserver to = new TestObserver(); + final TestObserver to = new TestObserver<>(); rcp.subscribe(new Observer() { @@ -239,7 +239,7 @@ public void cancelTwiceDontCancelUp() { TestObserver to0 = rcp.test(); - final TestObserver to = new TestObserver(); + final TestObserver to = new TestObserver<>(); rcp.subscribe(new Observer() { @@ -311,11 +311,11 @@ public void run() { public void doubleOnSubscribe() { final Subject rcp = Subjects.refCount(PublishSubject.create()); - Disposable bs1 = Disposables.empty(); + Disposable bs1 = Disposable.empty(); rcp.onSubscribe(bs1); - Disposable bs2 = Disposables.empty(); + Disposable bs2 = Disposable.empty(); rcp.onSubscribe(bs2); diff --git a/src/test/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubjectTest.java b/src/test/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubjectTest.java index d6b8399e..2eb1bf69 100644 --- a/src/test/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubjectTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/subjects/UnicastWorkSubjectTest.java @@ -24,7 +24,7 @@ import org.junit.Test; import hu.akarnokd.rxjava3.test.*; -import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.observers.TestObserver; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -173,7 +173,7 @@ public void errorEager() { public void dispose() { UnicastWorkSubject uws = UnicastWorkSubject.create(); - Disposable d = Disposables.empty(); + Disposable d = Disposable.empty(); uws.onSubscribe(d); @@ -272,7 +272,7 @@ public void run() { assertFalse(uws.hasObservers()); - uws.subscribeWith(new TestObserverEx()).assertNotTerminated(); + uws.subscribeWith(new TestObserverEx<>()).assertNotTerminated(); } } @@ -360,7 +360,7 @@ public void run() { public void onNextSubscribeRace() { for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) { final UnicastWorkSubject uws = UnicastWorkSubject.create(); - final TestObserver to = new TestObserver(); + final TestObserver to = new TestObserver<>(); Runnable r1 = new Runnable() { @Override @@ -409,7 +409,7 @@ public void run() { assertFalse(uws.hasObservers()); - uws.subscribeWith(new TestObserverEx()).assertNotTerminated(); + uws.subscribeWith(new TestObserverEx<>()).assertNotTerminated(); } } } diff --git a/src/test/java/hu/akarnokd/rxjava3/test/BaseTest.java b/src/test/java/hu/akarnokd/rxjava3/test/BaseTest.java index 7e344c96..aa738461 100644 --- a/src/test/java/hu/akarnokd/rxjava3/test/BaseTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/test/BaseTest.java @@ -24,8 +24,9 @@ public abstract class BaseTest { + @SafeVarargs public static void assertResult(ObservableSource source, T... array) { - TestObserver to = new TestObserver(); + TestObserver to = new TestObserver<>(); source.subscribe(to); @@ -34,8 +35,9 @@ public static void assertResult(ObservableSource source, T... array) { to.assertComplete(); } + @SafeVarargs public static void assertResult(Publisher source, T... array) { - TestSubscriber ts = new TestSubscriber(); + TestSubscriber ts = new TestSubscriber<>(); source.subscribe(ts); @@ -44,10 +46,12 @@ public static void assertResult(Publisher source, T... array) { .assertComplete(); } + @SafeVarargs public static Observable observe(T... array) { return Observable.fromArray(array); } + @SafeVarargs public static Flowable flow(T... array) { return Flowable.fromArray(array); } diff --git a/src/test/java/hu/akarnokd/rxjava3/test/BaseTestConsumerEx.java b/src/test/java/hu/akarnokd/rxjava3/test/BaseTestConsumerEx.java index ca921d36..fbae1886 100644 --- a/src/test/java/hu/akarnokd/rxjava3/test/BaseTestConsumerEx.java +++ b/src/test/java/hu/akarnokd/rxjava3/test/BaseTestConsumerEx.java @@ -1,9 +1,8 @@ package hu.akarnokd.rxjava3.test; -import java.util.List; +import java.util.*; 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; @@ -61,7 +60,7 @@ public final U assertNever(T value) { for (int i = 0; i < s; i++) { T v = this.values.get(i); - if (ObjectHelper.equals(v, value)) { + if (Objects.equals(v, value)) { throw fail("Value at position " + i + " is equal to " + valueAndClass(value) + "; Expected them to be different"); } } @@ -145,7 +144,7 @@ public final U assertErrorMessage(String message) { if (s == 1) { Throwable e = errors.get(0); String errorMessage = e.getMessage(); - if (!ObjectHelper.equals(message, errorMessage)) { + if (!Objects.equals(message, errorMessage)) { throw fail("Error message differs; exptected: " + message + " but was: " + errorMessage); } } else { @@ -163,6 +162,7 @@ public final U assertErrorMessage(String message) { * @param values the expected values, asserted in order * @return this */ + @SafeVarargs public final U assertFailure(Predicate errorPredicate, T... values) { return assertSubscribed() .assertValues(values) @@ -179,6 +179,7 @@ public final U assertFailure(Predicate errorPredicate, T... values) { * @param values the expected values, asserted in order * @return this */ + @SafeVarargs public final U assertFailureAndMessage(Class error, String message, T... values) { return assertSubscribed() diff --git a/src/test/java/hu/akarnokd/rxjava3/test/TestHelper.java b/src/test/java/hu/akarnokd/rxjava3/test/TestHelper.java index 99f5a0fc..e284f54a 100644 --- a/src/test/java/hu/akarnokd/rxjava3/test/TestHelper.java +++ b/src/test/java/hu/akarnokd/rxjava3/test/TestHelper.java @@ -35,10 +35,9 @@ 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.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.operators.completable.CompletableToFlowable; import io.reactivex.rxjava3.internal.operators.maybe.MaybeToFlowable; @@ -198,7 +197,7 @@ public static void assertError(List list, int index, Class list, int index, Class subscriber) { public static void doubleOnSubscribe(Observer observer) { List errors = trackPluginErrors(); try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); observer.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); observer.onSubscribe(d2); @@ -593,11 +592,11 @@ public static void doubleOnSubscribe(Observer observer) { public static void doubleOnSubscribe(SingleObserver o) { List errors = trackPluginErrors(); try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); o.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); o.onSubscribe(d2); @@ -619,11 +618,11 @@ public static void doubleOnSubscribe(SingleObserver o) { public static void doubleOnSubscribe(CompletableObserver observer) { List errors = trackPluginErrors(); try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); observer.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); observer.onSubscribe(d2); @@ -645,11 +644,11 @@ public static void doubleOnSubscribe(CompletableObserver observer) { public static void doubleOnSubscribe(MaybeObserver o) { List errors = trackPluginErrors(); try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); o.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); o.onSubscribe(d2); @@ -670,7 +669,7 @@ public static void doubleOnSubscribe(MaybeObserver o) { * @param source the source to test */ public static void checkDisposed(Flowable source) { - final TestSubscriber ts = new TestSubscriber(0L); + final TestSubscriber ts = new TestSubscriber<>(0L); source.subscribe(new FlowableSubscriber() { @Override public void onSubscribe(Subscription s) { @@ -946,11 +945,11 @@ public static void checkDoubleOnSubscribeMaybe(Function, ? exten @Override protected void subscribeActual(MaybeObserver observer) { try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); observer.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); observer.onSubscribe(d2); @@ -1000,11 +999,11 @@ public static void checkDoubleOnSubscribeMaybeToSingle(Function, @Override protected void subscribeActual(MaybeObserver observer) { try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); observer.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); observer.onSubscribe(d2); @@ -1054,11 +1053,11 @@ public static void checkDoubleOnSubscribeMaybeToObservable(Function observer) { try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); observer.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); observer.onSubscribe(d2); @@ -1108,11 +1107,11 @@ public static void checkDoubleOnSubscribeMaybeToFlowable(Function observer) { try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); observer.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); observer.onSubscribe(d2); @@ -1162,11 +1161,11 @@ public static void checkDoubleOnSubscribeSingleToMaybe(Function @Override protected void subscribeActual(SingleObserver observer) { try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); observer.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); observer.onSubscribe(d2); @@ -1215,11 +1214,11 @@ public static void checkDoubleOnSubscribeSingleToCompletable(Function observer) { try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); observer.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); observer.onSubscribe(d2); @@ -1269,11 +1268,11 @@ public static void checkDoubleOnSubscribeSingleToObservable(Function observer) { try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); observer.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); observer.onSubscribe(d2); @@ -1323,11 +1322,11 @@ public static void checkDoubleOnSubscribeSingleToFlowable(Function observer) { try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); observer.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); observer.onSubscribe(d2); @@ -1376,11 +1375,11 @@ public static void checkDoubleOnSubscribeMaybeToCompletable(Function observer) { try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); observer.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); observer.onSubscribe(d2); @@ -1430,11 +1429,11 @@ public static void checkDoubleOnSubscribeSingle(Function, ? ext @Override protected void subscribeActual(SingleObserver observer) { try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); observer.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); observer.onSubscribe(d2); @@ -1538,11 +1537,11 @@ public static void checkDoubleOnSubscribeObservable(Function observer) { try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); observer.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); observer.onSubscribe(d2); @@ -1592,11 +1591,11 @@ public static void checkDoubleOnSubscribeObservableToSingle(Function observer) { try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); observer.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); observer.onSubscribe(d2); @@ -1646,11 +1645,11 @@ public static void checkDoubleOnSubscribeObservableToMaybe(Function observer) { try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); observer.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); observer.onSubscribe(d2); @@ -1699,11 +1698,11 @@ public static void checkDoubleOnSubscribeObservableToCompletable(Function observer) { try { - Disposable d1 = Disposables.empty(); + Disposable d1 = Disposable.empty(); observer.onSubscribe(d1); - Disposable d2 = Disposables.empty(); + Disposable d2 = Disposable.empty(); observer.onSubscribe(d2); @@ -1966,11 +1965,11 @@ public static void checkDoubleOnSubscribeCompletable(Function void checkDoubleOnSubscribeCompletableToMaybe(Function void checkDoubleOnSubscribeCompletableToSingle(Function void checkDisposedMaybe(Function, ? extends MaybeSource> composer) { PublishProcessor pp = PublishProcessor.create(); - TestSubscriber ts = new TestSubscriber(); + TestSubscriber ts = new TestSubscriber<>(); try { - new MaybeToFlowable(composer.apply(pp.singleElement())).subscribe(ts); + new MaybeToFlowable<>(composer.apply(pp.singleElement())).subscribe(ts); } catch (Throwable ex) { throw ExceptionHelper.wrapOrThrow(ex); } @@ -2244,7 +2243,7 @@ public static void checkDisposedMaybe(Function, ? extends MaybeS public static void checkDisposedCompletable(Function composer) { PublishProcessor pp = PublishProcessor.create(); - TestSubscriber ts = new TestSubscriber(); + TestSubscriber ts = new TestSubscriber<>(); try { new CompletableToFlowable(composer.apply(pp.ignoreElements())).subscribe(ts); @@ -2268,10 +2267,10 @@ public static void checkDisposedCompletable(Function void checkDisposedMaybeToSingle(Function, ? extends SingleSource> composer) { PublishProcessor pp = PublishProcessor.create(); - TestSubscriber ts = new TestSubscriber(); + TestSubscriber ts = new TestSubscriber<>(); try { - new SingleToFlowable(composer.apply(pp.singleElement())).subscribe(ts); + new SingleToFlowable<>(composer.apply(pp.singleElement())).subscribe(ts); } catch (Throwable ex) { throw ExceptionHelper.wrapOrThrow(ex); } @@ -2289,6 +2288,7 @@ public static void checkDisposedMaybeToSingle(Function, ? extend * @param ts the TestSubscriber instance * @param classes the array of expected Throwables inside the Composite */ + @SafeVarargs public static void assertCompositeExceptions(TestSubscriber ts, final Class... classes) { ts .assertError(CompositeException.class) @@ -2336,6 +2336,7 @@ public static void assertCompositeExceptions(TestSubscriber ts, Object... cla * @param to the TestSubscriber instance * @param classes the array of expected Throwables inside the Composite */ + @SafeVarargs public static void assertCompositeExceptions(TestObserver to, Class... classes) { to .assertError(CompositeException.class) @@ -2378,6 +2379,7 @@ public static void assertCompositeExceptions(TestObserver to, Object... class * @param p the target processor * @param values the values to emit */ + @SafeVarargs public static void emit(Processor p, T... values) { for (T v : values) { p.onNext(v); @@ -2391,6 +2393,7 @@ public static void emit(Processor p, T... values) { * @param p the target subject * @param values the values to emit */ + @SafeVarargs public static void emit(Subject p, T... values) { for (T v : values) { p.onNext(v); @@ -2566,7 +2569,7 @@ public static void checkBadSourceObservable(Function, Object> boolean once; @Override protected void subscribeActual(Observer observer) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); if (once) { return; @@ -2595,7 +2598,7 @@ protected void subscribeActual(Observer observer) { if (o instanceof ObservableSource) { ObservableSource os = (ObservableSource) o; - TestObserver to = new TestObserver(); + TestObserver to = new TestObserver<>(); os.subscribe(to); @@ -2620,7 +2623,7 @@ public boolean test(Throwable error) throws Throwable { if (o instanceof Publisher) { Publisher os = (Publisher) o; - TestSubscriber ts = new TestSubscriber(); + TestSubscriber ts = new TestSubscriber<>(); os.subscribe(ts); @@ -2645,7 +2648,7 @@ public boolean test(Throwable error) throws Throwable { if (o instanceof SingleSource) { SingleSource os = (SingleSource) o; - TestObserver to = new TestObserver(); + TestObserver to = new TestObserver<>(); os.subscribe(to); @@ -2670,7 +2673,7 @@ public boolean test(Throwable error) throws Throwable { if (o instanceof MaybeSource) { MaybeSource os = (MaybeSource) o; - TestObserver to = new TestObserver(); + TestObserver to = new TestObserver<>(); os.subscribe(to); @@ -2695,7 +2698,7 @@ public boolean test(Throwable error) throws Throwable { if (o instanceof CompletableSource) { CompletableSource os = (CompletableSource) o; - TestObserver to = new TestObserver(); + TestObserver to = new TestObserver<>(); os.subscribe(to); @@ -2769,7 +2772,7 @@ protected void subscribeActual(Subscriber subscriber) { if (o instanceof ObservableSource) { ObservableSource os = (ObservableSource) o; - TestObserver to = new TestObserver(); + TestObserver to = new TestObserver<>(); os.subscribe(to); @@ -2794,7 +2797,7 @@ public boolean test(Throwable error) throws Throwable { if (o instanceof Publisher) { Publisher os = (Publisher) o; - TestSubscriber ts = new TestSubscriber(); + TestSubscriber ts = new TestSubscriber<>(); os.subscribe(ts); @@ -2819,7 +2822,7 @@ public boolean test(Throwable error) throws Throwable { if (o instanceof SingleSource) { SingleSource os = (SingleSource) o; - TestObserver to = new TestObserver(); + TestObserver to = new TestObserver<>(); os.subscribe(to); @@ -2844,7 +2847,7 @@ public boolean test(Throwable error) throws Throwable { if (o instanceof MaybeSource) { MaybeSource os = (MaybeSource) o; - TestObserver to = new TestObserver(); + TestObserver to = new TestObserver<>(); os.subscribe(to); @@ -2869,7 +2872,7 @@ public boolean test(Throwable error) throws Throwable { if (o instanceof CompletableSource) { CompletableSource os = (CompletableSource) o; - TestObserver to = new TestObserver(); + TestObserver to = new TestObserver<>(); os.subscribe(to); @@ -2908,7 +2911,7 @@ public static void checkInvalidParallelSubscribers(ParallelFlowable sourc @SuppressWarnings("unchecked") TestSubscriber[] tss = new TestSubscriber[n + 1]; for (int i = 0; i <= n; i++) { - tss[i] = new TestSubscriber().withTag("" + i); + tss[i] = new TestSubscriber<>().withTag("" + i); } source.subscribe(tss); @@ -2919,7 +2922,7 @@ public static void checkInvalidParallelSubscribers(ParallelFlowable sourc } public static TestSubscriberEx fusedSubscriber(int mode) { - TestSubscriberEx ts = new TestSubscriberEx(); + TestSubscriberEx ts = new TestSubscriberEx<>(); ts.setInitialFusionMode(mode); return ts; } diff --git a/src/test/java/hu/akarnokd/rxjava3/test/TestObserverEx.java b/src/test/java/hu/akarnokd/rxjava3/test/TestObserverEx.java index 35e9d758..9ff468d6 100644 --- a/src/test/java/hu/akarnokd/rxjava3/test/TestObserverEx.java +++ b/src/test/java/hu/akarnokd/rxjava3/test/TestObserverEx.java @@ -24,7 +24,7 @@ public class TestObserverEx private final Observer downstream; /** Holds the current subscription if any. */ - private final AtomicReference upstream = new AtomicReference(); + private final AtomicReference upstream = new AtomicReference<>(); private QueueDisposable qd; diff --git a/src/test/java/hu/akarnokd/rxjava3/test/TestSubscriberEx.java b/src/test/java/hu/akarnokd/rxjava3/test/TestSubscriberEx.java index f91d7bcd..1b193966 100644 --- a/src/test/java/hu/akarnokd/rxjava3/test/TestSubscriberEx.java +++ b/src/test/java/hu/akarnokd/rxjava3/test/TestSubscriberEx.java @@ -76,7 +76,7 @@ public TestSubscriberEx(Subscriber downstream, long initialRequest) { throw new IllegalArgumentException("Negative initial request not allowed"); } this.downstream = downstream; - this.upstream = new AtomicReference(); + this.upstream = new AtomicReference<>(); this.missedRequested = new AtomicLong(initialRequest); } diff --git a/src/test/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueueTest.java b/src/test/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueueTest.java index f376b66a..38f66365 100644 --- a/src/test/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueueTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/util/SpmcLinkedArrayQueueTest.java @@ -28,7 +28,7 @@ public class SpmcLinkedArrayQueueTest { @Test(timeout = 5000) public void simple() { - SpmcLinkedArrayQueue q = new SpmcLinkedArrayQueue(32); + SpmcLinkedArrayQueue q = new SpmcLinkedArrayQueue<>(32); for (int i = 0; i < 128; i++) { assertTrue(q.isEmpty()); @@ -60,7 +60,7 @@ public void simple() { @Test(timeout = 5000) public void simple2() { - SpmcLinkedArrayQueue q = new SpmcLinkedArrayQueue(32); + SpmcLinkedArrayQueue q = new SpmcLinkedArrayQueue<>(32); for (int i = 0; i < 128; i++) { assertTrue(q.isEmpty()); @@ -95,13 +95,13 @@ public void simple2() { @Test public void consumerRace() { for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) { - final SpmcLinkedArrayQueue q = new SpmcLinkedArrayQueue(32); + final SpmcLinkedArrayQueue q = new SpmcLinkedArrayQueue<>(32); for (int j = 0; j < 1000; j++) { q.offer(j); } - final Set set1 = new HashSet(); + final Set set1 = new HashSet<>(); Runnable r1 = new Runnable() { @Override public void run() { @@ -115,7 +115,7 @@ public void run() { } }; - final Set set2 = new HashSet(); + final Set set2 = new HashSet<>(); Runnable r2 = new Runnable() { @Override public void run() { @@ -146,7 +146,7 @@ public void run() { @Test public void consumerRaceLong() { for (int i = 0; i < TestHelper.RACE_LONG_LOOPS / 25; i++) { - final SpmcLinkedArrayQueue q = new SpmcLinkedArrayQueue(32); + final SpmcLinkedArrayQueue q = new SpmcLinkedArrayQueue<>(32); int n = 50000; @@ -154,7 +154,7 @@ public void consumerRaceLong() { q.offer(j); } - final Set set1 = new HashSet(); + final Set set1 = new HashSet<>(); Runnable r1 = new Runnable() { @Override public void run() { @@ -168,7 +168,7 @@ public void run() { } }; - final Set set2 = new HashSet(); + final Set set2 = new HashSet<>(); Runnable r2 = new Runnable() { @Override public void run() { @@ -199,13 +199,13 @@ public void run() { @Test public void consumerRace2() { for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) { - final SpmcLinkedArrayQueue q = new SpmcLinkedArrayQueue(32); + final SpmcLinkedArrayQueue q = new SpmcLinkedArrayQueue<>(32); for (int j = 0; j < 1000; j++) { q.offer(j); } - final Set set1 = new HashSet(); + final Set set1 = new HashSet<>(); Runnable r1 = new Runnable() { @Override public void run() { @@ -219,7 +219,7 @@ public void run() { } }; - final Set set2 = new HashSet(); + final Set set2 = new HashSet<>(); Runnable r2 = new Runnable() { @Override public void run() { @@ -250,7 +250,7 @@ public void run() { @Test public void produceConsumeRace() { for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) { - final SpmcLinkedArrayQueue q = new SpmcLinkedArrayQueue(32); + final SpmcLinkedArrayQueue q = new SpmcLinkedArrayQueue<>(32); Runnable r1 = new Runnable() { @Override @@ -261,7 +261,7 @@ public void run() { } }; - final List list = new ArrayList(); + final List list = new ArrayList<>(); Runnable r2 = new Runnable() { @Override public void run() { diff --git a/src/test/java/hu/akarnokd/rxjava3/validation/CheckLocalVariablesInTests.java b/src/test/java/hu/akarnokd/rxjava3/validation/CheckLocalVariablesInTests.java index 0b8651c2..aa2fb3fb 100644 --- a/src/test/java/hu/akarnokd/rxjava3/validation/CheckLocalVariablesInTests.java +++ b/src/test/java/hu/akarnokd/rxjava3/validation/CheckLocalVariablesInTests.java @@ -52,7 +52,7 @@ static void findPattern(String pattern, boolean checkMain) throws Exception { return; } - Queue dirs = new ArrayDeque(); + Queue dirs = new ArrayDeque<>(); StringBuilder fail = new StringBuilder(); fail.append("The following code pattern was found: ").append(pattern).append("\n"); diff --git a/src/test/java/hu/akarnokd/rxjava3/validation/NewLinesBeforeAnnotation.java b/src/test/java/hu/akarnokd/rxjava3/validation/NewLinesBeforeAnnotation.java index a0f10768..2c76e144 100644 --- a/src/test/java/hu/akarnokd/rxjava3/validation/NewLinesBeforeAnnotation.java +++ b/src/test/java/hu/akarnokd/rxjava3/validation/NewLinesBeforeAnnotation.java @@ -75,7 +75,7 @@ static void findPattern(int newLines) throws Exception { return; } - Queue dirs = new ArrayDeque(); + Queue dirs = new ArrayDeque<>(); StringBuilder fail = new StringBuilder(); fail.append("The following code pattern was found: "); @@ -105,7 +105,7 @@ static void findPattern(int newLines) throws Exception { String fname = u.getName(); if (fname.endsWith(".java")) { - List lines = new ArrayList(); + List lines = new ArrayList<>(); BufferedReader in = new BufferedReader(new FileReader(u)); try { for (;;) { diff --git a/src/test/java/hu/akarnokd/rxjava3/validation/TooManyEmptyNewLines.java b/src/test/java/hu/akarnokd/rxjava3/validation/TooManyEmptyNewLines.java index 18984881..c75af386 100644 --- a/src/test/java/hu/akarnokd/rxjava3/validation/TooManyEmptyNewLines.java +++ b/src/test/java/hu/akarnokd/rxjava3/validation/TooManyEmptyNewLines.java @@ -55,7 +55,7 @@ static void findPattern(int newLines) throws Exception { return; } - Queue dirs = new ArrayDeque(); + Queue dirs = new ArrayDeque<>(); StringBuilder fail = new StringBuilder(); fail.append("The following code pattern was found: "); @@ -85,7 +85,7 @@ static void findPattern(int newLines) throws Exception { String fname = u.getName(); if (fname.endsWith(".java")) { - List lines = new ArrayList(); + List lines = new ArrayList<>(); BufferedReader in = new BufferedReader(new FileReader(u)); try { for (;;) { From cc817d3094dcbaf3b41aa43e7dfce7977fb7de0b Mon Sep 17 00:00:00 2001 From: akarnokd Date: Wed, 1 Jan 2020 10:11:42 +0100 Subject: [PATCH 027/203] Update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 71c21a6e..8055f691 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ RxJava 3.x implementation of extra sources, operators and components and ports o ``` dependencies { - compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC6" + compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC7" } ``` From a073bf06db9c870d40b72a7d1cd40a0b5824b847 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 09:24:02 +0100 Subject: [PATCH 028/203] Bump junit from 4.12 to 4.13 (#48) Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/master/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5684b7ae..ec2c52e1 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ dependencies { compile "org.reactivestreams:reactive-streams:1.0.3" compile "io.reactivex.rxjava3:rxjava:3.0.0-RC7" - testCompile group: 'junit', name: 'junit', version: '4.12' + testCompile group: 'junit', name: 'junit', version: '4.13' testCompile 'org.mockito:mockito-core:3.2.4' } From 49818b7286497fbbd16c1e861c699e96a2de4bfe Mon Sep 17 00:00:00 2001 From: akarnokd Date: Thu, 16 Jan 2020 09:38:00 +0100 Subject: [PATCH 029/203] Cleanup, Validate Gradle Action --- .github/workflows/gradle-wrapper-validation.yml | 10 ++++++++++ .../java/hu/akarnokd/rxjava3/joins/JoinObservable.java | 9 --------- .../java/hu/akarnokd/rxjava3/basetypes/NonoTest.java | 2 -- .../operators/FlowableSwitchIfEmptyManyArrayTest.java | 4 ---- 4 files changed, 10 insertions(+), 15 deletions(-) create mode 100644 .github/workflows/gradle-wrapper-validation.yml diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml new file mode 100644 index 00000000..405a2b30 --- /dev/null +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -0,0 +1,10 @@ +name: "Validate Gradle Wrapper" +on: [push, pull_request] + +jobs: + validation: + name: "Validation" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: gradle/wrapper-validation-action@v1 diff --git a/src/main/java/hu/akarnokd/rxjava3/joins/JoinObservable.java b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObservable.java index f39587c0..46323320 100644 --- a/src/main/java/hu/akarnokd/rxjava3/joins/JoinObservable.java +++ b/src/main/java/hu/akarnokd/rxjava3/joins/JoinObservable.java @@ -113,7 +113,6 @@ public static JoinObservable when(Plan... plans) { * @see RxJava Wiki: when() * @see MSDN: Observable.When */ - @SuppressWarnings("unchecked") public static JoinObservable when(Plan p1) { return from(JoinPatterns.when(p1)); } @@ -132,7 +131,6 @@ public static JoinObservable when(Plan p1) { * @see RxJava Wiki: when() * @see MSDN: Observable.When */ - @SuppressWarnings("unchecked") public static JoinObservable when(Plan p1, Plan p2) { return from(JoinPatterns.when(p1, p2)); } @@ -153,7 +151,6 @@ public static JoinObservable when(Plan p1, Plan p2) { * @see RxJava Wiki: when() * @see MSDN: Observable.When */ - @SuppressWarnings("unchecked") public static JoinObservable when(Plan p1, Plan p2, Plan p3) { return from(JoinPatterns.when(p1, p2, p3)); } @@ -176,7 +173,6 @@ public static JoinObservable when(Plan p1, Plan p2, Plan p3) { * @see RxJava Wiki: when() * @see MSDN: Observable.When */ - @SuppressWarnings("unchecked") public static JoinObservable when(Plan p1, Plan p2, Plan p3, Plan p4) { return from(JoinPatterns.when(p1, p2, p3, p4)); } @@ -201,7 +197,6 @@ public static JoinObservable when(Plan p1, Plan p2, Plan p3, Pla * @see RxJava Wiki: when() * @see MSDN: Observable.When */ - @SuppressWarnings("unchecked") public static JoinObservable when(Plan p1, Plan p2, Plan p3, Plan p4, Plan p5) { return from(JoinPatterns.when(p1, p2, p3, p4, p5)); } @@ -228,7 +223,6 @@ public static JoinObservable when(Plan p1, Plan p2, Plan p3, Pla * @see RxJava Wiki: when() * @see MSDN: Observable.When */ - @SuppressWarnings("unchecked") public static JoinObservable when(Plan p1, Plan p2, Plan p3, Plan p4, Plan p5, Plan p6) { return from(JoinPatterns.when(p1, p2, p3, p4, p5, p6)); } @@ -257,7 +251,6 @@ public static JoinObservable when(Plan p1, Plan p2, Plan p3, Pla * @see RxJava Wiki: when() * @see MSDN: Observable.When */ - @SuppressWarnings("unchecked") public static JoinObservable when(Plan p1, Plan p2, Plan p3, Plan p4, Plan p5, Plan p6, Plan p7) { return from(JoinPatterns.when(p1, p2, p3, p4, p5, p6, p7)); } @@ -288,7 +281,6 @@ public static JoinObservable when(Plan p1, Plan p2, Plan p3, Pla * @see RxJava Wiki: when() * @see MSDN: Observable.When */ - @SuppressWarnings("unchecked") public static JoinObservable when(Plan p1, Plan p2, Plan p3, Plan p4, Plan p5, Plan p6, Plan p7, Plan p8) { return from(JoinPatterns.when(p1, p2, p3, p4, p5, p6, p7, p8)); } @@ -321,7 +313,6 @@ public static JoinObservable when(Plan p1, Plan p2, Plan p3, Pla * @see RxJava Wiki: when() * @see MSDN: Observable.When */ - @SuppressWarnings("unchecked") public static JoinObservable when(Plan p1, Plan p2, Plan p3, Plan p4, Plan p5, Plan p6, Plan p7, Plan p8, Plan p9) { return from(JoinPatterns.when(p1, p2, p3, p4, p5, p6, p7, p8, p9)); } diff --git a/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoTest.java b/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoTest.java index dfe10439..4129e0e8 100644 --- a/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/basetypes/NonoTest.java @@ -829,7 +829,6 @@ public void accept(Integer t) throws Exception { } @Test - @SuppressWarnings("unchecked") public void usingDisposerThrows2() { TestSubscriber ts = Nono.using(Functions.justSupplier(0), Functions.justFunction(ioError), @@ -869,7 +868,6 @@ public void accept(Integer t) throws Exception { } } - @SuppressWarnings("unchecked") @Test public void usingDisposerThrows4() { TestSubscriber ts = Nono.using(Functions.justSupplier(0), diff --git a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArrayTest.java b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArrayTest.java index 2d19fbae..a156f4b5 100644 --- a/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArrayTest.java +++ b/src/test/java/hu/akarnokd/rxjava3/operators/FlowableSwitchIfEmptyManyArrayTest.java @@ -167,7 +167,6 @@ public void normalBackpressured2() { } } - @SuppressWarnings("unchecked") @Test public void take() { Flowable.range(1, 5) @@ -177,7 +176,6 @@ public void take() { .assertResult(1, 2, 3); } - @SuppressWarnings("unchecked") @Test public void take2() { Flowable.empty() @@ -187,7 +185,6 @@ public void take2() { .assertResult(10, 11, 12); } - @SuppressWarnings("unchecked") @Test public void cancel() { Flowable.range(1, 5) @@ -196,7 +193,6 @@ public void cancel() { .assertEmpty(); } - @SuppressWarnings("unchecked") @Test public void emptyEmpty() { Flowable.empty() From d37085ff78fc371d20be3da45d68532a76275b25 Mon Sep 17 00:00:00 2001 From: akarnokd Date: Mon, 20 Jan 2020 09:06:10 +0100 Subject: [PATCH 030/203] Upgrade to RxJava 3.0.0-RC8 --- README.md | 2 +- build.gradle | 2 +- gradle.properties | 4 ++-- .../hu/akarnokd/rxjava3/operators/Flowables.java | 12 ++++++------ .../rxjava3/parallel/ParallelTransformers.java | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 8055f691..95160799 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ RxJava 3.x implementation of extra sources, operators and components and ports o ``` dependencies { - compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC7" + compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC8" } ``` diff --git a/build.gradle b/build.gradle index ec2c52e1..c0694f7d 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.0-RC7" + compile "io.reactivex.rxjava3:rxjava:3.0.0-RC8" testCompile group: 'junit', name: 'junit', version: '4.13' diff --git a/gradle.properties b/gradle.properties index f92b7511..2dcb31f7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ GROUP=com.github.akarnokd -VERSION_NAME=3.0.0-RC7 -version=3.0.0-RC7 +VERSION_NAME=3.0.0-RC8 +version=3.0.0-RC8 POM_ARTIFACT_ID=rxjava3-extensions POM_NAME=RxJava 3 extra sources, operators and components diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java b/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java index b8339cb3..52e03d1d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/Flowables.java @@ -51,7 +51,7 @@ private Flowables() { @SchedulerSupport(SchedulerSupport.NONE) @SafeVarargs public static > Flowable orderedMerge(Publisher... sources) { - return orderedMerge(Functions.naturalOrder(), false, Flowable.bufferSize(), sources); + return orderedMerge(Comparator.naturalOrder(), false, Flowable.bufferSize(), sources); } /** @@ -68,7 +68,7 @@ public static > Flowable orderedMerge(Publish @SchedulerSupport(SchedulerSupport.NONE) @SafeVarargs public static > Flowable orderedMerge(boolean delayErrors, Publisher... sources) { - return orderedMerge(Functions.naturalOrder(), delayErrors, Flowable.bufferSize(), sources); + return orderedMerge(Comparator.naturalOrder(), delayErrors, Flowable.bufferSize(), sources); } /** @@ -87,7 +87,7 @@ public static > Flowable orderedMerge(boolean @SchedulerSupport(SchedulerSupport.NONE) @SafeVarargs public static > Flowable orderedMerge(boolean delayErrors, int prefetch, Publisher... sources) { - return orderedMerge(Functions.naturalOrder(), delayErrors, prefetch, sources); + return orderedMerge(Comparator.naturalOrder(), delayErrors, prefetch, sources); } /** @@ -221,7 +221,7 @@ public static Flowable orderedMerge(Iterable> sour @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static > Flowable orderedMerge(Iterable> sources) { - return orderedMerge(sources, Functions.naturalOrder(), false, Flowable.bufferSize()); + return orderedMerge(sources, Comparator.naturalOrder(), false, Flowable.bufferSize()); } /** @@ -237,7 +237,7 @@ public static > Flowable orderedMerge(Iterabl @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static > Flowable orderedMerge(Iterable> sources, boolean delayErrors) { - return orderedMerge(sources, Functions.naturalOrder(), delayErrors, Flowable.bufferSize()); + return orderedMerge(sources, Comparator.naturalOrder(), delayErrors, Flowable.bufferSize()); } /** @@ -255,7 +255,7 @@ public static > Flowable orderedMerge(Iterabl @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static > Flowable orderedMerge(Iterable> sources, boolean delayErrors, int prefetch) { - return orderedMerge(sources, Functions.naturalOrder(), delayErrors, prefetch); + return orderedMerge(sources, Comparator.naturalOrder(), delayErrors, prefetch); } /** diff --git a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java index 93d8bdec..a9bee1c0 100644 --- a/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java +++ b/src/main/java/hu/akarnokd/rxjava3/parallel/ParallelTransformers.java @@ -42,7 +42,7 @@ private ParallelTransformers() { * @since 0.17.9 */ public static > Flowable orderedMerge(ParallelFlowable source) { - return orderedMerge(source, Functions.naturalOrder(), false, Flowable.bufferSize()); + return orderedMerge(source, Comparator.naturalOrder(), false, Flowable.bufferSize()); } /** @@ -55,7 +55,7 @@ public static > Flowable orderedMerge(Paralle * @since 0.17.9 */ public static > Flowable orderedMerge(ParallelFlowable source, boolean delayErrors) { - return orderedMerge(source, Functions.naturalOrder(), delayErrors, Flowable.bufferSize()); + return orderedMerge(source, Comparator.naturalOrder(), delayErrors, Flowable.bufferSize()); } /** @@ -70,7 +70,7 @@ public static > Flowable orderedMerge(Paralle * @since 0.17.9 */ public static > Flowable orderedMerge(ParallelFlowable source, boolean delayErrors, int prefetch) { - return orderedMerge(source, Functions.naturalOrder(), delayErrors, prefetch); + return orderedMerge(source, Comparator.naturalOrder(), delayErrors, prefetch); } /** From 11d15fa3617e79076b190d09c9ba53a4aea575cd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2020 09:12:12 +0100 Subject: [PATCH 031/203] Bump biz.aQute.bnd.gradle from 4.3.1 to 5.0.0 (#50) Bumps [biz.aQute.bnd.gradle](https://github.com/bndtools/bnd) from 4.3.1 to 5.0.0. - [Release notes](https://github.com/bndtools/bnd/releases) - [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md) - [Commits](https://github.com/bndtools/bnd/commits) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c0694f7d..70a13cfe 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { dependencies { classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.0" classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.0' - classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:4.3.1" + classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.0.0" classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0' classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0" } From 3ea340f85a190d1dbb9fcbc5d376fd030d960c75 Mon Sep 17 00:00:00 2001 From: akarnokd Date: Fri, 14 Feb 2020 14:28:58 +0100 Subject: [PATCH 032/203] 3.0.0 final --- README.md | 2 +- build.gradle | 2 +- gradle.properties | 4 ++-- .../hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 95160799..a1f4d7cd 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ RxJava 3.x implementation of extra sources, operators and components and ports o ``` dependencies { - compile "com.github.akarnokd:rxjava3-extensions:3.0.0-RC8" + compile "com.github.akarnokd:rxjava3-extensions:3.0.0" } ``` diff --git a/build.gradle b/build.gradle index c0694f7d..34837c4d 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.0-RC8" + compile "io.reactivex.rxjava3:rxjava:3.0.0" testCompile group: 'junit', name: 'junit', version: '4.13' diff --git a/gradle.properties b/gradle.properties index 2dcb31f7..4e60ad0b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ GROUP=com.github.akarnokd -VERSION_NAME=3.0.0-RC8 -version=3.0.0-RC8 +VERSION_NAME=3.0.0 +version=3.0.0 POM_ARTIFACT_ID=rxjava3-extensions POM_NAME=RxJava 3 extra sources, operators and components diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java b/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java index cd13f5f0..b0d34f06 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java @@ -265,7 +265,7 @@ public void drain() { if (hasValue == n && pick >= 0) { a.onNext(smallest); latest[pick] = null; - subs[pick].requestOne(); + subs[pick].request(1); e++; } else { From 74f69460532b1ca8c05f9ed389f9c98154ce5eef Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2020 10:58:05 +0100 Subject: [PATCH 033/203] Bump mockito-core from 3.2.4 to 3.3.0 (#52) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.2.4 to 3.3.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.2.4...v3.3.0) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f2fbb708..c4882a32 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13' - testCompile 'org.mockito:mockito-core:3.2.4' + testCompile 'org.mockito:mockito-core:3.3.0' } apply plugin: 'maven' From 8c8add5ac2d0945b6bdc9ea105af5cdcc18d0c58 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2020 08:46:38 +0100 Subject: [PATCH 034/203] Bump mockito-core from 3.3.0 to 3.3.1 (#53) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.3.0...v3.3.1) Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c4882a32..6f422b05 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13' - testCompile 'org.mockito:mockito-core:3.3.0' + testCompile 'org.mockito:mockito-core:3.3.1' } apply plugin: 'maven' From 7fd2ca71790429adf1b61c1a20468e4674485ee5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2020 09:50:13 +0100 Subject: [PATCH 035/203] Bump rxjava from 3.0.0 to 3.0.1 (#55) Bumps [rxjava](https://github.com/ReactiveX/RxJava) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/ReactiveX/RxJava/releases) - [Commits](https://github.com/ReactiveX/RxJava/compare/v3.0.0...v3.0.1) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6f422b05..54ed6ffd 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.0" + compile "io.reactivex.rxjava3:rxjava:3.0.1" testCompile group: 'junit', name: 'junit', version: '4.13' From 2aa9152027c339ac871808e12cdfee36ae105095 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2020 09:50:39 +0100 Subject: [PATCH 036/203] Bump mockito-core from 3.3.1 to 3.3.3 (#54) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.3.1 to 3.3.3. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.3.1...v3.3.3) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 54ed6ffd..33d5d9fb 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13' - testCompile 'org.mockito:mockito-core:3.3.1' + testCompile 'org.mockito:mockito-core:3.3.3' } apply plugin: 'maven' From 345e7606fc64d43899d0b64dba9201b9232237f6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 25 Mar 2020 10:49:33 +0100 Subject: [PATCH 037/203] Bump biz.aQute.bnd.gradle from 5.0.0 to 5.0.1 (#57) Bumps biz.aQute.bnd.gradle from 5.0.0 to 5.0.1. Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 33d5d9fb..ba8a9062 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { dependencies { classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.0" classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.0' - classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.0.0" + classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.0.1" classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0' classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0" } From eba53620ace88df1975ca695158a02787798d753 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2020 08:48:04 +0200 Subject: [PATCH 038/203] Bump rxjava from 3.0.1 to 3.0.2 (#59) Bumps [rxjava](https://github.com/ReactiveX/RxJava) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/ReactiveX/RxJava/releases) - [Commits](https://github.com/ReactiveX/RxJava/compare/v3.0.1...v3.0.2) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ba8a9062..4a0c8206 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.1" + compile "io.reactivex.rxjava3:rxjava:3.0.2" testCompile group: 'junit', name: 'junit', version: '4.13' From 834dde0fbfc1fd42f79acea6d614bd6a78a3210f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 4 May 2020 09:33:45 +0200 Subject: [PATCH 039/203] Bump rxjava from 3.0.2 to 3.0.3 (#61) Bumps [rxjava](https://github.com/ReactiveX/RxJava) from 3.0.2 to 3.0.3. - [Release notes](https://github.com/ReactiveX/RxJava/releases) - [Commits](https://github.com/ReactiveX/RxJava/compare/v3.0.2...v3.0.3) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4a0c8206..1c135b34 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.2" + compile "io.reactivex.rxjava3:rxjava:3.0.3" testCompile group: 'junit', name: 'junit', version: '4.13' From 3c04a73d84275576ae777b1753e094bec57830a9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 22 May 2020 08:12:10 +0200 Subject: [PATCH 040/203] Bump rxjava from 3.0.3 to 3.0.4 (#63) Bumps [rxjava](https://github.com/ReactiveX/RxJava) from 3.0.3 to 3.0.4. - [Release notes](https://github.com/ReactiveX/RxJava/releases) - [Commits](https://github.com/ReactiveX/RxJava/compare/v3.0.3...v3.0.4) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1c135b34..5fe67584 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.3" + compile "io.reactivex.rxjava3:rxjava:3.0.4" testCompile group: 'junit', name: 'junit', version: '4.13' From 36ec9b9e33b108560b78a5b9e1b60bc5aa46abcd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 2 Jun 2020 09:18:42 +0200 Subject: [PATCH 041/203] Bump biz.aQute.bnd.gradle from 5.0.1 to 5.1.0 (#64) Bumps [biz.aQute.bnd.gradle](https://github.com/bndtools/bnd) from 5.0.1 to 5.1.0. - [Release notes](https://github.com/bndtools/bnd/releases) - [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md) - [Commits](https://github.com/bndtools/bnd/commits) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5fe67584..ad553d3a 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { dependencies { classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.0" classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.0' - classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.0.1" + classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.0" classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0' classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0" } From 34febe1189a88d0b8213f7f27ac193bf123c7d3b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 8 Jun 2020 09:59:27 +0200 Subject: [PATCH 042/203] Bump gradle-animalsniffer-plugin from 1.5.0 to 1.5.1 (#65) Bumps [gradle-animalsniffer-plugin](https://github.com/xvik/gradle-animalsniffer-plugin) from 1.5.0 to 1.5.1. - [Release notes](https://github.com/xvik/gradle-animalsniffer-plugin/releases) - [Changelog](https://github.com/xvik/gradle-animalsniffer-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/xvik/gradle-animalsniffer-plugin/compare/1.5.0...1.5.1) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ad553d3a..bf52b08b 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { dependencies { classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.0" - classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.0' + classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.1' classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.0" classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0' classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0" From 528dc9764c77967f6092c75c7e3a45f7d4e69294 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2020 09:54:04 +0200 Subject: [PATCH 043/203] Bump biz.aQute.bnd.gradle from 5.1.0 to 5.1.1 (#66) Bumps [biz.aQute.bnd.gradle](https://github.com/bndtools/bnd) from 5.1.0 to 5.1.1. - [Release notes](https://github.com/bndtools/bnd/releases) - [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md) - [Commits](https://github.com/bndtools/bnd/commits) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index bf52b08b..a4e6d7d8 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { dependencies { classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.0" classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.1' - classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.0" + classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.1" classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0' classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0" } From 24ae2bcc4db4f8c40b9929817a8c0876e855e0bb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jul 2020 13:56:32 +0200 Subject: [PATCH 044/203] Bump mockito-core from 3.3.3 to 3.4.0 (#68) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.3.3 to 3.4.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.3.3...v3.4.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a4e6d7d8..01b781dd 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13' - testCompile 'org.mockito:mockito-core:3.3.3' + testCompile 'org.mockito:mockito-core:3.4.0' } apply plugin: 'maven' From 2099e7cd68181a2cb8a914114b3bc574457f17f5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 17 Jul 2020 07:43:47 +0200 Subject: [PATCH 045/203] Bump mockito-core from 3.4.0 to 3.4.2 (#69) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.4.0 to 3.4.2. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.4.0...v3.4.2) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 01b781dd..c56e3d4d 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13' - testCompile 'org.mockito:mockito-core:3.4.0' + testCompile 'org.mockito:mockito-core:3.4.2' } apply plugin: 'maven' From 2ab26a8eca3ec1e27eff058689bf3b4cede19b83 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jul 2020 08:17:57 +0200 Subject: [PATCH 046/203] Bump mockito-core from 3.4.2 to 3.4.4 (#70) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.4.2 to 3.4.4. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.4.2...v3.4.4) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c56e3d4d..71435674 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13' - testCompile 'org.mockito:mockito-core:3.4.2' + testCompile 'org.mockito:mockito-core:3.4.4' } apply plugin: 'maven' From 584c820f0a7ed2c69655ec8660550bd9d8fe2b5e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 22 Jul 2020 11:35:53 +0200 Subject: [PATCH 047/203] Bump biz.aQute.bnd.gradle from 5.1.1 to 5.1.2 (#71) Bumps [biz.aQute.bnd.gradle](https://github.com/bndtools/bnd) from 5.1.1 to 5.1.2. - [Release notes](https://github.com/bndtools/bnd/releases) - [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md) - [Commits](https://github.com/bndtools/bnd/commits) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 71435674..74c726ac 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { dependencies { classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.0" classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.1' - classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.1" + classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.2" classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0' classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0" } From 9ff697099a569a030c2a8d5b15836d6dff2fe8d2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 30 Jul 2020 08:33:14 +0200 Subject: [PATCH 048/203] Bump mockito-core from 3.4.4 to 3.4.6 (#72) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.4.4 to 3.4.6. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.4.4...v3.4.6) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 74c726ac..37a5f2b5 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13' - testCompile 'org.mockito:mockito-core:3.4.4' + testCompile 'org.mockito:mockito-core:3.4.6' } apply plugin: 'maven' From 356462845fe7499d7f7d1ce7e2e9d054eff0b901 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 3 Aug 2020 08:32:07 +0200 Subject: [PATCH 049/203] Bump rxjava from 3.0.4 to 3.0.5 (#73) Bumps [rxjava](https://github.com/ReactiveX/RxJava) from 3.0.4 to 3.0.5. - [Release notes](https://github.com/ReactiveX/RxJava/releases) - [Commits](https://github.com/ReactiveX/RxJava/compare/v3.0.4...v3.0.5) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 37a5f2b5..3919b523 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.4" + compile "io.reactivex.rxjava3:rxjava:3.0.5" testCompile group: 'junit', name: 'junit', version: '4.13' From 17912bb4ba47b0efa515dfd0cc5dbdf0c5d20a52 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 17 Aug 2020 10:25:33 +0200 Subject: [PATCH 050/203] Bump mockito-core from 3.4.6 to 3.5.0 (#75) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.4.6 to 3.5.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.4.6...v3.5.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3919b523..6a9e54db 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13' - testCompile 'org.mockito:mockito-core:3.4.6' + testCompile 'org.mockito:mockito-core:3.5.0' } apply plugin: 'maven' From bbba0fd6c039151ef415cce46117e2dca4780c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Marci=C5=84czyk?= Date: Tue, 18 Aug 2020 18:01:44 +0200 Subject: [PATCH 051/203] RxJavaAssemblyException prints StackTrace in getMessage (#77) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Piotr Marcińczyk --- .../rxjava3/debug/RxJavaAssemblyException.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyException.java b/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyException.java index 23fdf08b..3ac5c125 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyException.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyException.java @@ -36,11 +36,13 @@ public static String buildStackTrace() { StackTraceElement[] es = Thread.currentThread().getStackTrace(); - b.append("RxJavaAssemblyException: assembled\r\n"); + b.append("RxJavaAssemblyException: assembled"); for (StackTraceElement e : es) { if (filter(e)) { - b.append("at ").append(e).append("\r\n"); + b.append(System.lineSeparator()) + .append("\tat ") + .append(e); } } @@ -155,4 +157,9 @@ public static RxJavaAssemblyException find(Throwable ex) { } return null; } + + @Override + public String getMessage() { + return stacktrace; + } } From b2e6894d93416954dab0321a07825f8b1da5e794 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2020 10:56:49 +0200 Subject: [PATCH 052/203] Bump mockito-core from 3.5.0 to 3.5.2 (#78) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.0 to 3.5.2. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.0...v3.5.2) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6a9e54db..abe8f045 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13' - testCompile 'org.mockito:mockito-core:3.5.0' + testCompile 'org.mockito:mockito-core:3.5.2' } apply plugin: 'maven' From c86300440dd8ce80c73f39939fad1e0d726028dd Mon Sep 17 00:00:00 2001 From: akarnokd Date: Thu, 20 Aug 2020 10:57:38 +0200 Subject: [PATCH 053/203] Upgrade to RxJava 3.0.6, release 3.0.1 --- README.md | 2 +- build.gradle | 2 +- gradle.properties | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a1f4d7cd..42260718 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ RxJava 3.x implementation of extra sources, operators and components and ports o ``` dependencies { - compile "com.github.akarnokd:rxjava3-extensions:3.0.0" + compile "com.github.akarnokd:rxjava3-extensions:3.0.1" } ``` diff --git a/build.gradle b/build.gradle index abe8f045..b7a236dc 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.5" + compile "io.reactivex.rxjava3:rxjava:3.0.6" testCompile group: 'junit', name: 'junit', version: '4.13' diff --git a/gradle.properties b/gradle.properties index 4e60ad0b..40c6a765 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ GROUP=com.github.akarnokd -VERSION_NAME=3.0.0 -version=3.0.0 +VERSION_NAME=3.0.1 +version=3.0.1 POM_ARTIFACT_ID=rxjava3-extensions POM_NAME=RxJava 3 extra sources, operators and components From 4669b63db3156130cee78d7596aa43b67b887a97 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 09:48:06 +0200 Subject: [PATCH 054/203] Bump mockito-core from 3.5.2 to 3.5.5 (#79) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.2 to 3.5.5. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.2...v3.5.5) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b7a236dc..634987ea 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13' - testCompile 'org.mockito:mockito-core:3.5.2' + testCompile 'org.mockito:mockito-core:3.5.5' } apply plugin: 'maven' From fbd51ddc8933d9db143aebe4cc45b82ed5974c37 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 25 Aug 2020 09:09:00 +0200 Subject: [PATCH 055/203] Bump mockito-core from 3.5.5 to 3.5.6 (#80) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.5 to 3.5.6. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.5...v3.5.6) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 634987ea..5dd40dd7 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13' - testCompile 'org.mockito:mockito-core:3.5.5' + testCompile 'org.mockito:mockito-core:3.5.6' } apply plugin: 'maven' From 26ef19938a154ba43dfe6da45c6d77713ad95fdf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 08:25:59 +0200 Subject: [PATCH 056/203] Bump mockito-core from 3.5.6 to 3.5.7 (#81) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.6 to 3.5.7. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.6...v3.5.7) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5dd40dd7..33cea363 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13' - testCompile 'org.mockito:mockito-core:3.5.6' + testCompile 'org.mockito:mockito-core:3.5.7' } apply plugin: 'maven' From d70e9cc8f6d057201ffeb142d4f565265a9d5081 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 07:36:52 +0200 Subject: [PATCH 057/203] Bump jmh-gradle-plugin from 0.5.0 to 0.5.1 (#82) Bumps jmh-gradle-plugin from 0.5.0 to 0.5.1. Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 33cea363..652298ad 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.0" + classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.1" classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.1' classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.2" classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0' From b36e27e35074be61dbc10c719d322cb416cae983 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 09:45:23 +0200 Subject: [PATCH 058/203] Bump mockito-core from 3.5.7 to 3.5.9 (#83) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.7 to 3.5.9. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.7...v3.5.9) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 652298ad..f473d194 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13' - testCompile 'org.mockito:mockito-core:3.5.7' + testCompile 'org.mockito:mockito-core:3.5.9' } apply plugin: 'maven' From 57c5a144ceef4596cacd494debca1a2a12fb6b8a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 18 Sep 2020 08:12:51 +0200 Subject: [PATCH 059/203] Bump mockito-core from 3.5.9 to 3.5.11 (#86) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.9 to 3.5.11. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.9...v3.5.11) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f473d194..bede524a 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13' - testCompile 'org.mockito:mockito-core:3.5.9' + testCompile 'org.mockito:mockito-core:3.5.11' } apply plugin: 'maven' From c4e7ce5b2add650e7d730241876c132241a44fb7 Mon Sep 17 00:00:00 2001 From: David Karnok Date: Wed, 23 Sep 2020 08:23:43 +0200 Subject: [PATCH 060/203] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index bede524a..85c02301 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ repositories { maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } maven { url 'https://oss.sonatype.org/content/groups/public' } maven { url 'https://oss.jfrog.org/libs-snapshot' } - maven { url 'http://repo.spring.io/libs-snapshot' } + maven { url 'https://repo.spring.io/libs-snapshot' } } dependencies { From 6e9a4bad0fd1eab20f74468bdbabb63c154d4497 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2020 08:42:39 +0200 Subject: [PATCH 061/203] Bump jmh-gradle-plugin from 0.5.1 to 0.5.2 (#88) Bumps jmh-gradle-plugin from 0.5.1 to 0.5.2. Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 85c02301..590b76ba 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.1" + classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.2" classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.1' classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.2" classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0' From 3cb8055b8e69b96b3b349cf841162a388863a91d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 25 Sep 2020 08:09:06 +0200 Subject: [PATCH 062/203] Bump mockito-core from 3.5.11 to 3.5.13 (#89) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.11 to 3.5.13. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.11...v3.5.13) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 590b76ba..60526d83 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13' - testCompile 'org.mockito:mockito-core:3.5.11' + testCompile 'org.mockito:mockito-core:3.5.13' } apply plugin: 'maven' From 7880ffaf521f11d322c4c3e715b36e0b2cf989ec Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 8 Oct 2020 09:12:39 +0200 Subject: [PATCH 063/203] Bump rxjava from 3.0.6 to 3.0.7 (#90) Bumps [rxjava](https://github.com/ReactiveX/RxJava) from 3.0.6 to 3.0.7. - [Release notes](https://github.com/ReactiveX/RxJava/releases) - [Commits](https://github.com/ReactiveX/RxJava/compare/v3.0.6...v3.0.7) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 60526d83..b77fa5be 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.6" + compile "io.reactivex.rxjava3:rxjava:3.0.7" testCompile group: 'junit', name: 'junit', version: '4.13' From 1b64438c31399bc141f303145a7e41b4fa86ae4c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 12 Oct 2020 12:10:13 +0200 Subject: [PATCH 064/203] Bump junit from 4.13 to 4.13.1 (#91) Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.13...r4.13.1) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b77fa5be..116a9152 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ dependencies { compile "org.reactivestreams:reactive-streams:1.0.3" compile "io.reactivex.rxjava3:rxjava:3.0.7" - testCompile group: 'junit', name: 'junit', version: '4.13' + testCompile group: 'junit', name: 'junit', version: '4.13.1' testCompile 'org.mockito:mockito-core:3.5.13' } From e1b91a4dff031dfb05e54fd3a3cc799c35c97133 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 16 Oct 2020 09:38:53 +0200 Subject: [PATCH 065/203] Bump biz.aQute.bnd.gradle from 5.1.2 to 5.2.0 (#92) Bumps [biz.aQute.bnd.gradle](https://github.com/bndtools/bnd) from 5.1.2 to 5.2.0. - [Release notes](https://github.com/bndtools/bnd/releases) - [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md) - [Commits](https://github.com/bndtools/bnd/commits) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 116a9152..15430bbc 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { dependencies { classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.2" classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.1' - classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.2" + classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.2.0" classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0' classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0" } From 8dc46b26544e7d590c3738220ae4c430db25004d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 20 Oct 2020 10:23:47 +0200 Subject: [PATCH 066/203] Bump mockito-core from 3.5.13 to 3.5.15 (#93) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.13 to 3.5.15. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.13...v3.5.15) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 15430bbc..4e1d6a38 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13.1' - testCompile 'org.mockito:mockito-core:3.5.13' + testCompile 'org.mockito:mockito-core:3.5.15' } apply plugin: 'maven' From 30b7040f385431a53837291d981db39b4f4f329f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 27 Oct 2020 08:28:25 +0100 Subject: [PATCH 067/203] Bump mockito-core from 3.5.15 to 3.6.0 (#94) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.15 to 3.6.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.15...v3.6.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4e1d6a38..23eff960 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13.1' - testCompile 'org.mockito:mockito-core:3.5.15' + testCompile 'org.mockito:mockito-core:3.6.0' } apply plugin: 'maven' From 20e90df254af94301e71b0009761e54a57758055 Mon Sep 17 00:00:00 2001 From: David Karnok Date: Thu, 29 Oct 2020 08:46:59 +0100 Subject: [PATCH 068/203] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 42260718..52ffb1a6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # RxJavaExtensions - + [![codecov.io](http://codecov.io/github/akarnokd/RxJavaExtensions/coverage.svg?branch=3.x)](http://codecov.io/github/akarnokd/RxJavaExtensions?branch=3.x) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.akarnokd/rxjava3-extensions/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.akarnokd/rxjava3-extensions) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava) From fa290e5ead314cc630d0b9b09c764b444db6f040 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 5 Nov 2020 08:51:58 +0100 Subject: [PATCH 069/203] Bump gradle-animalsniffer-plugin from 1.5.1 to 1.5.2 (#95) Bumps [gradle-animalsniffer-plugin](https://github.com/xvik/gradle-animalsniffer-plugin) from 1.5.1 to 1.5.2. - [Release notes](https://github.com/xvik/gradle-animalsniffer-plugin/releases) - [Changelog](https://github.com/xvik/gradle-animalsniffer-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/xvik/gradle-animalsniffer-plugin/compare/1.5.1...1.5.2) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 23eff960..7129c62a 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { dependencies { classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.2" - classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.1' + classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.2' classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.2.0" classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0' classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0" From 565e380d0cc609617a812a759c9c5dd95570372f Mon Sep 17 00:00:00 2001 From: LYK Date: Tue, 10 Nov 2020 16:03:30 +0900 Subject: [PATCH 070/203] Update README.md (#96) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 52ffb1a6..b0a55661 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ RxJava 3.x implementation of extra sources, operators and components and ports o ``` dependencies { - compile "com.github.akarnokd:rxjava3-extensions:3.0.1" + implementation "com.github.akarnokd:rxjava3-extensions:3.0.1" } ``` From 35a97404a534a63cb1e00b1b2fbcefee13cbd80c Mon Sep 17 00:00:00 2001 From: David Karnok Date: Fri, 20 Nov 2020 13:54:18 +0100 Subject: [PATCH 071/203] Create gradle.yml --- .github/workflows/gradle.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/gradle.yml diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 00000000..7a0c7574 --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,36 @@ +# This workflow will build a Java project with Gradle +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle + +name: Java CI with Gradle + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Cache Gradle packages + uses: actions/cache@v2 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + restore-keys: ${{ runner.os }}-gradle + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build --stacktrace + - name: Upload to Codecov + uses: codecov/codecov-action@v1 + - name: Push Javadocs + run: ./push.sh From 13f8b0cf078bc0fabcb8566290c2e6f06757661f Mon Sep 17 00:00:00 2001 From: David Karnok Date: Fri, 20 Nov 2020 13:57:25 +0100 Subject: [PATCH 072/203] Update gradle.yml --- .github/workflows/gradle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 7a0c7574..ff6f9b5a 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -5,9 +5,9 @@ name: Java CI with Gradle on: push: - branches: [ master ] + branches: [ 3.x ] pull_request: - branches: [ master ] + branches: [ 3.x ] jobs: build: From b9304ed09feb072bf98720a74f37edb11036e4b8 Mon Sep 17 00:00:00 2001 From: David Karnok Date: Fri, 20 Nov 2020 14:07:01 +0100 Subject: [PATCH 073/203] Update gradle.yml --- .github/workflows/gradle.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index ff6f9b5a..319be576 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,7 +13,9 @@ jobs: build: runs-on: ubuntu-latest - + env: + TRAVIS_PULL_REQUEST: ${{ github.event.number }} + JAVADOCS_TOKEN: ${{ secrets.JAVADOCS_TOKEN }} steps: - uses: actions/checkout@v2 - name: Set up JDK 1.8 From 3c08618928e0bc9360fc81eace98ff053c49759d Mon Sep 17 00:00:00 2001 From: David Karnok Date: Fri, 20 Nov 2020 14:08:07 +0100 Subject: [PATCH 074/203] Update push.sh --- push.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/push.sh b/push.sh index efca7b5e..de18f9b8 100644 --- a/push.sh +++ b/push.sh @@ -16,7 +16,7 @@ if [ "$TRAVIS_PULL_REQUEST" == "true" ]; then fi # check if the token is actually there -if [ "$GITHUB_TOKEN" == "" ]; then +if [ "$JAVADOCS_TOKEN" == "" ]; then echo -e "No access to GitHub, skipping JavaDocs pushback." exit 0 fi @@ -26,7 +26,7 @@ git config --global user.email "travis@travis-ci.org" git config --global user.name "Travis CI" # setup the remote -git remote add origin-pages https://${GITHUB_TOKEN}@${targetRepo} > /dev/null 2>&1 +git remote add origin-pages https://${JAVADOCS_TOKEN}@${targetRepo} > /dev/null 2>&1 # stash changes due to chmod git stash From 0302d81cd5732eb79b565717159949709e15e365 Mon Sep 17 00:00:00 2001 From: David Karnok Date: Fri, 20 Nov 2020 14:15:42 +0100 Subject: [PATCH 075/203] Update gradle.yml --- .github/workflows/gradle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 319be576..d2603cd7 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -30,6 +30,8 @@ jobs: restore-keys: ${{ runner.os }}-gradle - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Grant execute permission for push + run: chmod +x push.sh - name: Build with Gradle run: ./gradlew build --stacktrace - name: Upload to Codecov From d98d5c8c878150527ed17f0b837251a6ddf43493 Mon Sep 17 00:00:00 2001 From: David Karnok Date: Fri, 20 Nov 2020 14:26:11 +0100 Subject: [PATCH 076/203] Update gradle.yml --- .github/workflows/gradle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d2603cd7..15f504d4 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -16,6 +16,7 @@ jobs: env: TRAVIS_PULL_REQUEST: ${{ github.event.number }} JAVADOCS_TOKEN: ${{ secrets.JAVADOCS_TOKEN }} + TRAVIS_BUILD_NUMBER: $GITHUB_RUN_NUMBER steps: - uses: actions/checkout@v2 - name: Set up JDK 1.8 From 8453d808c41f20a7223fab5f2f6f62ad896c46d2 Mon Sep 17 00:00:00 2001 From: David Karnok Date: Fri, 20 Nov 2020 15:02:59 +0100 Subject: [PATCH 077/203] Update push.sh --- push.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/push.sh b/push.sh index de18f9b8..fc4314a9 100644 --- a/push.sh +++ b/push.sh @@ -9,8 +9,7 @@ targetRepo=github.com/akarnokd/RxJavaExtensions.git # ======================================================================= # only for main pushes, for now -# if [ "$TRAVIS_PULL_REQUEST" == "true" ] || [ "$TRAVIS_TAG" == "" ]; then -if [ "$TRAVIS_PULL_REQUEST" == "true" ]; then +if [ "$CI_PULL_REQUEST" == "true" ]; then echo -e "Pull request detected, skipping JavaDocs pushback." exit 0 fi @@ -22,8 +21,8 @@ if [ "$JAVADOCS_TOKEN" == "" ]; then fi # prepare the git information -git config --global user.email "travis@travis-ci.org" -git config --global user.name "Travis CI" +git config --global user.email "akarnokd@gmail.com" +git config --global user.name "akarnokd" # setup the remote git remote add origin-pages https://${JAVADOCS_TOKEN}@${targetRepo} > /dev/null 2>&1 @@ -49,7 +48,7 @@ git add *.js git add javadoc/package-list # commit all -git commit --message "Travis build: $TRAVIS_BUILD_NUMBER" +git commit --message "CI build: $CI_BUILD_NUMBER" # push it From ad6faa9e27caec035b7e8ba142d5a40498d25c18 Mon Sep 17 00:00:00 2001 From: David Karnok Date: Fri, 20 Nov 2020 15:03:19 +0100 Subject: [PATCH 078/203] Update gradle.yml --- .github/workflows/gradle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 15f504d4..e88622fe 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -14,9 +14,9 @@ jobs: runs-on: ubuntu-latest env: - TRAVIS_PULL_REQUEST: ${{ github.event.number }} + CI_PULL_REQUEST: ${{ github.event.number }} JAVADOCS_TOKEN: ${{ secrets.JAVADOCS_TOKEN }} - TRAVIS_BUILD_NUMBER: $GITHUB_RUN_NUMBER + CI_BUILD_NUMBER: $GITHUB_RUN_NUMBER steps: - uses: actions/checkout@v2 - name: Set up JDK 1.8 From c759ceb7bb122a99f49ea8ad4ba12c4deb3f94e9 Mon Sep 17 00:00:00 2001 From: David Karnok Date: Fri, 20 Nov 2020 15:07:47 +0100 Subject: [PATCH 079/203] Update gradle.yml --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e88622fe..944d0a68 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -16,7 +16,7 @@ jobs: env: CI_PULL_REQUEST: ${{ github.event.number }} JAVADOCS_TOKEN: ${{ secrets.JAVADOCS_TOKEN }} - CI_BUILD_NUMBER: $GITHUB_RUN_NUMBER + CI_BUILD_NUMBER: ${{ github.run_number }} steps: - uses: actions/checkout@v2 - name: Set up JDK 1.8 From f80fe67b18e282b0d83e57114940c63f49db7c5d Mon Sep 17 00:00:00 2001 From: David Karnok Date: Wed, 25 Nov 2020 09:10:49 +0100 Subject: [PATCH 080/203] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b0a55661..2761a0f6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # RxJavaExtensions - + [![codecov.io](http://codecov.io/github/akarnokd/RxJavaExtensions/coverage.svg?branch=3.x)](http://codecov.io/github/akarnokd/RxJavaExtensions?branch=3.x) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.akarnokd/rxjava3-extensions/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.akarnokd/rxjava3-extensions) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava) From fbb600606d89cdd595876c58ab235e2e5f1bc7e3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 25 Nov 2020 09:23:57 +0100 Subject: [PATCH 081/203] Bump mockito-core from 3.6.0 to 3.6.26 (#97) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.6.0 to 3.6.26. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.6.0...v3.6.26) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7129c62a..7bbff779 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13.1' - testCompile 'org.mockito:mockito-core:3.6.0' + testCompile 'org.mockito:mockito-core:3.6.26' } apply plugin: 'maven' From 0dc24bc81ce253bad04a8aff6384ef73c91adf59 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 3 Dec 2020 08:26:31 +0100 Subject: [PATCH 082/203] Bump rxjava from 3.0.7 to 3.0.8 (#99) Bumps [rxjava](https://github.com/ReactiveX/RxJava) from 3.0.7 to 3.0.8. - [Release notes](https://github.com/ReactiveX/RxJava/releases) - [Commits](https://github.com/ReactiveX/RxJava/compare/v3.0.7...v3.0.8) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7bbff779..c26ea8f7 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.7" + compile "io.reactivex.rxjava3:rxjava:3.0.8" testCompile group: 'junit', name: 'junit', version: '4.13.1' From e3a5fafb90e42c7ac8972b20cbe11ddc235db5dd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 31 Dec 2020 09:13:32 +0100 Subject: [PATCH 083/203] Bump rxjava from 3.0.8 to 3.0.9 (#100) Bumps [rxjava](https://github.com/ReactiveX/RxJava) from 3.0.8 to 3.0.9. - [Release notes](https://github.com/ReactiveX/RxJava/releases) - [Commits](https://github.com/ReactiveX/RxJava/compare/v3.0.8...v3.0.9) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c26ea8f7..28cc2500 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.8" + compile "io.reactivex.rxjava3:rxjava:3.0.9" testCompile group: 'junit', name: 'junit', version: '4.13.1' From 2fbd347df7f354bed8c5ff53298abd9deb2a0a2a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 Jan 2021 08:22:37 +0100 Subject: [PATCH 084/203] Bump mockito-core from 3.6.26 to 3.7.0 (#101) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.6.26 to 3.7.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.6.26...v3.7.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 28cc2500..15364812 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13.1' - testCompile 'org.mockito:mockito-core:3.6.26' + testCompile 'org.mockito:mockito-core:3.7.0' } apply plugin: 'maven' From 48ed8b7dd7994f1450a9f3a413dc137e9edf5640 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 18 Jan 2021 09:44:35 +0100 Subject: [PATCH 085/203] Bump mockito-core from 3.7.0 to 3.7.7 (#102) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.7.0 to 3.7.7. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.7.0...v3.7.7) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 15364812..c005a2bf 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13.1' - testCompile 'org.mockito:mockito-core:3.7.0' + testCompile 'org.mockito:mockito-core:3.7.7' } apply plugin: 'maven' From b5c19c676bf4125f489e946c8e5cb235016e8eac Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 2 Feb 2021 08:33:35 +0100 Subject: [PATCH 086/203] Bump rxjava from 3.0.9 to 3.0.10 (#103) Bumps [rxjava](https://github.com/ReactiveX/RxJava) from 3.0.9 to 3.0.10. - [Release notes](https://github.com/ReactiveX/RxJava/releases) - [Commits](https://github.com/ReactiveX/RxJava/compare/v3.0.9...v3.0.10) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c005a2bf..cc4d6d0a 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.9" + compile "io.reactivex.rxjava3:rxjava:3.0.10" testCompile group: 'junit', name: 'junit', version: '4.13.1' From 3fcc3abc8c3197d8db5af6426738692a3ce996c5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 10 Feb 2021 08:50:21 +0100 Subject: [PATCH 087/203] Bump jmh-gradle-plugin from 0.5.2 to 0.5.3 (#105) Bumps jmh-gradle-plugin from 0.5.2 to 0.5.3. Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cc4d6d0a..929b2cdc 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.2" + classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.3" classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.2' classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.2.0" classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0' From f49c0e0480337485e93c0901e72bef135a31de43 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 15 Feb 2021 09:34:10 +0100 Subject: [PATCH 088/203] Bump junit from 4.13.1 to 4.13.2 (#108) Bumps [junit](https://github.com/junit-team/junit4) from 4.13.1 to 4.13.2. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.13.1...r4.13.2) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 929b2cdc..b7acdb05 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ dependencies { compile "org.reactivestreams:reactive-streams:1.0.3" compile "io.reactivex.rxjava3:rxjava:3.0.10" - testCompile group: 'junit', name: 'junit', version: '4.13.1' + testCompile group: 'junit', name: 'junit', version: '4.13.2' testCompile 'org.mockito:mockito-core:3.7.7' } From 6a6fa22708a7cee174b8b52695041a3484100ef1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 18 Feb 2021 07:43:12 +0100 Subject: [PATCH 089/203] Bump gradle-animalsniffer-plugin from 1.5.2 to 1.5.3 (#110) Bumps [gradle-animalsniffer-plugin](https://github.com/xvik/gradle-animalsniffer-plugin) from 1.5.2 to 1.5.3. - [Release notes](https://github.com/xvik/gradle-animalsniffer-plugin/releases) - [Changelog](https://github.com/xvik/gradle-animalsniffer-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/xvik/gradle-animalsniffer-plugin/compare/1.5.2...1.5.3) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b7acdb05..c505c4b9 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { dependencies { classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.3" - classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.2' + classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.3' classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.2.0" classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0' classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0" From df937c210c1ca7dfcb874d9025041adf2df9e0bf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 23 Feb 2021 08:53:53 +0100 Subject: [PATCH 090/203] Bump mockito-core from 3.7.7 to 3.8.0 (#111) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.7.7 to 3.8.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.7.7...v3.8.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c505c4b9..577a1a16 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13.2' - testCompile 'org.mockito:mockito-core:3.7.7' + testCompile 'org.mockito:mockito-core:3.8.0' } apply plugin: 'maven' From 6eae565c1742ea846e712fdfcc70aef23e1f699e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 23 Feb 2021 08:54:16 +0100 Subject: [PATCH 091/203] Bump biz.aQute.bnd.gradle from 5.2.0 to 5.3.0 (#112) Bumps [biz.aQute.bnd.gradle](https://github.com/bndtools/bnd) from 5.2.0 to 5.3.0. - [Release notes](https://github.com/bndtools/bnd/releases) - [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md) - [Commits](https://github.com/bndtools/bnd/commits) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 577a1a16..3c5e5df9 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { dependencies { classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.3" classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.3' - classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.2.0" + classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0" classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0' classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0" } From 971b733d5aec6b420f7cefa1c21f128f6ce688c1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 8 Mar 2021 08:57:15 +0100 Subject: [PATCH 092/203] Bump rxjava from 3.0.10 to 3.0.11 (#113) Bumps [rxjava](https://github.com/akarnokd/RxJavaExtensions) from 3.0.10 to 3.0.11. - [Release notes](https://github.com/akarnokd/RxJavaExtensions/releases) - [Commits](https://github.com/akarnokd/RxJavaExtensions/commits) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3c5e5df9..2f472c68 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.10" + compile "io.reactivex.rxjava3:rxjava:3.0.11" testCompile group: 'junit', name: 'junit', version: '4.13.2' From 6168b8b37186664fe19a52fc6cc673b25b56576b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 08:36:45 +0200 Subject: [PATCH 093/203] Bump mockito-core from 3.8.0 to 3.9.0 (#115) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.8.0 to 3.9.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.8.0...v3.9.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2f472c68..ec946c87 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13.2' - testCompile 'org.mockito:mockito-core:3.8.0' + testCompile 'org.mockito:mockito-core:3.9.0' } apply plugin: 'maven' From 274e4230e1c2c4246a8e1e9cca2f08ba51e4e546 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 9 Apr 2021 08:37:11 +0200 Subject: [PATCH 094/203] Bump rxjava from 3.0.11 to 3.0.12 (#116) Bumps [rxjava](https://github.com/ReactiveX/RxJava) from 3.0.11 to 3.0.12. - [Release notes](https://github.com/ReactiveX/RxJava/releases) - [Commits](https://github.com/ReactiveX/RxJava/compare/v3.0.11...v3.0.12) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ec946c87..b7d81af3 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.11" + compile "io.reactivex.rxjava3:rxjava:3.0.12" testCompile group: 'junit', name: 'junit', version: '4.13.2' From dd182364c52c97f60e7db65066b709f2c5213fb4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 07:26:10 +0200 Subject: [PATCH 095/203] Upgrade to GitHub-native Dependabot (#118) Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- .github/dependabot.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..cf92d1d7 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,15 @@ +version: 2 +updates: +- package-ecosystem: gradle + directory: "/" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 20 + ignore: + - dependency-name: com.vanniktech:gradle-maven-publish-plugin + versions: + - 0.14.0 + - 0.14.1 + - 0.14.2 + - 0.15.0 From a77ceaa8d2389a57332120f5463655babd8355ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 May 2021 08:09:55 +0200 Subject: [PATCH 096/203] Bump mockito-core from 3.9.0 to 3.10.0 (#122) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.9.0 to 3.10.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.9.0...v3.10.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b7d81af3..d1683a98 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13.2' - testCompile 'org.mockito:mockito-core:3.9.0' + testCompile 'org.mockito:mockito-core:3.10.0' } apply plugin: 'maven' From ff0c4db302d397114056673462b5cc4fb0002f3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Jun 2021 08:45:00 +0200 Subject: [PATCH 097/203] Bump rxjava from 3.0.12 to 3.0.13 (#123) Bumps [rxjava](https://github.com/ReactiveX/RxJava) from 3.0.12 to 3.0.13. - [Release notes](https://github.com/ReactiveX/RxJava/releases) - [Commits](https://github.com/ReactiveX/RxJava/compare/v3.0.12...v3.0.13) --- updated-dependencies: - dependency-name: io.reactivex.rxjava3:rxjava dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d1683a98..5946425a 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.12" + compile "io.reactivex.rxjava3:rxjava:3.0.13" testCompile group: 'junit', name: 'junit', version: '4.13.2' From 8061a3bc8aa8d45203ad97ec3b48f37995fffa1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Jun 2021 08:21:45 +0200 Subject: [PATCH 098/203] Bump mockito-core from 3.10.0 to 3.11.0 (#124) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.10.0 to 3.11.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.10.0...v3.11.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5946425a..89b73e69 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13.2' - testCompile 'org.mockito:mockito-core:3.10.0' + testCompile 'org.mockito:mockito-core:3.11.0' } apply plugin: 'maven' From b523281519dc9ab5a6abd36f3bf484adad78e2fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Jun 2021 08:29:03 +0200 Subject: [PATCH 099/203] Bump mockito-core from 3.11.0 to 3.11.1 (#125) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.11.0 to 3.11.1. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.11.0...v3.11.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 89b73e69..ad5bf879 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13.2' - testCompile 'org.mockito:mockito-core:3.11.0' + testCompile 'org.mockito:mockito-core:3.11.1' } apply plugin: 'maven' From 98612236ff60ed9c534371c46ea7f7a9ff52db01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 08:08:17 +0200 Subject: [PATCH 100/203] Bump mockito-core from 3.11.1 to 3.11.2 (#127) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.11.1 to 3.11.2. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.11.1...v3.11.2) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ad5bf879..bb969180 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13.2' - testCompile 'org.mockito:mockito-core:3.11.1' + testCompile 'org.mockito:mockito-core:3.11.2' } apply plugin: 'maven' From 988390083c3b7590d08b003eb5df817bc587449e Mon Sep 17 00:00:00 2001 From: David Karnok Date: Sat, 17 Jul 2021 12:35:48 +0200 Subject: [PATCH 101/203] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2761a0f6..d7841d52 100644 --- a/README.md +++ b/README.md @@ -162,7 +162,7 @@ Flowable.just("ab", ":cde:" "fg") ## Asynchronous jumpstarting a sequence Wrap functions and consumers into Flowables and Observables or into another layer of Functions. -Most of these can now be achieved via `fromCallable` and some function composition in plain RxJava (1.x and 2.x alike). +Most of these can now be achieved via `fromCallable` and some function composition in plain RxJava. ### start @@ -378,7 +378,7 @@ TBD: examples ## Debug support -By default, RxJava 2's RxJavaPlugins only offers the ability to hook into the assembly process (i.e., when you apply an operator on a sequence or create one) unlike 1.x where there is an `RxJavaHooks.enableAssemblyTracking()` method. Since the standard format is of discussion there, 2.x doesn't have such feature built in but only +By default, RxJava 3's RxJavaPlugins only offers the ability to hook into the assembly process (i.e., when you apply an operator on a sequence or create one) unlike 1.x where there is an `RxJavaHooks.enableAssemblyTracking()` method. Since the standard format is of discussion there, 3.x doesn't have such feature built in but only in this extension library. ### Usage @@ -566,7 +566,7 @@ Note that calling `onComplete` after `onNext` is optional with `SoloProcessor` b ### MulticastProcessor -*Moved to RxJava as standard processor: [`io.reactivex.processors.MulticastProcessor`](http://reactivex.io/RxJava/2.x/javadoc/io/reactivex/processors/MulticastProcessor.html)*. +*Moved to RxJava as standard processor: [`io.reactivex.rxjava3.processors.MulticastProcessor`](http://reactivex.io/RxJava/3.x/javadoc/io/reactivex/rxjava3/processors/MulticastProcessor.html)*. ### UnicastWorkSubject @@ -1176,8 +1176,8 @@ Flowable.range(1, 10) ### FlowableTransformers.refCount() *Moved to RxJava as standard operators: -[ConnectableObservable.refCount](http://reactivex.io/RxJava/2.x/javadoc/io/reactivex/observables/ConnectableObservable.html#refCount-int-long-java.util.concurrent.TimeUnit-io.reactivex.Scheduler-), -[ConnectableFlowable.refCount](http://reactivex.io/RxJava/2.x/javadoc/io/reactivex/flowables/ConnectableFlowable.html#refCount-int-long-java.util.concurrent.TimeUnit-io.reactivex.Scheduler-). +[ConnectableObservable.refCount](http://reactivex.io/RxJava/3.x/javadoc/io/reactivex/rxjava3/observables/ConnectableObservable.html#refCount-int-long-java.util.concurrent.TimeUnit-io.reactivex.rxjava3.core.Scheduler-), +[ConnectableFlowable.refCount](http://reactivex.io/RxJava/3.x/javadoc/io/reactivex/rxjava3/flowables/ConnectableFlowable.html#refCount-int-long-java.util.concurrent.TimeUnit-io.reactivex.rxjava3.core.Scheduler-). ### Flowables.zipLatest() From d33088d6fa5bebce07769e5925ba0eca19824c52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Aug 2021 08:49:10 +0200 Subject: [PATCH 102/203] Bump rxjava from 3.0.13 to 3.1.0 (#129) Bumps [rxjava](https://github.com/ReactiveX/RxJava) from 3.0.13 to 3.1.0. - [Release notes](https://github.com/ReactiveX/RxJava/releases) - [Commits](https://github.com/ReactiveX/RxJava/compare/v3.0.13...v3.1.0) --- updated-dependencies: - dependency-name: io.reactivex.rxjava3:rxjava dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index bb969180..77bd1856 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.0.13" + compile "io.reactivex.rxjava3:rxjava:3.1.0" testCompile group: 'junit', name: 'junit', version: '4.13.2' From 2ae97eaef784619dacb9bcfac4d3be859bd446b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Aug 2021 09:27:45 +0200 Subject: [PATCH 103/203] Bump mockito-core from 3.11.2 to 3.12.1 (#132) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.11.2 to 3.12.1. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.11.2...v3.12.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 77bd1856..0477fcc4 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13.2' - testCompile 'org.mockito:mockito-core:3.11.2' + testCompile 'org.mockito:mockito-core:3.12.1' } apply plugin: 'maven' From fad94dbde786fcee92601b5856ac8626661d9fbc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Aug 2021 08:28:57 +0200 Subject: [PATCH 104/203] Bump mockito-core from 3.12.1 to 3.12.3 (#133) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.12.1 to 3.12.3. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.12.1...v3.12.3) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0477fcc4..8e0ddd64 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13.2' - testCompile 'org.mockito:mockito-core:3.12.1' + testCompile 'org.mockito:mockito-core:3.12.3' } apply plugin: 'maven' From 3aed0f2a0286de7e48bdfca8588f9a39e783d928 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Aug 2021 08:42:26 +0200 Subject: [PATCH 105/203] Bump mockito-core from 3.12.3 to 3.12.4 (#134) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.12.3 to 3.12.4. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.12.3...v3.12.4) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8e0ddd64..d3500e6c 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.13.2' - testCompile 'org.mockito:mockito-core:3.12.3' + testCompile 'org.mockito:mockito-core:3.12.4' } apply plugin: 'maven' From 57be8a45ddec57e3b9b48cfc243ab7879f17b705 Mon Sep 17 00:00:00 2001 From: akarnokd Date: Tue, 31 Aug 2021 08:53:14 +0200 Subject: [PATCH 106/203] Upgrade to Gradle 7.2 and RxJava 3.1.1 --- build.gradle | 17 +++++++---------- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../basetypes/BasicEmptyQueueSubscription.java | 2 +- .../BasicNonoIntQueueSubscription.java | 2 +- .../basetypes/BasicRefQueueSubscription.java | 2 +- .../basetypes/BasicSoloQueueSubscription.java | 2 +- .../akarnokd/rxjava3/basetypes/NonoConcat.java | 3 +-- .../rxjava3/basetypes/PerhapsDoOnLifecycle.java | 2 +- .../akarnokd/rxjava3/basetypes/PerhapsJust.java | 2 +- .../akarnokd/rxjava3/basetypes/SoloDelay.java | 2 +- .../rxjava3/basetypes/SoloDelayPublisher.java | 2 +- .../rxjava3/basetypes/SoloDoFinally.java | 2 +- .../rxjava3/basetypes/SoloDoOnLifecycle.java | 2 +- .../hu/akarnokd/rxjava3/basetypes/SoloJust.java | 2 +- .../rxjava3/basetypes/SoloMapError.java | 2 +- .../rxjava3/basetypes/SoloObserveOn.java | 2 +- .../rxjava3/basetypes/SoloUnsubscribeOn.java | 2 +- .../CompletableOnAssemblyScalarSupplier.java | 2 +- .../rxjava3/debug/FlowableOnAssembly.java | 2 +- .../debug/FlowableOnAssemblyConnectable.java | 2 +- .../debug/FlowableOnAssemblyScalarSupplier.java | 2 +- .../debug/FlowableOnAssemblySupplier.java | 2 +- .../debug/MaybeOnAssemblyScalarSupplier.java | 2 +- .../rxjava3/debug/ObservableOnAssembly.java | 2 +- .../ObservableOnAssemblyScalarSupplier.java | 2 +- .../debug/ParallelFlowableOnAssembly.java | 2 +- .../rxjava3/debug/RxJavaAssemblyTracking.java | 2 +- .../debug/SingleOnAssemblyScalarSupplier.java | 2 +- .../operators/BasicMergeSubscription.java | 2 +- .../operators/FlowableBufferPredicate.java | 2 +- .../rxjava3/operators/FlowableCoalesce.java | 4 ++-- .../operators/FlowableDebounceFirst.java | 2 +- .../rxjava3/operators/FlowableExpand.java | 4 ++-- .../rxjava3/operators/FlowableFlatMapAsync.java | 2 +- .../rxjava3/operators/FlowableFlatMapSync.java | 4 ++-- .../rxjava3/operators/FlowableMapFilter.java | 2 +- .../rxjava3/operators/FlowableRepeatScalar.java | 2 +- .../operators/FlowableRepeatSupplier.java | 2 +- .../rxjava3/operators/FlowableSpanout.java | 4 ++-- .../operators/FlowableSwitchFlatMap.java | 4 ++-- .../rxjava3/operators/FlowableValve.java | 4 ++-- .../operators/FlowableWindowPredicate.java | 2 +- .../operators/ObservableFilterAsync.java | 2 +- .../rxjava3/operators/ObservableMapAsync.java | 2 +- .../rxjava3/operators/ObservableValve.java | 4 ++-- .../rxjava3/operators/package-info.java | 2 +- .../processors/DispatchWorkProcessor.java | 2 +- .../rxjava3/string/FlowableCharSequence.java | 2 +- .../akarnokd/rxjava3/string/FlowableSplit.java | 4 ++-- .../rxjava3/subjects/DispatchWorkSubject.java | 2 +- .../rxjava3/subjects/UnicastWorkSubject.java | 4 ++-- .../rxjava3/util/SpmcLinkedArrayQueue.java | 2 +- .../hu/akarnokd/rxjava3/util/SpscOneQueue.java | 2 +- .../hu/akarnokd/rxjava3/basetypes/NonoTest.java | 2 +- .../rxjava3/expr/StatementCompletableTest.java | 2 +- .../rxjava3/expr/StatementFlowableTest.java | 2 +- .../rxjava3/expr/StatementMaybeTest.java | 2 +- .../rxjava3/expr/StatementObservableTest.java | 2 +- .../rxjava3/expr/StatementSingleTest.java | 2 +- .../rxjava3/joins/OperatorJoinsTest.java | 2 +- .../FlowableMapFilterConditionalTest.java | 2 +- .../operators/FlowableMapFilterTest.java | 2 +- .../rxjava3/test/BaseTestConsumerEx.java | 2 +- .../hu/akarnokd/rxjava3/test/TestHelper.java | 2 +- .../akarnokd/rxjava3/test/TestObserverEx.java | 2 +- .../akarnokd/rxjava3/test/TestSubscriberEx.java | 2 +- 67 files changed, 83 insertions(+), 87 deletions(-) diff --git a/build.gradle b/build.gradle index d3500e6c..34453c8d 100644 --- a/build.gradle +++ b/build.gradle @@ -10,12 +10,12 @@ buildscript { classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.3" classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.3' classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0" - classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0' - classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0" + classpath 'com.vanniktech:gradle-maven-publish-plugin:0.17.0' + classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1" } } -apply plugin: 'java' +apply plugin: 'java-library' apply plugin: 'eclipse' apply plugin: "me.champeau.gradle.jmh" apply plugin: 'pmd' @@ -39,23 +39,20 @@ repositories { mavenCentral() maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } maven { url 'https://oss.sonatype.org/content/groups/public' } - maven { url 'https://oss.jfrog.org/libs-snapshot' } maven { url 'https://repo.spring.io/libs-snapshot' } } dependencies { signature 'org.codehaus.mojo.signature:java18:1.0@signature' - compile "org.reactivestreams:reactive-streams:1.0.3" - compile "io.reactivex.rxjava3:rxjava:3.1.0" + api "org.reactivestreams:reactive-streams:1.0.3" + api "io.reactivex.rxjava3:rxjava:3.1.1" - testCompile group: 'junit', name: 'junit', version: '4.13.2' + testImplementation group: 'junit', name: 'junit', version: '4.13.2' - testCompile 'org.mockito:mockito-core:3.12.4' + testImplementation 'org.mockito:mockito-core:3.12.4' } -apply plugin: 'maven' - apply plugin: 'biz.aQute.bnd.builder' jar { diff --git a/gradle.properties b/gradle.properties index 40c6a765..3c643134 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ GROUP=com.github.akarnokd -VERSION_NAME=3.0.1 -version=3.0.1 +VERSION_NAME=3.1.1 +version=3.1.1 POM_ARTIFACT_ID=rxjava3-extensions POM_NAME=RxJava 3 extra sources, operators and components diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 94920145..ffed3a25 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicEmptyQueueSubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicEmptyQueueSubscription.java index f156d26f..0af3beea 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicEmptyQueueSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicEmptyQueueSubscription.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.basetypes; -import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.operators.QueueSubscription; /** * Base class for empty, async-fuseable intermediate operators. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoIntQueueSubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoIntQueueSubscription.java index d04e46a8..bf3de33c 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoIntQueueSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoIntQueueSubscription.java @@ -18,7 +18,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.operators.QueueSubscription; /** * Base class for atomic integer, async-fuseable intermediate operators. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefQueueSubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefQueueSubscription.java index 4eba379a..072f48fc 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefQueueSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefQueueSubscription.java @@ -18,7 +18,7 @@ import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.operators.QueueSubscription; /** * Base class extending AtomicReference (resource tracking) and QueueSubscription (fusion). diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicSoloQueueSubscription.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicSoloQueueSubscription.java index 3b935b6c..69f1a0ff 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicSoloQueueSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/BasicSoloQueueSubscription.java @@ -16,7 +16,7 @@ package hu.akarnokd.rxjava3.basetypes; -import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.operators.QueueSubscription; /** * Base class that defaults the offer() methods of QueueSubscription. diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java index fe600b73..0ae1cfb5 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java @@ -21,8 +21,7 @@ import org.reactivestreams.*; import io.reactivex.rxjava3.exceptions.*; -import io.reactivex.rxjava3.internal.fuseable.*; -import io.reactivex.rxjava3.internal.queue.*; +import io.reactivex.rxjava3.operators.*; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.*; diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoOnLifecycle.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoOnLifecycle.java index ed209b85..39cbd88a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoOnLifecycle.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoOnLifecycle.java @@ -20,7 +20,7 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.operators.QueueSubscription; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsJust.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsJust.java index fd729fd5..2ab9dc0c 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsJust.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsJust.java @@ -18,7 +18,7 @@ import org.reactivestreams.Subscriber; -import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.operators.ScalarSupplier; import io.reactivex.rxjava3.internal.subscriptions.ScalarSubscription; /** diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelay.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelay.java index 30288e9b..915d54f2 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelay.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelay.java @@ -24,7 +24,7 @@ import io.reactivex.rxjava3.core.Scheduler; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.operators.QueueSubscription; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelayPublisher.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelayPublisher.java index 5ab074c5..ccd5336b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelayPublisher.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDelayPublisher.java @@ -21,7 +21,7 @@ import org.reactivestreams.*; import io.reactivex.rxjava3.exceptions.CompositeException; -import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.operators.QueueSubscription; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoFinally.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoFinally.java index 90e4717d..e8c7ec43 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoFinally.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoFinally.java @@ -20,7 +20,7 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Action; -import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.operators.QueueSubscription; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoOnLifecycle.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoOnLifecycle.java index 40503f5c..d630d05d 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoOnLifecycle.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloDoOnLifecycle.java @@ -20,7 +20,7 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.operators.QueueSubscription; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloJust.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloJust.java index 00d304eb..e46ace9b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloJust.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloJust.java @@ -18,7 +18,7 @@ import org.reactivestreams.Subscriber; -import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.operators.ScalarSupplier; import io.reactivex.rxjava3.internal.subscriptions.ScalarSubscription; /** diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMapError.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMapError.java index 287137cd..763bcf27 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMapError.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloMapError.java @@ -22,7 +22,7 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.operators.QueueSubscription; import io.reactivex.rxjava3.internal.subscribers.BasicFuseableSubscriber; /** diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloObserveOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloObserveOn.java index fc66797b..3ce1c1f9 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloObserveOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloObserveOn.java @@ -22,7 +22,7 @@ import io.reactivex.rxjava3.core.Scheduler; import io.reactivex.rxjava3.core.Scheduler.Worker; import io.reactivex.rxjava3.exceptions.Exceptions; -import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.operators.*; import io.reactivex.rxjava3.internal.subscriptions.*; /** diff --git a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUnsubscribeOn.java b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUnsubscribeOn.java index 954e65a6..7092f388 100644 --- a/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUnsubscribeOn.java +++ b/src/main/java/hu/akarnokd/rxjava3/basetypes/SoloUnsubscribeOn.java @@ -19,7 +19,7 @@ import org.reactivestreams.Subscriber; import io.reactivex.rxjava3.core.Scheduler; -import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.operators.QueueSubscription; import io.reactivex.rxjava3.internal.subscribers.BasicFuseableSubscriber; /** diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblyScalarSupplier.java b/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblyScalarSupplier.java index d6bce2de..f04c73e9 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblyScalarSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/CompletableOnAssemblyScalarSupplier.java @@ -18,7 +18,7 @@ import hu.akarnokd.rxjava3.debug.CompletableOnAssembly.OnAssemblyCompletableObserver; import io.reactivex.rxjava3.core.*; -import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.operators.ScalarSupplier; /** * Wraps a CompletableSource and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssembly.java b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssembly.java index f0fffe38..b71bd100 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssembly.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssembly.java @@ -19,7 +19,7 @@ import org.reactivestreams.*; import io.reactivex.rxjava3.core.Flowable; -import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.operators.*; import io.reactivex.rxjava3.internal.subscribers.*; /** diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyConnectable.java b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyConnectable.java index 20364a0e..a49d83f6 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyConnectable.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyConnectable.java @@ -22,7 +22,7 @@ import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.flowables.ConnectableFlowable; import io.reactivex.rxjava3.functions.Consumer; -import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.operators.ConditionalSubscriber; /** * Wraps a Publisher and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyScalarSupplier.java b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyScalarSupplier.java index 486e75bc..430d3abe 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyScalarSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblyScalarSupplier.java @@ -20,7 +20,7 @@ import hu.akarnokd.rxjava3.debug.FlowableOnAssembly.*; import io.reactivex.rxjava3.core.Flowable; -import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.operators.*; /** * Wraps a Publisher and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblySupplier.java b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblySupplier.java index 1442eff1..15bf4da7 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblySupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/FlowableOnAssemblySupplier.java @@ -22,7 +22,7 @@ import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Supplier; -import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.operators.ConditionalSubscriber; /** * Wraps a Publisher and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblyScalarSupplier.java b/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblyScalarSupplier.java index 4921b81a..10323f5b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblyScalarSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/MaybeOnAssemblyScalarSupplier.java @@ -18,7 +18,7 @@ import hu.akarnokd.rxjava3.debug.MaybeOnAssembly.OnAssemblyMaybeObserver; import io.reactivex.rxjava3.core.*; -import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.operators.ScalarSupplier; /** * Wraps a MaybeSource and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssembly.java b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssembly.java index 91cfa860..2a9c0087 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssembly.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssembly.java @@ -17,7 +17,7 @@ package hu.akarnokd.rxjava3.debug; import io.reactivex.rxjava3.core.*; -import io.reactivex.rxjava3.internal.fuseable.QueueDisposable; +import io.reactivex.rxjava3.operators.QueueDisposable; import io.reactivex.rxjava3.internal.observers.BasicFuseableObserver; /** diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyScalarSupplier.java b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyScalarSupplier.java index 124c62ce..496310b4 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyScalarSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/ObservableOnAssemblyScalarSupplier.java @@ -18,7 +18,7 @@ import hu.akarnokd.rxjava3.debug.ObservableOnAssembly.OnAssemblyObserver; import io.reactivex.rxjava3.core.*; -import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.operators.ScalarSupplier; /** * Wraps a ObservableSource and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/ParallelFlowableOnAssembly.java b/src/main/java/hu/akarnokd/rxjava3/debug/ParallelFlowableOnAssembly.java index 3778dab0..fe17ee37 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/ParallelFlowableOnAssembly.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/ParallelFlowableOnAssembly.java @@ -19,7 +19,7 @@ import org.reactivestreams.Subscriber; import hu.akarnokd.rxjava3.debug.FlowableOnAssembly.*; -import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.operators.ConditionalSubscriber; import io.reactivex.rxjava3.parallel.ParallelFlowable; /** diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyTracking.java b/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyTracking.java index 45ad4d48..95985008 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyTracking.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/RxJavaAssemblyTracking.java @@ -21,7 +21,7 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.flowables.ConnectableFlowable; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.operators.ScalarSupplier; import io.reactivex.rxjava3.observables.ConnectableObservable; import io.reactivex.rxjava3.parallel.ParallelFlowable; import io.reactivex.rxjava3.plugins.RxJavaPlugins; diff --git a/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblyScalarSupplier.java b/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblyScalarSupplier.java index e96eb8d6..b568d6d0 100644 --- a/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblyScalarSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/debug/SingleOnAssemblyScalarSupplier.java @@ -18,7 +18,7 @@ import hu.akarnokd.rxjava3.debug.SingleOnAssembly.OnAssemblySingleObserver; import io.reactivex.rxjava3.core.*; -import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.operators.ScalarSupplier; /** * Wraps a Publisher and inject the assembly info. diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java b/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java index b0d34f06..7863f207 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/BasicMergeSubscription.java @@ -22,7 +22,7 @@ import org.reactivestreams.*; import io.reactivex.rxjava3.exceptions.Exceptions; -import io.reactivex.rxjava3.internal.fuseable.SimpleQueue; +import io.reactivex.rxjava3.operators.SimpleQueue; import io.reactivex.rxjava3.internal.subscribers.*; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.*; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicate.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicate.java index 32348edd..31c49e79 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicate.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableBufferPredicate.java @@ -23,7 +23,7 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.operators.ConditionalSubscriber; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCoalesce.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCoalesce.java index 3ac13be4..41a35a1b 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCoalesce.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableCoalesce.java @@ -23,8 +23,8 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; -import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.operators.SimplePlainQueue; +import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.BackpressureHelper; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirst.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirst.java index 3a797e5f..253e183a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirst.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableDebounceFirst.java @@ -21,7 +21,7 @@ import org.reactivestreams.*; import io.reactivex.rxjava3.core.*; -import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.operators.ConditionalSubscriber; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java index ae8aff7e..13e5575c 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableExpand.java @@ -24,8 +24,8 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; -import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.operators.SimplePlainQueue; +import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.*; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java index f8eddae3..faf2cc7f 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapAsync.java @@ -21,7 +21,7 @@ import hu.akarnokd.rxjava3.operators.FlowableFlatMapSync.*; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.fuseable.SimpleQueue; +import io.reactivex.rxjava3.operators.SimpleQueue; /** * FlatMap a bounded number of inner, non-trivial flows (unbound not supported). diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java index f2ec65e5..758568be 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableFlatMapSync.java @@ -24,8 +24,8 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.fuseable.*; -import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.operators.*; +import io.reactivex.rxjava3.operators.SpscArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.*; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapFilter.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapFilter.java index 3930f1fb..10ca71af 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapFilter.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableMapFilter.java @@ -21,7 +21,7 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.BiConsumer; -import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.operators.ConditionalSubscriber; import io.reactivex.rxjava3.internal.subscribers.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatScalar.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatScalar.java index 80fd3bf5..8b6024aa 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatScalar.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatScalar.java @@ -19,7 +19,7 @@ import org.reactivestreams.Subscriber; import io.reactivex.rxjava3.core.Flowable; -import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.operators.ConditionalSubscriber; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.BackpressureHelper; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatSupplier.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatSupplier.java index 0d789715..73fa0301 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatSupplier.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableRepeatSupplier.java @@ -23,7 +23,7 @@ import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Supplier; -import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.operators.ConditionalSubscriber; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.BackpressureHelper; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSpanout.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSpanout.java index da80a5de..d98254d1 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSpanout.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSpanout.java @@ -22,8 +22,8 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.core.Scheduler.Worker; -import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; -import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.operators.SimplePlainQueue; +import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMap.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMap.java index 69ab9967..387ef355 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMap.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableSwitchFlatMap.java @@ -24,8 +24,8 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; -import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.operators.SimplePlainQueue; +import io.reactivex.rxjava3.operators.SpscArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java index 125fee16..d546f2ee 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableValve.java @@ -21,8 +21,8 @@ import org.reactivestreams.*; import io.reactivex.rxjava3.core.*; -import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; -import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.operators.SimplePlainQueue; +import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.AtomicThrowable; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicate.java b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicate.java index 3a0d0686..42d73692 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicate.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/FlowableWindowPredicate.java @@ -23,7 +23,7 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Predicate; -import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.operators.ConditionalSubscriber; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.BackpressureHelper; import io.reactivex.rxjava3.processors.UnicastProcessor; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java index 44b949e3..41f95884 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableFilterAsync.java @@ -24,7 +24,7 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.util.AtomicThrowable; import io.reactivex.rxjava3.plugins.RxJavaPlugins; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java index 0c891572..94be9193 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableMapAsync.java @@ -24,7 +24,7 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.util.AtomicThrowable; import io.reactivex.rxjava3.plugins.RxJavaPlugins; diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java index bebd2110..ad6ca25a 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/ObservableValve.java @@ -21,8 +21,8 @@ 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.operators.SimplePlainQueue; +import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.util.AtomicThrowable; /** diff --git a/src/main/java/hu/akarnokd/rxjava3/operators/package-info.java b/src/main/java/hu/akarnokd/rxjava3/operators/package-info.java index e1f63cb7..68668882 100644 --- a/src/main/java/hu/akarnokd/rxjava3/operators/package-info.java +++ b/src/main/java/hu/akarnokd/rxjava3/operators/package-info.java @@ -16,7 +16,7 @@ /** * Utility methods for uncommon, custom, special and exotic operators for RxJava flows - * in the form of transformers and converters: + * in the form of transformers and converters. *