Skip to content

Commit f1f0893

Browse files
committed
Polishing.
Add since and author tags. Add ticket references to tests. Reformat code. See #2471
1 parent d182757 commit f1f0893

File tree

5 files changed

+18
-9
lines changed

5 files changed

+18
-9
lines changed

pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@
148148
<optional>true</optional>
149149
</dependency>
150150

151-
<!-- SmallRye Mutiny, see:https://smallrye.io/smallrye-mutiny/ -->
152151
<dependency>
153152
<groupId>io.smallrye.reactive</groupId>
154153
<artifactId>mutiny</artifactId>

src/main/java/org/springframework/data/repository/util/ReactiveWrapperConverters.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
import io.reactivex.Flowable;
1919
import io.reactivex.Maybe;
20-
import io.smallrye.mutiny.Multi;
21-
import io.smallrye.mutiny.Uni;
2220
import kotlinx.coroutines.flow.Flow;
2321
import kotlinx.coroutines.flow.FlowKt;
2422
import kotlinx.coroutines.reactive.ReactiveFlowKt;
@@ -62,6 +60,7 @@
6260
* @author Mark Paluch
6361
* @author Oliver Gierke
6462
* @author Christoph Strobl
63+
* @author Hantsy Bai
6564
* @since 2.0
6665
* @see ReactiveWrappers
6766
* @see ReactiveAdapterRegistry
@@ -536,6 +535,9 @@ public io.reactivex.rxjava3.core.Flowable<?> map(Object wrapper, Function<Object
536535

537536
/**
538537
* Wrapper for SmallRye Mutiny's {@link io.smallrye.mutiny.Uni}.
538+
*
539+
* @author Hantsy Bai
540+
* @since 2.6
539541
*/
540542
private enum UniWrapper implements ReactiveTypeWrapper<io.smallrye.mutiny.Uni<?>> {
541543

@@ -548,12 +550,15 @@ public Class<? super io.smallrye.mutiny.Uni<?>> getWrapperClass() {
548550

549551
@Override
550552
public io.smallrye.mutiny.Uni<?> map(Object wrapper, Function<Object, Object> function) {
551-
return ((io.smallrye.mutiny.Uni<?>) wrapper).map(function::apply);
553+
return ((io.smallrye.mutiny.Uni<?>) wrapper).map(function);
552554
}
553555
}
554556

555557
/**
556558
* Wrapper for SmallRye Mutiny's {@link io.smallrye.mutiny.Multi}.
559+
*
560+
* @author Hantsy Bai
561+
* @since 2.6
557562
*/
558563
private enum MultiWrapper implements ReactiveTypeWrapper<io.smallrye.mutiny.Multi<?>> {
559564

@@ -566,7 +571,7 @@ public Class<? super io.smallrye.mutiny.Multi<?>> getWrapperClass() {
566571

567572
@Override
568573
public io.smallrye.mutiny.Multi<?> map(Object wrapper, Function<Object, Object> function) {
569-
return ((io.smallrye.mutiny.Multi<?>) wrapper).map(function::apply);
574+
return ((io.smallrye.mutiny.Multi<?>) wrapper).map(function);
570575
}
571576
}
572577

src/main/java/org/springframework/data/repository/util/ReactiveWrappers.java

+3
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
* @author Christoph Strobl
4545
* @author Oliver Gierke
4646
* @author Gerrit Meier
47+
* @author Hantsy Bai
4748
* @since 2.0
4849
* @see org.reactivestreams.Publisher
4950
* @see rx.Single
@@ -59,6 +60,8 @@
5960
* @see io.reactivex.rxjava3.core.Observable
6061
* @see io.reactivex.rxjava3.core.Completable
6162
* @see io.reactivex.rxjava3.core.Flowable
63+
* @see io.smallrye.mutiny.Multi
64+
* @see io.smallrye.mutiny.Uni
6265
* @see Mono
6366
* @see Flux
6467
*/

src/test/java/org/springframework/data/repository/util/ReactiveWrapperConvertersUnitTests.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
* Unit tests for {@link ReactiveWrapperConverters}.
3838
*
3939
* @author Mark Paluch
40+
* @author Hantsy Bai
4041
*/
4142
class ReactiveWrapperConvertersUnitTests {
4243

@@ -84,7 +85,7 @@ void shouldSupportKotlinFlow() {
8485
assertThat(ReactiveWrapperConverters.supports(io.reactivex.rxjava3.core.Completable.class)).isTrue();
8586
}
8687

87-
@Test
88+
@Test // GH-2471
8889
void shouldSupportMutinyTypes() {
8990

9091
assertThat(ReactiveWrapperConverters.supports(Uni.class)).isTrue();

src/test/java/org/springframework/data/repository/util/ReactiveWrappersUnitTests.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@
3434
*
3535
* @author Mark Paluch
3636
* @author Gerrit Meier
37+
* @author Hantsy Bai
3738
*/
3839
class ReactiveWrappersUnitTests {
3940

40-
@Test // DATACMNS-836, DATACMNS-1653, DATACMNS-1753
41+
@Test // DATACMNS-836, DATACMNS-1653, DATACMNS-1753, GH-2471
4142
void isSingleLikeShouldReportCorrectNoTypes() {
4243

4344
assertThat(ReactiveWrappers.isNoValueType(Mono.class)).isFalse();
@@ -59,7 +60,7 @@ void isSingleLikeShouldReportCorrectNoTypes() {
5960
assertThat(ReactiveWrappers.isNoValueType(io.smallrye.mutiny.Multi.class)).isFalse();
6061
}
6162

62-
@Test // DATACMNS-836, DATACMNS-1653, DATACMNS-1753
63+
@Test // DATACMNS-836, DATACMNS-1653, DATACMNS-1753, GH-2471
6364
void isSingleLikeShouldReportCorrectSingleTypes() {
6465

6566
assertThat(ReactiveWrappers.isSingleValueType(Mono.class)).isTrue();
@@ -83,7 +84,7 @@ void isSingleLikeShouldReportCorrectSingleTypes() {
8384
assertThat(ReactiveWrappers.isSingleValueType(io.smallrye.mutiny.Multi.class)).isFalse();
8485
}
8586

86-
@Test // DATACMNS-836, DATACMNS-1653, DATACMNS-1753
87+
@Test // DATACMNS-836, DATACMNS-1653, DATACMNS-1753, GH-2471
8788
void isCollectionLikeShouldReportCorrectCollectionTypes() {
8889

8990
assertThat(ReactiveWrappers.isMultiValueType(Mono.class)).isFalse();

0 commit comments

Comments
 (0)