jlengrand/error-prone-support
1
0
Fork 0
mirror of https://github.com/jlengrand/error-prone-support.git synced 2026-03-10 08:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add minor improvements and cleanup

Browse Source
This commit is contained in:
Rick Ossendrijver
2021-10-01 15:22:55 +02:00
parent cdefaf1b36
commit a5ac555a04
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/RxJavaFlowableToReactorTemplates.java
View File

@@ -681,7 +681,7 @@ final class RxJavaFlowableToReactorTemplates {
@AfterTemplate
Single<T> after(Flowable<T> flowable) {
return RxJava2Adapter.monoToSingle(RxJava2Adapter.flowableToFlux(flowable).next());
return RxJava2Adapter.monoToSingle(RxJava2Adapter.flowableToFlux(flowable).next().single());
}
}

9
error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/RxJavaSingleToReactorTemplates.java
View File

@@ -280,7 +280,7 @@ final class RxJavaSingleToReactorTemplates {
}
}
// XXX: Test this one.
// XXX: Write a test.
abstract static class SingleFlatMapUnwrapLambda<T, R> {
@Placeholder
abstract Mono<? extends R> placeholder(@MayOptionallyUse T input);
@@ -530,7 +530,12 @@ final class RxJavaSingleToReactorTemplates {
e ->
RxJava2Adapter.singleToMono(
Single.wrap(
RxJavaReactorMigrationUtil.toJdkFunction(function).apply(e)))));
RxJavaReactorMigrationUtil.toJdkFunction(
(Function<
? super Throwable,
? extends SingleSource<? extends T>>)
function)
.apply(e)))));
}
}

11
error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/RxJavaToReactorTemplates.java
View File

@@ -207,17 +207,17 @@ public final class RxJavaToReactorTemplates {
@SuppressWarnings("NoFunctionalReturnType")
static final class UnnecessaryConsumerConversion<T> {
@BeforeTemplate
java.util.function.Consumer<T> before(@CanTransformToTargetType Consumer<T> consumer) {
java.util.function.Consumer<? extends T> before(@CanTransformToTargetType Consumer<? extends T> consumer) {
return RxJavaReactorMigrationUtil.toJdkConsumer(consumer);
}
@AfterTemplate
java.util.function.Consumer<T> after(java.util.function.Consumer<T> consumer) {
java.util.function.Consumer<? extends T> after(java.util.function.Consumer<? extends T> consumer) {
return consumer;
}
}
static final class UnnecessaryRunnableConversion<T> {
static final class UnnecessaryRunnableConversion {
@BeforeTemplate
Runnable before(@CanTransformToTargetType Action action) {
return RxJavaReactorMigrationUtil.toRunnable(action);
@@ -229,16 +229,15 @@ public final class RxJavaToReactorTemplates {
}
}
// XXX: This one is without CanBeTransformedTo...
@SuppressWarnings("NoFunctionalReturnType")
static final class UnnecessaryPredicateConversion<T> {
@BeforeTemplate
java.util.function.Predicate<T> before(Predicate<T> predicate) {
java.util.function.Predicate<? extends T> before(@CanTransformToTargetType Predicate<? extends T> predicate) {
return RxJavaReactorMigrationUtil.toJdkPredicate(predicate);
}
@AfterTemplate
java.util.function.Predicate<T> after(java.util.function.Predicate<T> predicate) {
java.util.function.Predicate<? extends T> after(java.util.function.Predicate<? extends T> predicate) {
return predicate;
}
}

2
error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/RxJavaFlowableToReactorTemplatesTestOutput.java
View File

@@ -96,7 +96,7 @@ final class RxJavaFlowableToReactorTemplatesTest implements RefasterTemplateTest
}
Single<Integer> testFlowableFirstOrError() {
return RxJava2Adapter.monoToSingle(RxJava2Adapter.flowableToFlux(Flowable.just(1)).next());
return RxJava2Adapter.monoToSingle(RxJava2Adapter.flowableToFlux(Flowable.just(1)).next().single());
}
Completable testFlowableFlatMapCompletable() {