From 4f55b0d2e13c3b70d8bdc4a43e2dbd1e5bdddb51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Antonsson?= <ban@rhsh.net>
Date: Thu, 22 May 2014 13:53:08 +0200
Subject: [PATCH] =pro Upgrade akka-stream dependencies to akka 2.3.3

* Upgrade dependency to akka 2.3.3
* Remove javadsl.Pair and javadsl.Predicate in favor of akka.japi.*
---
 .../main/scala/akka/stream/javadsl/Duct.scala    |  2 ++
 .../main/scala/akka/stream/javadsl/Flow.scala    | 16 ++--------------
 .../test/java/akka/stream/javadsl/DuctTest.java  |  2 ++
 .../test/java/akka/stream/javadsl/FlowTest.java  |  2 ++
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Duct.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Duct.scala
index 1cf9c500b3..d3eaf63cd6 100644
--- a/akka-stream/src/main/scala/akka/stream/javadsl/Duct.scala
+++ b/akka-stream/src/main/scala/akka/stream/javadsl/Duct.scala
@@ -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.FlowMaterializer
diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala
index b7b8d8a87f..d9e91039ad 100644
--- a/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala
+++ b/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala
@@ -12,13 +12,14 @@ 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.FlowMaterializer
 import akka.stream.scaladsl.{ Flow ⇒ SFlow }
 import akka.stream.Transformer
 import org.reactivestreams.api.Consumer
-import akka.stream.impl.DuctImpl
 
 /**
  * Java API
@@ -306,19 +307,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
  */
diff --git a/akka-stream/src/test/java/akka/stream/javadsl/DuctTest.java b/akka-stream/src/test/java/akka/stream/javadsl/DuctTest.java
index de847acf2a..c77467dbac 100644
--- a/akka-stream/src/test/java/akka/stream/javadsl/DuctTest.java
+++ b/akka-stream/src/test/java/akka/stream/javadsl/DuctTest.java
@@ -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;
diff --git a/akka-stream/src/test/java/akka/stream/javadsl/FlowTest.java b/akka-stream/src/test/java/akka/stream/javadsl/FlowTest.java
index fc4bef8ed6..1e30cf6625 100644
--- a/akka-stream/src/test/java/akka/stream/javadsl/FlowTest.java
+++ b/akka-stream/src/test/java/akka/stream/javadsl/FlowTest.java
@@ -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;