Changed signature of scan from (initial: A, accumulator: (A, A)=>A) to (initial: => A)(accumulator: (A,A) => A)

Removed scanWith as the supplier version can be covered by the signature change of scan above. Furthermore, the scan operator is actually using scanWith operator on reactor-core.

Signed-off-by: Winarto Zhao <[email protected]>

Author: sinwe

src/main/scala/reactor/core/scala/publisher/SFlux.scala

@@ -581,9 +581,9 @@ trait SFlux[T] extends SFluxLike[T, SFlux] with MapablePublisher[T] with ScalaCo
 
   final def scan(accumulator: (T, T) => T): SFlux[T] = coreFlux.scan(accumulator).asScala
 
-  final def scan[A >: T](initial: A, accumulator: (A, A) => A): SFlux[A] = coreFlux.scan(initial, accumulator).asScala
+  final def scan[A >: T](initial: => A)(accumulator: (A, A) => A): SFlux[A] = coreFlux.scanWith(() => initial, accumulator).asScala
 
-  final def scanWith[A >: T](initial: () => A, accumulator: (A, T) => A): SFlux[A] = coreFlux.scanWith(initial, accumulator).asScala
+//  final def scanWith[A >: T](initial: () => A, accumulator: (A, T) => A): SFlux[A] = coreFlux.scanWith(initial, accumulator).asScala
 
   final def single(defaultValue: Option[T] = None): SMono[T] = {
     (defaultValue map { coreFlux.single(_) } getOrElse {coreFlux.single()}).asScala

src/test/scala/reactor/core/scala/publisher/SFluxTest.scala

@@ -1805,25 +1805,27 @@ class SFluxTest extends AnyFreeSpec with Matchers with TableDrivenPropertyChecks
           .verifyComplete()
       }
       "with initial value should scan with provided initial value" in {
-        val flux = SFlux.just(1, 2, 3, 4).scan(2, { (a: Int, b: Int) => a * b })
+        val flux = SFlux.just(1, 2, 3, 4).scan(2){ (a: Int, b: Int) => a * b }
         StepVerifier.create(flux)
           .expectNext(2, 2, 4, 12, 48)
           .verifyComplete()
       }
 
       "with initial value should be able to call scan without the generic type" in {
-        val flux = SFlux.just("item1", "item2").scan("prefix", {(a, b) => a+b})
+        val flux = SFlux.just("item1", "item2").scan("prefix"){(a, b) => a+b}
         StepVerifier.create(flux)
           .expectNext("prefix", "prefixitem1", "prefixitem1item2")
           .verifyComplete()
       }
     }
 
+/*
     ".scanWith should scan with initial value" in {
       StepVerifier.create(SFlux.just(1, 2, 3, 4).scanWith(() => 2, { (a, b) => a * b }))
         .expectNext(2, 2, 4, 12, 48)
         .verifyComplete()
     }
+*/
 
     ".single" - {
       "should return a mono" in {