raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge pull request #15268 from akka/wip-upgrade-stream-dependencies-to-akka-2.3.3-ban

Browse source 
=pro Upgrade akka-stream dependencies to akka 2.3.3
This commit is contained in:
Björn Antonsson 2014-05-23 09:53:20 +02:00
commit 6cd2f7d5d8
4 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-stream/src/main/scala/akka/stream/javadsl/Duct.scala
View file

@ -11,6 +11,8 @@ import org.reactivestreams.api.Consumer
import org.reactivestreams.api.Producer
import akka.japi.Function
import akka.japi.Function2
import akka.japi.Pair
import akka.japi.Predicate
import akka.japi.Procedure
import akka.japi.Util.immutableSeq
import akka.stream.{ FlattenStrategy, FlowMaterializer, Transformer }

16
akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala
View file

@ -12,12 +12,13 @@ import scala.util.Success
import org.reactivestreams.api.Producer
import akka.japi.Function
import akka.japi.Function2
import akka.japi.Pair
import akka.japi.Predicate
import akka.japi.Procedure
import akka.japi.Util.immutableSeq
import akka.stream.{ FlattenStrategy, FlowMaterializer, Transformer }
import akka.stream.scaladsl.{ Flow ⇒ SFlow }
import org.reactivestreams.api.Consumer
import akka.stream.impl.DuctImpl
/**
* Java API
@ -318,19 +319,6 @@ trait OnCompleteCallback {
def onComplete(e: Throwable)
}
/**
* Java API: Represents a tuple of two elements.
*/
case class Pair[A, B](first: A, second: B) // FIXME move this to akka.japi.Pair in akka-actor
/**
* Java API: Defines a criteria and determines whether the parameter meets this criteria.
*/
trait Predicate[T] {
// FIXME move this to akka.japi.Predicate in akka-actor
def test(param: T): Boolean
}
/**
* INTERNAL API
*/

2
akka-stream/src/test/java/akka/stream/javadsl/DuctTest.java
View file

@ -25,6 +25,8 @@ import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.japi.Function;
import akka.japi.Function2;
import akka.japi.Pair;
import akka.japi.Predicate;
import akka.japi.Procedure;
import akka.japi.Util;
import akka.stream.FlowMaterializer;

2
akka-stream/src/test/java/akka/stream/javadsl/FlowTest.java
View file

@ -26,6 +26,8 @@ import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.japi.Function;
import akka.japi.Function2;
import akka.japi.Pair;
import akka.japi.Predicate;
import akka.japi.Procedure;
import akka.japi.Util;
import akka.stream.FlowMaterializer;