Skip to content

Extend {Flux,Mono}OnErrorComplete Refaster rules #1939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rickie merged 2 commits into from
Nov 28, 2025
Merged

Extend {Flux,Mono}OnErrorComplete Refaster rules #1939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
414fd08
Introduce redundant Publisher#doOnError Refaster rules
Oct 31, 2025
6d3dbd2
Suggestions
Stephan202 Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ReactorRules.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1658,11 +1658,23 @@ Flux<T> after(
}
}

/** Prefer {@link Mono#onErrorComplete()} over more contrived alternatives. */
static final class MonoOnErrorComplete<T> {
/**
* Prefer {@link Mono#onErrorComplete()} over more contrived alternatives, and don't chain it with
* redundant calls to {@link Mono#doOnError}.
*/
static final class MonoOnErrorComplete<T, E extends Throwable> {
@BeforeTemplate
Mono<T> before(Mono<T> mono) {
return mono.onErrorResume(e -> Mono.empty());
Mono<T> before(
Mono<T> mono,
Consumer<? super Throwable> onThrowable,
Class<E> clazz,
Consumer<? super E> onError,
Predicate<? super Throwable> predicate) {
return Refaster.anyOf(
mono.onErrorResume(e -> Mono.empty()),
mono.onErrorComplete().doOnError(onThrowable),
mono.onErrorComplete().doOnError(clazz, onError),
mono.onErrorComplete().doOnError(predicate, onThrowable));
}

@AfterTemplate
Expand All @@ -1671,11 +1683,23 @@ Mono<T> after(Mono<T> mono) {
}
}

/** Prefer {@link Flux#onErrorComplete()} over more contrived alternatives. */
static final class FluxOnErrorComplete<T> {
/**
* Prefer {@link Flux#onErrorComplete()} over more contrived alternatives, and don't chain it with
* redundant calls to {@link Flux#doOnError}.
*/
static final class FluxOnErrorComplete<T, E extends Throwable> {
@BeforeTemplate
Flux<T> before(Flux<T> flux) {
return flux.onErrorResume(e -> Refaster.anyOf(Mono.empty(), Flux.empty()));
Flux<T> before(
Flux<T> flux,
Consumer<? super Throwable> onThrowable,
Class<E> clazz,
Consumer<? super E> onError,
Predicate<? super Throwable> predicate) {
return Refaster.anyOf(
flux.onErrorResume(e -> Refaster.anyOf(Mono.empty(), Flux.empty())),
flux.onErrorComplete().doOnError(onThrowable),
flux.onErrorComplete().doOnError(clazz, onError),
flux.onErrorComplete().doOnError(predicate, onThrowable));
}

@AfterTemplate
Expand Down
13 changes: 10 additions & 3 deletions ...ontrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,14 +620,21 @@ Flux<Integer> testFluxDoOnError() {
return Flux.just(1).doOnError(IllegalArgumentException.class::isInstance, e -> {});
}

Mono<Integer> testMonoOnErrorComplete() {
return Mono.just(1).onErrorResume(e -> Mono.empty());
ImmutableSet<Mono<Integer>> testMonoOnErrorComplete() {
return ImmutableSet.of(
Mono.just(1).onErrorResume(e -> Mono.empty()),
Mono.just(2).onErrorComplete().doOnError(e -> {}),
Mono.just(3).onErrorComplete().doOnError(IllegalArgumentException.class, e -> {}),
Mono.just(4).onErrorComplete().doOnError(e -> true, e -> {}));
}

ImmutableSet<Flux<Integer>> testFluxOnErrorComplete() {
return ImmutableSet.of(
Flux.just(1).onErrorResume(e -> Mono.empty()),
Flux.just(2).onErrorResume(e -> Flux.empty()));
Flux.just(2).onErrorResume(e -> Flux.empty()),
Flux.just(3).onErrorComplete().doOnError(e -> {}),
Flux.just(4).onErrorComplete().doOnError(IllegalArgumentException.class, e -> {}),
Flux.just(5).onErrorComplete().doOnError(e -> true, e -> {}));
}

ImmutableSet<Mono<Integer>> testMonoOnErrorCompleteClass() {
Expand Down
15 changes: 12 additions & 3 deletions ...ntrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,12 +599,21 @@ Flux<Integer> testFluxDoOnError() {
return Flux.just(1).doOnError(IllegalArgumentException.class, e -> {});
}

Mono<Integer> testMonoOnErrorComplete() {
return Mono.just(1).onErrorComplete();
ImmutableSet<Mono<Integer>> testMonoOnErrorComplete() {
return ImmutableSet.of(
Mono.just(1).onErrorComplete(),
Mono.just(2).onErrorComplete(),
Mono.just(3).onErrorComplete(),
Mono.just(4).onErrorComplete());
}

ImmutableSet<Flux<Integer>> testFluxOnErrorComplete() {
return ImmutableSet.of(Flux.just(1).onErrorComplete(), Flux.just(2).onErrorComplete());
return ImmutableSet.of(
Flux.just(1).onErrorComplete(),
Flux.just(2).onErrorComplete(),
Flux.just(3).onErrorComplete(),
Flux.just(4).onErrorComplete(),
Flux.just(5).onErrorComplete());
}

ImmutableSet<Mono<Integer>> testMonoOnErrorCompleteClass() {
Expand Down