Mono Kotlin extensions and functions fixes #1475

sdeleuze · 2018-12-24T11:08:09Z

Polishing
Better consistency in term of file naming and functions dispatching
Make whenComplete alias working on Publisher<*> not just Publisher<Void>

This commit renames MonoWhenFunctions to MonoFunctions since it also contains a zip function. This should not break compatibility since imports are using only package and function name. It also removes some inconsistent and duplicated tests.

The Kotlin extension and function need to be consistent with their Java counterparts and should be usable on Publisher<*> not just Publisher<Void>.

codecov-io · 2018-12-24T11:22:40Z

Codecov Report

Merging #1475 into master will decrease coverage by 0.05%.
The diff coverage is 100%.

@@             Coverage Diff              @@
##             master    #1475      +/-   ##
============================================
- Coverage     84.16%   84.11%   -0.06%     
+ Complexity     3907     3896      -11     
============================================
  Files           359      359              
  Lines         29760    29790      +30     
  Branches       5527     5522       -5     
============================================
+ Hits          25048    25057       +9     
- Misses         3083     3096      +13     
- Partials       1629     1637       +8

Impacted Files	Coverage Δ	Complexity Δ
.../main/java/reactor/core/publisher/MonoBridges.java	`66.66% <ø> (ø)`	`2 <0> (ø)`	⬇️
...in/kotlin/reactor/core/publisher/FluxExtensions.kt	`88.46% <100%> (ø)`	`0 <0> (ø)`	⬇️
...in/kotlin/reactor/core/publisher/MonoExtensions.kt	`84.61% <100%> (+1.28%)`	`0 <0> (ø)`	⬇️
...ain/kotlin/reactor/core/publisher/MonoFunctions.kt	`66.66% <100%> (ø)`	`0 <0> (?)`
...e/src/main/java/reactor/core/publisher/Traces.java	`66.66% <0%> (-18.85%)`	`25% <0%> (-15%)`
...reactor/core/publisher/ParallelFluxOnAssembly.java	`69.23% <0%> (-8.55%)`	`10% <0%> (-3%)`
...in/java/reactor/core/publisher/MonoOnAssembly.java	`92.3% <0%> (-2.14%)`	`7% <0%> (-2%)`
...in/java/reactor/core/publisher/FluxWindowWhen.java	`80.28% <0%> (-1.45%)`	`2% <0%> (ø)`
...c/main/java/reactor/core/publisher/RingBuffer.java	`70.56% <0%> (-0.95%)`	`24% <0%> (ø)`
...main/java/reactor/core/publisher/FluxGenerate.java	`69.32% <0%> (-0.62%)`	`7% <0%> (ø)`
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 510a0fa...523fb48. Read the comment docs.

reactor-core/src/test/kotlin/reactor/core/publisher/MonoFunctionsTests.kt

reactor-core/src/test/kotlin/reactor/core/publisher/MonoExtensionsTests.kt

reactor-core/src/main/kotlin/reactor/core/publisher/MonoFunctions.kt

sdeleuze · 2018-12-25T11:36:09Z

@bsideup I think I have taken in account all your remarks.

sdeleuze · 2018-12-25T14:12:02Z

I have made other changes to preserve backward compatibility with @file:JvmName("MonoWhenFunctionsKt") + moving back extensions where they were. We can't deprecate and put them in the right place because there is a clash in signature, so I suggest doing that for now and fixing the TODO I put in the comments in Reactor Core 3.3.

bsideup · 2018-12-27T14:12:32Z

reactor-core/src/test/kotlin/reactor/core/publisher/FluxExtensionsTests.kt

@@ -162,7 +162,7 @@ class FluxExtensionsTests {
        StepVerifier
                .create(IOException()
                        .toFlux<String>()
-                        .onErrorResume(IOException::class, { "foo".toMono() }))
+                        .onErrorResume(IOException::class) { "foo".toMono() })


could you please improve the readability of this one as well? (as you did here)

(I did the update)

sdeleuze added 3 commits December 24, 2018 11:02

Polishing

272a97f

Fix Mono function/extension split

b9d8b2c

This commit renames MonoWhenFunctions to MonoFunctions since it also contains a zip function. This should not break compatibility since imports are using only package and function name. It also removes some inconsistent and duplicated tests.

Fix whenComplete to be usable on Publisher<*>

1acf32a

The Kotlin extension and function need to be consistent with their Java counterparts and should be usable on Publisher<*> not just Publisher<Void>.