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

!str #15851 Rename FlowMaterializer and settings

Browse source 
* FlowMaterializer is now the actor independent interface
* ActorFlowMaterializer is the actor based interface
* MaterializerSettings renamed to ActorFlowMaterializerSettings
* impl.ActorBasedFlowMaterializer renamed to impl.ActorFlowMaterializerImpl
* Optimizations included in ActorFlowMaterializerSettings
* Note that http is using FlowMaterializer in api, but I suspect that it
  will currently only run with a ActorFlowMaterializer
This commit is contained in:
Patrik Nordwall 2015-01-27 18:29:20 +01:00
parent 5b72928439
commit cd9d503b03
146 changed files with 601 additions and 595 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-stream-tests/src/test/java/akka/stream/StreamTest.java
View file

@ -9,11 +9,11 @@ import akka.stream.javadsl.AkkaJUnitActorSystemResource;
public abstract class StreamTest {
final protected ActorSystem system;
final protected FlowMaterializer materializer;
final protected ActorFlowMaterializer materializer;
protected StreamTest(AkkaJUnitActorSystemResource actorSystemResource) {
system = actorSystemResource.getSystem();
MaterializerSettings settings = MaterializerSettings.create(system);
materializer = FlowMaterializer.create(settings, system);
ActorFlowMaterializerSettings settings = ActorFlowMaterializerSettings.create(system);
materializer = ActorFlowMaterializer.create(settings, system);
}
}

4
akka-stream-tests/src/test/java/akka/stream/javadsl/FlexiMergeTest.java
View file

@ -14,7 +14,7 @@ import static org.junit.Assert.assertEquals;
import java.util.concurrent.TimeUnit;
import org.reactivestreams.Publisher;
import akka.actor.ActorSystem;
import akka.stream.FlowMaterializer;
import akka.stream.ActorFlowMaterializer;
import akka.stream.testkit.AkkaSpec;
import akka.stream.javadsl.FlexiMerge;
import scala.concurrent.Await;
@ -30,7 +30,7 @@ public class FlexiMergeTest {
final ActorSystem system = actorSystemResource.getSystem();
final FlowMaterializer materializer = FlowMaterializer.create(system);
final ActorFlowMaterializer materializer = ActorFlowMaterializer.create(system);
final Source<String> in1 = Source.from(Arrays.asList("a", "b", "c", "d"));
final Source<String> in2 = Source.from(Arrays.asList("e", "f"));

4
akka-stream-tests/src/test/java/akka/stream/javadsl/FlexiRouteTest.java
View file

@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals;
import java.util.concurrent.TimeUnit;
import akka.actor.ActorSystem;
import akka.stream.FlowMaterializer;
import akka.stream.ActorFlowMaterializer;
import akka.stream.testkit.AkkaSpec;
import akka.stream.javadsl.FlexiRoute;
import akka.japi.Pair;
@ -29,7 +29,7 @@ public class FlexiRouteTest {
final ActorSystem system = actorSystemResource.getSystem();
final FlowMaterializer materializer = FlowMaterializer.create(system);
final ActorFlowMaterializer materializer = ActorFlowMaterializer.create(system);
final Source<String> in = Source.from(Arrays.asList("a", "b", "c", "d", "e"));