From 05b6aa03dfd14ed37d109c18b796dc4854ee168f Mon Sep 17 00:00:00 2001 From: Rick Ossendrijver Date: Thu, 9 Dec 2021 13:34:39 +0100 Subject: [PATCH] Add Flowable#blockingIterable Refaster template --- .../RxJavaFlowableToReactorTemplates.java | 13 +++++++++++++ .../RxJavaFlowableToReactorTemplatesTestInput.java | 4 ++++ .../RxJavaFlowableToReactorTemplatesTestOutput.java | 4 ++++ 3 files changed, 21 insertions(+) diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/RxJavaFlowableToReactorTemplates.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/RxJavaFlowableToReactorTemplates.java index cdeaf884..f7c13a8e 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/RxJavaFlowableToReactorTemplates.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/RxJavaFlowableToReactorTemplates.java @@ -489,6 +489,19 @@ final class RxJavaFlowableToReactorTemplates { // XXX: final Object blockingFirst(Object) // XXX: final void blockingForEach(Consumer) // XXX: final Iterable blockingIterable() + + static final class FlowableBlockingIterable { + @BeforeTemplate + Iterable before(Flowable flowable) { + return flowable.blockingIterable(); + } + + @AfterTemplate + Iterable after(Flowable flowable) { + return RxJava2Adapter.flowableToFlux(flowable).toIterable(); + } + } + // XXX: final Iterable blockingIterable(int) // XXX: final Object blockingLast() // XXX: final Object blockingLast(Object) diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/RxJavaFlowableToReactorTemplatesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/RxJavaFlowableToReactorTemplatesTestInput.java index 6f5fa653..a12ebab4 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/RxJavaFlowableToReactorTemplatesTestInput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/RxJavaFlowableToReactorTemplatesTestInput.java @@ -155,6 +155,10 @@ final class RxJavaFlowableToReactorTemplatesTest implements RefasterTemplateTest return Flowable.just(1).blockingFirst(); } + Iterable testFlowableBlockingIterable() { + return Flowable.just(1).blockingIterable(); + } + Flowable testFlowableConcatMap() { return Flowable.just(1).concatMap(e -> Flowable::just); } diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/RxJavaFlowableToReactorTemplatesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/RxJavaFlowableToReactorTemplatesTestOutput.java index 85d403bc..4b94644d 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/RxJavaFlowableToReactorTemplatesTestOutput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/RxJavaFlowableToReactorTemplatesTestOutput.java @@ -190,6 +190,10 @@ final class RxJavaFlowableToReactorTemplatesTest implements RefasterTemplateTest return RxJava2Adapter.flowableToFlux(Flowable.just(1)).blockFirst(); } + Iterable testFlowableBlockingIterable() { + return RxJava2Adapter.flowableToFlux(Flowable.just(1)).toIterable(); + } + Flowable testFlowableConcatMap() { return RxJava2Adapter.fluxToFlowable( RxJava2Adapter.flowableToFlux(Flowable.just(1))