Skip to content
This repository was archived by the owner on Mar 2, 2022. It is now read-only.

Commit ef91b02

Browse files
committed
Update some documentation
Renamed ParallelFlux => SParallelFlux Added SParallelFlux.asJava
1 parent 4918fcd commit ef91b02

File tree

4 files changed

+29
-17
lines changed

4 files changed

+29
-17
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2393,9 +2393,9 @@ class Flux[T] private[publisher](private[publisher] val jFlux: JFlux[T])
23932393
* <p>
23942394
* <img class="marble" src="https://raw.githubusercontent.com/reactor/reactor-core/v3.0.5.RELEASE/src/docs/marble/parallel.png" alt="">
23952395
*
2396-
* @return a new [[ParallelFlux]] instance
2396+
* @return a new [[SParallelFlux]] instance
23972397
*/
2398-
final def parallel() = ParallelFlux(jFlux.parallel())
2398+
final def parallel() = SParallelFlux(jFlux.parallel())
23992399

24002400
/**
24012401
* Prepare to consume this [[Flux]] on parallelism number of 'rails'
@@ -2405,9 +2405,9 @@ class Flux[T] private[publisher](private[publisher] val jFlux: JFlux[T])
24052405
* <img class="marble" src="https://raw.githubusercontent.com/reactor/reactor-core/v3.0.5.RELEASE/src/docs/marble/parallel.png" alt="">
24062406
*
24072407
* @param parallelism the number of parallel rails
2408-
* @return a new [[ParallelFlux]] instance
2408+
* @return a new [[SParallelFlux]] instance
24092409
*/
2410-
final def parallel(parallelism: Int): ParallelFlux[T] = ParallelFlux(jFlux.parallel(parallelism))
2410+
final def parallel(parallelism: Int): SParallelFlux[T] = SParallelFlux(jFlux.parallel(parallelism))
24112411

24122412
/**
24132413
* Prepare to consume this [[Flux]] on parallelism number of 'rails'
@@ -2419,9 +2419,9 @@ class Flux[T] private[publisher](private[publisher] val jFlux: JFlux[T])
24192419
*
24202420
* @param parallelism the number of parallel rails
24212421
* @param prefetch the number of values to prefetch from the source
2422-
* @return a new [[ParallelFlux]] instance
2422+
* @return a new [[SParallelFlux]] instance
24232423
*/
2424-
final def parallel(parallelism: Int, prefetch: Int) = ParallelFlux(jFlux.parallel(parallelism, prefetch))
2424+
final def parallel(parallelism: Int, prefetch: Int) = SParallelFlux(jFlux.parallel(parallelism, prefetch))
24252425

24262426
/**
24272427
* Prepare a [[ConnectableFlux]] which shares this [[Flux]] sequence and dispatches values to

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

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package reactor.core.scala.publisher
2+
3+
import reactor.core.publisher.{ParallelFlux => JParallelFlux}
4+
5+
class SParallelFlux[T]private(private val jParallelFlux: JParallelFlux[T]) {
6+
def asJava: JParallelFlux[T] = jParallelFlux
7+
}
8+
9+
object SParallelFlux {
10+
def apply[T](jParallelFlux: JParallelFlux[T]) = new SParallelFlux[T](jParallelFlux)
11+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package reactor.core.scala.publisher
2+
3+
import org.scalatest.{FreeSpec, Matchers}
4+
import reactor.core.publisher.{Flux => JFlux, ParallelFlux => JParallelFlux}
5+
6+
class SParallelFluxTest extends FreeSpec with Matchers {
7+
"SParallelFlux" - {
8+
".asJava should convert as Java ParallelFlux" in {
9+
SParallelFlux(JFlux.just(1, 2, 3).parallel()).asJava shouldBe a[JParallelFlux[Int]]
10+
}
11+
}
12+
}

0 commit comments

Comments
 (0)