From f1f08933da61366e2100798703c7e6b15d35d585 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 6 Oct 2021 09:54:03 +0200 Subject: [PATCH] Polishing. Add since and author tags. Add ticket references to tests. Reformat code. See #2471 --- pom.xml | 1 - .../repository/util/ReactiveWrapperConverters.java | 13 +++++++++---- .../data/repository/util/ReactiveWrappers.java | 3 +++ .../util/ReactiveWrapperConvertersUnitTests.java | 3 ++- .../repository/util/ReactiveWrappersUnitTests.java | 7 ++++--- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 3b4036377..d0ddbb58e 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,6 @@ true - io.smallrye.reactive mutiny diff --git a/src/main/java/org/springframework/data/repository/util/ReactiveWrapperConverters.java b/src/main/java/org/springframework/data/repository/util/ReactiveWrapperConverters.java index d0e449aa3..26053251e 100644 --- a/src/main/java/org/springframework/data/repository/util/ReactiveWrapperConverters.java +++ b/src/main/java/org/springframework/data/repository/util/ReactiveWrapperConverters.java @@ -17,8 +17,6 @@ package org.springframework.data.repository.util; import io.reactivex.Flowable; import io.reactivex.Maybe; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.Uni; import kotlinx.coroutines.flow.Flow; import kotlinx.coroutines.flow.FlowKt; import kotlinx.coroutines.reactive.ReactiveFlowKt; @@ -62,6 +60,7 @@ import org.springframework.util.ClassUtils; * @author Mark Paluch * @author Oliver Gierke * @author Christoph Strobl + * @author Hantsy Bai * @since 2.0 * @see ReactiveWrappers * @see ReactiveAdapterRegistry @@ -536,6 +535,9 @@ public abstract class ReactiveWrapperConverters { /** * Wrapper for SmallRye Mutiny's {@link io.smallrye.mutiny.Uni}. + * + * @author Hantsy Bai + * @since 2.6 */ private enum UniWrapper implements ReactiveTypeWrapper> { @@ -548,12 +550,15 @@ public abstract class ReactiveWrapperConverters { @Override public io.smallrye.mutiny.Uni map(Object wrapper, Function function) { - return ((io.smallrye.mutiny.Uni) wrapper).map(function::apply); + return ((io.smallrye.mutiny.Uni) wrapper).map(function); } } /** * Wrapper for SmallRye Mutiny's {@link io.smallrye.mutiny.Multi}. + * + * @author Hantsy Bai + * @since 2.6 */ private enum MultiWrapper implements ReactiveTypeWrapper> { @@ -566,7 +571,7 @@ public abstract class ReactiveWrapperConverters { @Override public io.smallrye.mutiny.Multi map(Object wrapper, Function function) { - return ((io.smallrye.mutiny.Multi) wrapper).map(function::apply); + return ((io.smallrye.mutiny.Multi) wrapper).map(function); } } diff --git a/src/main/java/org/springframework/data/repository/util/ReactiveWrappers.java b/src/main/java/org/springframework/data/repository/util/ReactiveWrappers.java index f3d793221..fe2929fd5 100644 --- a/src/main/java/org/springframework/data/repository/util/ReactiveWrappers.java +++ b/src/main/java/org/springframework/data/repository/util/ReactiveWrappers.java @@ -44,6 +44,7 @@ import org.springframework.util.ClassUtils; * @author Christoph Strobl * @author Oliver Gierke * @author Gerrit Meier + * @author Hantsy Bai * @since 2.0 * @see org.reactivestreams.Publisher * @see rx.Single @@ -59,6 +60,8 @@ import org.springframework.util.ClassUtils; * @see io.reactivex.rxjava3.core.Observable * @see io.reactivex.rxjava3.core.Completable * @see io.reactivex.rxjava3.core.Flowable + * @see io.smallrye.mutiny.Multi + * @see io.smallrye.mutiny.Uni * @see Mono * @see Flux */ diff --git a/src/test/java/org/springframework/data/repository/util/ReactiveWrapperConvertersUnitTests.java b/src/test/java/org/springframework/data/repository/util/ReactiveWrapperConvertersUnitTests.java index 6b8f29915..85a4998a5 100644 --- a/src/test/java/org/springframework/data/repository/util/ReactiveWrapperConvertersUnitTests.java +++ b/src/test/java/org/springframework/data/repository/util/ReactiveWrapperConvertersUnitTests.java @@ -37,6 +37,7 @@ import org.reactivestreams.Publisher; * Unit tests for {@link ReactiveWrapperConverters}. * * @author Mark Paluch + * @author Hantsy Bai */ class ReactiveWrapperConvertersUnitTests { @@ -84,7 +85,7 @@ class ReactiveWrapperConvertersUnitTests { assertThat(ReactiveWrapperConverters.supports(io.reactivex.rxjava3.core.Completable.class)).isTrue(); } - @Test + @Test // GH-2471 void shouldSupportMutinyTypes() { assertThat(ReactiveWrapperConverters.supports(Uni.class)).isTrue(); diff --git a/src/test/java/org/springframework/data/repository/util/ReactiveWrappersUnitTests.java b/src/test/java/org/springframework/data/repository/util/ReactiveWrappersUnitTests.java index 9ec9471eb..8c2d67eb6 100644 --- a/src/test/java/org/springframework/data/repository/util/ReactiveWrappersUnitTests.java +++ b/src/test/java/org/springframework/data/repository/util/ReactiveWrappersUnitTests.java @@ -34,10 +34,11 @@ import org.reactivestreams.Publisher; * * @author Mark Paluch * @author Gerrit Meier + * @author Hantsy Bai */ class ReactiveWrappersUnitTests { - @Test // DATACMNS-836, DATACMNS-1653, DATACMNS-1753 + @Test // DATACMNS-836, DATACMNS-1653, DATACMNS-1753, GH-2471 void isSingleLikeShouldReportCorrectNoTypes() { assertThat(ReactiveWrappers.isNoValueType(Mono.class)).isFalse(); @@ -59,7 +60,7 @@ class ReactiveWrappersUnitTests { assertThat(ReactiveWrappers.isNoValueType(io.smallrye.mutiny.Multi.class)).isFalse(); } - @Test // DATACMNS-836, DATACMNS-1653, DATACMNS-1753 + @Test // DATACMNS-836, DATACMNS-1653, DATACMNS-1753, GH-2471 void isSingleLikeShouldReportCorrectSingleTypes() { assertThat(ReactiveWrappers.isSingleValueType(Mono.class)).isTrue(); @@ -83,7 +84,7 @@ class ReactiveWrappersUnitTests { assertThat(ReactiveWrappers.isSingleValueType(io.smallrye.mutiny.Multi.class)).isFalse(); } - @Test // DATACMNS-836, DATACMNS-1653, DATACMNS-1753 + @Test // DATACMNS-836, DATACMNS-1653, DATACMNS-1753, GH-2471 void isCollectionLikeShouldReportCorrectCollectionTypes() { assertThat(ReactiveWrappers.isMultiValueType(Mono.class)).isFalse();