Merge pull request #29 from reactor/sreactor

Sreactor

Author: sinwe

.travis.yml

@@ -1,14 +1,14 @@
 language: java
-jdk: oraclejdk8
-addons:
-  apt:
-    packages:
-      - oracle-java8-installer
+jdk: openjdk8
+#addons:
+#  apt:
+#    packages:
+#      - oracle-java8-installer
 env:
   global:
   - secure: fIwS3wctOKMs+yEE8s4lvtcwJEgktzHCliK+D7ShJ8Lia98JWCc/JhGMlCtX3RFkQjIy0syIJKw2eQglxNqqFqoO7EsQhipgf9An+hVVbw/Tn7t1xIslSw9EzFUTRA/wP00JLKunUizR6YxuLmq9VbxzJdK+kr5v1g3ggq311sKE8bpWWqTvixKkhQg2ULyqHZ3cPcMnxAmLG8jiddgnN7PcDL0MOePiSQeNawwFNoI7rp6rZRfREHyrHrwIo7USfPP8R8Mk0z9b08MxW0ZG4P04M0jWZRobqXMYz/PW2GALn0UQPDjg+8OI4qtmmunPYR0mwkgRumpem8LhIjHoOXZu/Oq8OqU+76x/gcEU25nkz3EH59si/kGOxObJUFUil6pt4QjA/QSI7dzC+yQIabOfJEOH8D3q9Eb6JBRWIf26pj02b2IbWmPFEooxQXL7XNQ/eYmnrw0UhOQvBPJ+YntQmpHlJKNwPD5lIOrqvLWoUWYe5oB83o2G2CyybzuPBrioUxr4XcGFiq4W5X3rjCQpNHTPS1QOPLukisYMdXQPkcTsvcrEUHvA2bH6a2gmvG7ykR9iHqPrpARqxt1qO84RbgK/pJhNcayZKRDrNjxHxiaQJXT5xlIjld1uxAM7kRUunuWNm57gi170LveMFK668PVcUAQTrD09eosrbKQ=
   - secure: MlwQtz4tO1mmNmPE2PIxYI552puyQpQa690C6ZOldvL0zGhw5mgj5JD8G4I4RmuaNev7mpdnBecoTEg6q2pxPTHQEgQmHVX5X7SPf1Loyes35AWzscGhWVwFdOF6ZqccB8PUZrUZ2CAD83JjG39/PGk5bxqwBNFkeFBQrGYhDuL5caqJ9/MTfKHM/NoR66ygigscnsfb8qwtS1wpSJ5LbFrC2KFzGfDXuP5bjkz9PZdQrS8c7nC63KcdeENpqwdrWWzrw3hf0uSh3xEZp7SziDZ0wMOX6lmIIzRjmlJIPF4BD9MsDiPqhmwJk4MdvKtWAzKJTnGxmygNLVw7YKnqULnWjsOmNfraHGEkqSE/DCccsjAIzYP0vD7V+JgXOk5JLvwLGff3VW9457f2pAMWJgliL9r136DKLMvxiMpXgFp3BkZHsc80Ve1G9nqgGMqp1zrCgE78mqQJ5AFQczfTZOXNsjLkGYgs38k7aLiCAm8p9ZHYBo4DZiaPKc/K2XkBmTP+2KuHpwXGUbnvfFFoHuwV1iDh+CeEo1N4UZrhwPCXTNaJKYQCQ8d7u2Vvt27Ido+IfvSnKvBlHMkpmzAdyF5dhT3jR0xEartpMw8MmUnKVxanJitfLME1qInf7INhFkkRECj9yFpFA1kCM+dszxdEEaBmD0D004xd0rU4Y3c=
 script:
-- "./gradlew buildAll uploadArchivesAll testScoverage reportScoverage --no-daemon --stacktrace --no-build-cache"
+- "./gradlew buildAll uploadArchivesAll testScoverage reportScoverage --no-daemon --stacktrace --build-cache"
 after_success:
 - bash <(curl -s https://codecov.io/bash)

README.md

@@ -1,7 +1,7 @@
 # Reactor Scala Extensions
 [![Join the chat at https://gitter.im/reactor/reactor](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/reactor/reactor?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Reactor Scala Extensions](https://maven-badges.herokuapp.com/maven-central/io.projectreactor/reactor-scala-extensions_2.12/badge.svg?style=plastic)](https://mvnrepository.com/artifact/io.projectreactor/reactor-scala-extensions_2.12)
-[ ![Download](https://api.bintray.com/packages/sinwe/io.projectreactor/reactor-scala-extensions_2.12/images/download.svg) ](https://bintray.com/sinwe/io.projectreactor/reactor-scala-extensions_2.12/_latestVersion)
+[![Download](https://api.bintray.com/packages/sinwe/io.projectreactor/reactor-scala-extensions_2.12/images/download.svg) ](https://bintray.com/sinwe/io.projectreactor/reactor-scala-extensions_2.12/_latestVersion)
 [![Build Status](https://travis-ci.org/reactor/reactor-scala-extensions.svg?branch=master)](https://travis-ci.org/reactor/reactor-scala-extensions)
 [![codecov](https://codecov.io/gh/reactor/reactor-scala-extensions/branch/master/graph/badge.svg)](https://codecov.io/gh/reactor/reactor-scala-extensions)
 
@@ -34,10 +34,17 @@ With Gradle:
     }
 
     dependencies {
+<<<<<<< HEAD
+        //compile "io.projectreactor:reactor-scala-extensions_2.12:0.4.0-SNAPSHOT
+        //compile "io.projectreactor:reactor-scala-extensions_2.13.0-M3:0.3.5 //for scala 2.13.0-M3
+        compile "io.projectreactor:reactor-scala-extensions_2.12:0.3.5 //for scala 2.12
+        //compile "io.projectreactor:reactor-scala-extensions_2.11:0.3.5 //for scala 2.11
+=======
         //compile "io.projectreactor:reactor-scala-extensions_2.12:0.4.1-SNAPSHOT
         //compile "io.projectreactor:reactor-scala-extensions_2.13.0-M3:0.4.0 //for scala 2.13.0-M3
         compile "io.projectreactor:reactor-scala-extensions_2.12:0.4.0 //for scala 2.12
         //compile "io.projectreactor:reactor-scala-extensions_2.11:0.4.0 //for scala 2.11
+>>>>>>> master
     }
 
 With Maven:
@@ -58,7 +65,11 @@ With Maven:
     <dependency>
         <groupId>io.projectreactor</groupId>
         <artifactId>reactor-scala-extensions</artifactId>
+<<<<<<< HEAD
+        <version>0.4.0-SNAPSHOT</version>
+=======
         <version>0.4.1-SNAPSHOT</version>
+>>>>>>> master
     </dependency>
     -->
     <dependency>

build.gradle

@@ -45,7 +45,7 @@ buildscript {
 
     dependencies {
         classpath "gradle.plugin.com.github.maiflai:gradle-scalatest:0.22"
-        classpath "gradle.plugin.org.scoverage:gradle-scoverage:2.3.0"
+        classpath "gradle.plugin.org.scoverage:gradle-scoverage:2.5.0"
         classpath 'net.researchgate:gradle-release:2.7.0'
         classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.11.0'
         classpath 'org.owasp:dependency-check-gradle:3.3.1'
@@ -61,7 +61,7 @@ targetCompatibility = "1.8"
 
 if (!project.parent) {
     apply plugin: 'net.researchgate.release'
-    final svs = ['2.12.6', '2.11.12', '2.13.0-M3']
+    final svs = ['2.12.7', '2.11.12', '2.13.0-M3']
 
     for (sv in svs) {
         String scalaVersionInDot = sv.replaceAll("_", ".")
@@ -203,7 +203,7 @@ ScalaCompileOptions.metaClass.useAnt = false
 ScalaCompileOptions.metaClass.useCompileDaemon = false
 
 project.tasks.scaladoc.scalaDocOptions.additionalParameters = ["-no-link-warnings"]
-project.tasks.compileScala.scalaCompileOptions.additionalParameters = ["-target:jvm-1.8"]
+project.tasks.compileScala.scalaCompileOptions.additionalParameters = ["-target:jvm-1.8", "-feature"]
 project.tasks.compileTestScala.scalaCompileOptions.additionalParameters = ["-target:jvm-1.8"]
 
 release {

gradle.properties

@@ -1 +1,2 @@
-version=0.3.8-SNAPSHOT
+version=0.4.1-SNAPSHOT
+org.gradle.jvmargs=-XX\:MaxHeapSize\=2g -Xmx2g

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

gradlew.bat

@@ -27,12 +27,10 @@ trait Scannable {
   def name: String = jScannable.name()
 
   /**
-    * Check this [[Scannable]] and its [[Scannable.parents()]] for a name an return the
-    * first one that is reachable.
-    *
-    * @return the name of the first parent that has one defined (including this scannable)
+    * Return a meaningful [[String]] representation of this [[Scannable]] in
+    * its chain of [[Scannable.parents]] and [[Scannable.actuals]].
     */
-  def operatorName: String = jScannable.operatorName()
+  def stepName: String = jScannable.stepName()
 
   /**
     * Return a [[Stream]] navigating the [[org.reactivestreams.Subscription]]

src/main/scala/reactor/core/scala/Scannable.scala

@@ -3,17 +3,16 @@ package reactor.core.scala.publisher
 import java.lang.{Boolean => JBoolean, Iterable => JIterable, Long => JLong}
 import java.util
 import java.util.concurrent.{Callable, TimeUnit}
-import java.util.function.{BiFunction, Consumer, Function, Predicate, Supplier}
+import java.util.function.{BiFunction, Consumer, Function, Supplier}
 import java.util.logging.Level
 import java.util.{Comparator, stream, List => JList}
 
 import org.reactivestreams.{Publisher, Subscriber, Subscription}
-import reactor.core
-import reactor.core.{Disposable, Scannable => JScannable}
 import reactor.core.publisher.FluxSink.OverflowStrategy
 import reactor.core.publisher.{BufferOverflowStrategy, FluxSink, Signal, SignalType, SynchronousSink, Flux => JFlux, GroupedFlux => JGroupedFlux}
 import reactor.core.scala.Scannable
 import reactor.core.scheduler.{Scheduler, Schedulers}
+import reactor.core.{Disposable, Scannable => JScannable}
 import reactor.util.Logger
 import reactor.util.context.Context
 import reactor.util.function.Tuple2
@@ -43,7 +42,9 @@ import scala.concurrent.duration.Duration
   *
   * @tparam T the element type of this Reactive Streams [[Publisher]]
   * @see [[Mono]]
+  * @deprecated Use [[SFlux]]
   */
+@deprecated(message = "This class is deprecated. Use SFlux", since = "0.4.0")
 class Flux[T] private[publisher](private[publisher] val jFlux: JFlux[T])
   extends Publisher[T] with MapablePublisher[T] with OnErrorReturn[T] with FluxLike[T] with Filter [T] with Scannable {
 
@@ -1950,7 +1951,7 @@ class Flux[T] private[publisher](private[publisher] val jFlux: JFlux[T])
     * @return a new unaltered [[Flux]]
     */
   //  TODO: How to test?
-  final def log() = Flux(jFlux.log())
+  final def log(): Flux[T] = Flux.from(new ReactiveSFlux[T](jFlux).log())
 
   /**
     * Observe all Reactive Streams signals and use [[Logger]] support to handle trace implementation. Default will
@@ -3310,7 +3311,7 @@ class Flux[T] private[publisher](private[publisher] val jFlux: JFlux[T])
     * @param alternate the alternate publisher if this sequence is empty
     * @return an alternating [[Flux]] on source onComplete without elements
     */
-  final def switchIfEmpty(alternate: Publisher[_ <: T]) = Flux(jFlux.switchIfEmpty(alternate))
+  final def switchIfEmpty(alternate: Publisher[_ <: T]): Flux[T] = Flux.from(new ReactiveSFlux[T](jFlux).switchIfEmpty(alternate))
 
   /**
     * Switch to a new [[Publisher]] generated via a `Function` whenever this [[Flux]] produces an item.