From 6416dc2f25757a375914b2e1332a53aecce15574 Mon Sep 17 00:00:00 2001 From: Roland Kuhn Date: Fri, 27 Feb 2015 11:45:46 +0100 Subject: [PATCH] tests compile apart from flexi things --- .../src/test/java/akka/stream/javadsl/SourceTest.java | 2 +- akka-stream/src/main/scala/akka/stream/javadsl/Source.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-stream-tests/src/test/java/akka/stream/javadsl/SourceTest.java b/akka-stream-tests/src/test/java/akka/stream/javadsl/SourceTest.java index 331dbf712b..d514e551a3 100644 --- a/akka-stream-tests/src/test/java/akka/stream/javadsl/SourceTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/javadsl/SourceTest.java @@ -260,7 +260,7 @@ public class SourceTest extends StreamTest { return input1.iterator(); } }; - Source.from(input).runForeach(new Procedure() { + Source.fromIterator(input).runForeach(new Procedure() { public void apply(Integer elem) { probe.getRef().tell(elem, ActorRef.noSender()); } diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala index ec1e1f7839..b4c7278bc7 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala @@ -78,7 +78,7 @@ object Source { * in accordance with the demand coming from the downstream transformation * steps. */ - def from[O](f: japi.Creator[java.util.Iterator[O]]): javadsl.Source[O, Unit] = + def fromIterator[O](f: japi.Creator[java.util.Iterator[O]]): javadsl.Source[O, Unit] = new Source(scaladsl.Source(() ⇒ f.create().asScala)) /**