From 58426baa80c097b3ab2ba934d1159b95933d0000 Mon Sep 17 00:00:00 2001 From: mohamedsamehsalah Date: Tue, 19 Nov 2024 13:40:23 +0100 Subject: [PATCH] Drop `Flux#using*` rules --- .../refasterrules/ReactorRules.java | 139 ------------------ .../refasterrules/ReactorRulesTestInput.java | 32 ---- .../refasterrules/ReactorRulesTestOutput.java | 29 ---- 3 files changed, 200 deletions(-) diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ReactorRules.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ReactorRules.java index 811ba47b..7012f950 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ReactorRules.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ReactorRules.java @@ -687,145 +687,6 @@ final class ReactorRules { } } - /** - * Don't unnecessarily transform a {@link Mono#using(Callable, Function)} to a flux, instead use - * the equivalent API provided by {@link Flux}. - */ - static final class FluxUsing< - D extends AutoCloseable, T, P extends Publisher, M extends Mono> { - @BeforeTemplate - Flux before(Callable resourceSupplier, Function sourceSupplier) { - return Mono.using(resourceSupplier, sourceSupplier).flux(); - } - - @AfterTemplate - Flux after(Callable resourceSupplier, Function sourceSupplier) { - return Flux.using(resourceSupplier, sourceSupplier); - } - } - - /** - * Don't unnecessarily transform a {@link Mono#using(Callable, Function, boolean)} to a flux, - * instead use the equivalent API provided by {@link Flux}. - */ - static final class FluxUsingEager< - D extends AutoCloseable, T, P extends Publisher, M extends Mono> { - @BeforeTemplate - Flux before(Callable resourceSupplier, Function sourceSupplier, boolean eager) { - return Mono.using(resourceSupplier, sourceSupplier, eager).flux(); - } - - @AfterTemplate - Flux after(Callable resourceSupplier, Function sourceSupplier, boolean eager) { - return Flux.using(resourceSupplier, sourceSupplier, eager); - } - } - - /** - * Don't unnecessarily transform a {@link Mono#using(Callable, Function, Consumer)} to a flux, - * instead use the equivalent API provided by {@link Flux}. - */ - static final class FluxUsing2< - D, T, P extends Publisher, M extends Mono> { - @BeforeTemplate - Flux before( - Callable resourceSupplier, Function sourceSupplier, Consumer resourceCleanup) { - return Mono.using(resourceSupplier, sourceSupplier, resourceCleanup).flux(); - } - - @AfterTemplate - Flux after( - Callable resourceSupplier, Function sourceSupplier, Consumer resourceCleanup) { - return Flux.using(resourceSupplier, sourceSupplier, resourceCleanup); - } - } - - /** - * Don't unnecessarily transform a {@link Mono#using(Callable, Function, Consumer, boolean)} to a - * flux, instead use the equivalent API provided by {@link Flux}. - */ - static final class FluxUsing2Eager< - D, T, P extends Publisher, M extends Mono> { - @BeforeTemplate - Flux before( - Callable resourceSupplier, - Function sourceSupplier, - Consumer resourceCleanup, - boolean eager) { - return Mono.using(resourceSupplier, sourceSupplier, resourceCleanup, eager).flux(); - } - - @AfterTemplate - Flux after( - Callable resourceSupplier, - Function sourceSupplier, - Consumer resourceCleanup, - boolean eager) { - return Flux.using(resourceSupplier, sourceSupplier, resourceCleanup, eager); - } - } - - /** - * Don't unnecessarily transform a {@link Mono#usingWhen(Publisher, Function, Function)} to a - * flux, instead use the equivalent API provided by {@link Flux}. - */ - static final class FluxUsingWhen< - D, - T, - P extends Publisher, - P2 extends Publisher, - M extends Mono> { - @BeforeTemplate - Flux before( - Publisher resourceSupplier, - Function resourceClosure, - Function asyncCleanup) { - return Mono.usingWhen(resourceSupplier, resourceClosure, asyncCleanup).flux(); - } - - @AfterTemplate - Flux after( - Publisher resourceSupplier, - Function resourceClosure, - Function asyncCleanup) { - return Flux.usingWhen(resourceSupplier, resourceClosure, asyncCleanup); - } - } - - /** - * Don't unnecessarily transform a {@link Mono#usingWhen(Publisher, Function, Function, - * BiFunction, Function)} to a flux, instead use the equivalent API provided by {@link Flux}. - */ - static final class FluxUsingWhen2< - D, - T, - P extends Publisher, - P2 extends Publisher, - M extends Mono> { - @BeforeTemplate - Flux before( - Publisher resourceSupplier, - Function resourceClosure, - Function asyncComplete, - BiFunction asyncError, - Function asyncCancel) { - return Mono.usingWhen( - resourceSupplier, resourceClosure, asyncComplete, asyncError, asyncCancel) - .flux(); - } - - @AfterTemplate - Flux after( - Publisher resourceSupplier, - Function resourceClosure, - Function asyncComplete, - BiFunction> asyncError, - Function asyncCancel) { - return Flux.usingWhen( - resourceSupplier, resourceClosure, asyncComplete, asyncError, asyncCancel); - } - } - /** Don't unnecessarily pass an empty publisher to {@link Flux#switchIfEmpty(Publisher)}. */ static final class FluxSwitchIfEmptyOfEmptyPublisher { @BeforeTemplate diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java index 45674068..046aba19 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java @@ -244,38 +244,6 @@ final class ReactorRulesTest implements RefasterRuleCollectionTestCase { .single(); } - Flux testFluxUsing() { - return Mono.using(() -> new ByteArrayInputStream(new byte[] {}), s -> Mono.just("foo")).flux(); - } - - Flux testFluxUsingEager() { - return Mono.using(() -> new ByteArrayInputStream(new byte[] {}), s -> Mono.just("foo"), false) - .flux(); - } - - Flux testFluxUsing2() { - return Mono.using(() -> "foo", foo -> Mono.just("bar"), foo -> {}).flux(); - } - - Flux testFluxUsing2Eager() { - return Mono.using(() -> "foo", foo -> Mono.just("bar"), foo -> {}, false).flux(); - } - - Flux testFluxUsingWhen() { - return Mono.usingWhen(Mono.just("foo"), foo -> Mono.just("bar"), foo -> Mono.just("baz")) - .flux(); - } - - Flux testFluxUsingWhen2() { - return Mono.usingWhen( - Mono.just("foo"), - foo -> Mono.just("bar"), - foo -> Mono.just("baz"), - (foo, e) -> Mono.just("qux"), - foo -> Mono.just("thud")) - .flux(); - } - ImmutableSet> testFluxSwitchIfEmptyOfEmptyPublisher() { return ImmutableSet.of( Flux.just(1).switchIfEmpty(Mono.empty()), Flux.just(2).switchIfEmpty(Flux.empty())); diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java index 91885d42..b0577fc7 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java @@ -239,35 +239,6 @@ final class ReactorRulesTest implements RefasterRuleCollectionTestCase { foo -> Mono.just("thud")); } - Flux testFluxUsing() { - return Flux.using(() -> new ByteArrayInputStream(new byte[] {}), s -> Mono.just("foo")); - } - - Flux testFluxUsingEager() { - return Flux.using(() -> new ByteArrayInputStream(new byte[] {}), s -> Mono.just("foo"), false); - } - - Flux testFluxUsing2() { - return Flux.using(() -> "foo", foo -> Mono.just("bar"), foo -> {}); - } - - Flux testFluxUsing2Eager() { - return Flux.using(() -> "foo", foo -> Mono.just("bar"), foo -> {}, false); - } - - Flux testFluxUsingWhen() { - return Flux.usingWhen(Mono.just("foo"), foo -> Mono.just("bar"), foo -> Mono.just("baz")); - } - - Flux testFluxUsingWhen2() { - return Flux.usingWhen( - Mono.just("foo"), - foo -> Mono.just("bar"), - foo -> Mono.just("baz"), - (foo, e) -> Mono.just("qux"), - foo -> Mono.just("thud")); - } - ImmutableSet> testFluxSwitchIfEmptyOfEmptyPublisher() { return ImmutableSet.of(Flux.just(1), Flux.just(2)); }