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

Merge PatternsCS to Patterns (#26008)

Browse source 
* !act Move some Java API methods from PatternsCS to Patterns.

* Deprecate PatternCS and in favor of Patterns.
This commit is contained in:
kerr 2018-12-06 22:40:43 +08:00 • committed by Patrik Nordwall
parent 4f100a1f1e
commit b7f3cbef94
16 changed files with 295 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

98
akka-docs/src/test/java/jdocs/actor/ActorDocTest.java
View file

@ -39,13 +39,13 @@ import akka.actor.ActorSelection;
import akka.actor.Identify;
//#import-identify
//#import-ask
import static akka.pattern.PatternsCS.ask;
import static akka.pattern.PatternsCS.pipe;
import static akka.pattern.Patterns.ask;
import static akka.pattern.Patterns.pipe;
import java.util.concurrent.CompletableFuture;
//#import-ask
//#import-gracefulStop
import static akka.pattern.PatternsCS.gracefulStop;
import static akka.pattern.Patterns.gracefulStop;
import akka.pattern.AskTimeoutException;
import java.util.concurrent.CompletionStage;
@ -80,7 +80,7 @@ public class ActorDocTest extends AbstractJavaTest {
//#context-actorOf
public class FirstActor extends AbstractActor {
final ActorRef child = getContext().actorOf(Props.create(MyActor.class), "myChild");
//#plus-some-behavior
@Override
public Receive createReceive() {
@ -102,15 +102,15 @@ public class ActorDocTest extends AbstractJavaTest {
}
//#createReceive
}
static
static
//#well-structured
public class WellStructuredActor extends AbstractActor {
public static class Msg1 {}
public static class Msg2 {}
public static class Msg3 {}
@Override
public Receive createReceive() {
return receiveBuilder()
@ -119,29 +119,29 @@ public class ActorDocTest extends AbstractJavaTest {
.match(Msg3.class, this::receiveMsg3)
.build();
}
private void receiveMsg1(Msg1 msg) {
// actual work
}
private void receiveMsg2(Msg2 msg) {
// actual work
}
private void receiveMsg3(Msg3 msg) {
// actual work
}
}
//#well-structured
static
static
//#optimized
public class OptimizedActor extends UntypedAbstractActor {
public static class Msg1 {}
public static class Msg2 {}
public static class Msg3 {}
@Override
public void onReceive(Object msg) throws Exception {
if (msg instanceof Msg1)
@ -153,15 +153,15 @@ public class ActorDocTest extends AbstractJavaTest {
else
unhandled(msg);
}
private void receiveMsg1(Msg1 msg) {
// actual work
}
private void receiveMsg2(Msg2 msg) {
// actual work
}
private void receiveMsg3(Msg3 msg) {
// actual work
}
@ -174,7 +174,7 @@ public class ActorDocTest extends AbstractJavaTest {
public ActorWithArgs(String args) {
this.args = args;
}
@Override
public Receive createReceive() {
return receiveBuilder().matchAny(x -> { }).build();
@ -197,11 +197,11 @@ public class ActorDocTest extends AbstractJavaTest {
}
private final Integer magicNumber;
public DemoActor(Integer magicNumber) {
this.magicNumber = magicNumber;
}
@Override
public Receive createReceive() {
return receiveBuilder()
@ -243,7 +243,7 @@ public class ActorDocTest extends AbstractJavaTest {
return from;
}
}
@Override
public Receive createReceive() {
return receiveBuilder()
@ -255,23 +255,23 @@ public class ActorDocTest extends AbstractJavaTest {
}
//#messages-in-companion
public static class LifecycleMethods extends AbstractActor {
@Override
public Receive createReceive() {
return AbstractActor.emptyBehavior();
}
/*
* This section must be kept in sync with the actual Actor trait.
*
*
* BOYSCOUT RULE: whenever you read this, verify that!
*/
//#lifecycle-callbacks
public void preStart() {
}
public void preRestart(Throwable reason, Optional<Object> message) {
for (ActorRef each : getContext().getChildren()) {
getContext().unwatch(each);
@ -279,25 +279,25 @@ public class ActorDocTest extends AbstractJavaTest {
}
postStop();
}
public void postRestart(Throwable reason) {
preStart();
}
public void postStop() {
}
//#lifecycle-callbacks
}
public static class Hook extends AbstractActor {
ActorRef target = null;
@Override
public Receive createReceive() {
return AbstractActor.emptyBehavior();
}
//#preStart
@Override
public void preStart() {
@ -345,7 +345,7 @@ public class ActorDocTest extends AbstractJavaTest {
}
public static class ReplyException extends AbstractActor {
@Override
public Receive createReceive() {
return receiveBuilder()
@ -397,7 +397,7 @@ public class ActorDocTest extends AbstractJavaTest {
.matchEquals("job", s ->
getSender().tell("service unavailable, shutting down", getSelf())
)
.match(Terminated.class, t -> t.actor().equals(worker), t ->
.match(Terminated.class, t -> t.actor().equals(worker), t ->
getContext().stop(getSelf())
)
.build();
@ -536,7 +536,7 @@ public class ActorDocTest extends AbstractJavaTest {
// To set an initial delay
getContext().setReceiveTimeout(Duration.ofSeconds(10));
}
@Override
public Receive createReceive() {
return receiveBuilder()
@ -598,11 +598,11 @@ public class ActorDocTest extends AbstractJavaTest {
})
.build();
}
@Override
public Receive createReceive() {
return receiveBuilder()
.matchEquals("foo", s ->
.matchEquals("foo", s ->
getContext().become(angry)
)
.matchEquals("bar", s ->
@ -669,7 +669,7 @@ public class ActorDocTest extends AbstractJavaTest {
public WatchActor() {
getContext().watch(child); // <-- this is the only call needed for registration
}
@Override
public Receive createReceive() {
return receiveBuilder()
@ -706,7 +706,7 @@ public class ActorDocTest extends AbstractJavaTest {
ActorSelection selection = getContext().actorSelection("/user/another");
selection.tell(new Identify(identifyId), getSelf());
}
@Override
public Receive createReceive() {
return receiveBuilder()
@ -720,7 +720,7 @@ public class ActorDocTest extends AbstractJavaTest {
})
.build();
}
final AbstractActor.Receive active(final ActorRef another) {
return receiveBuilder()
.match(Terminated.class, t -> t.actor().equals(another), t ->
@ -744,7 +744,7 @@ public class ActorDocTest extends AbstractJavaTest {
}
};
}
@Test
public void usePatternsAskPipe() {
new TestKit(system) {
@ -754,11 +754,11 @@ public class ActorDocTest extends AbstractJavaTest {
ActorRef actorC = getRef();
//#ask-pipe
Timeout t = Timeout.create(Duration.ofSeconds(5));
final Duration t = Duration.ofSeconds(5);
// using 1000ms timeout
CompletableFuture<Object> future1 =
ask(actorA, "request", 1000).toCompletableFuture();
ask(actorA, "request", Duration.ofMillis(1000)).toCompletableFuture();
// using timeout from above
CompletableFuture<Object> future2 =
@ -774,12 +774,12 @@ public class ActorDocTest extends AbstractJavaTest {
pipe(transformed, system.dispatcher()).to(actorC);
//#ask-pipe
expectMsgEquals(new Result("request", "another request"));
}
};
}
@Test
public void useKill() {
new TestKit(system) {
@ -788,14 +788,14 @@ public class ActorDocTest extends AbstractJavaTest {
watch(victim);
//#kill
victim.tell(akka.actor.Kill.getInstance(), ActorRef.noSender());
// expecting the actor to indeed terminate:
expectTerminated(Duration.ofSeconds(3), victim);
//#kill
}
};
}
@Test
public void usePoisonPill() {
new TestKit(system) {
@ -809,7 +809,7 @@ public class ActorDocTest extends AbstractJavaTest {
}
};
}
@Test
public void coordinatedShutdown() {
final ActorRef someActor = system.actorOf(Props.create(FirstActor.class));
@ -817,7 +817,7 @@ public class ActorDocTest extends AbstractJavaTest {
CoordinatedShutdown.get(system).addTask(
CoordinatedShutdown.PhaseBeforeServiceUnbind(), "someTaskName",
() -> {
return akka.pattern.PatternsCS.ask(someActor, "stop", new Timeout(5, TimeUnit.SECONDS))
return akka.pattern.Patterns.ask(someActor, "stop", Duration.ofSeconds(5))
.thenApply(reply -> Done.getInstance());
});
//#coordinated-shutdown-addTask

7
akka-docs/src/test/java/jdocs/actor/io/dns/DnsCompileOnlyDocTest.java
View file

@ -7,14 +7,13 @@ package jdocs.actor.io.dns;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.io.Dns;
import akka.io.IO;
import akka.io.dns.DnsProtocol;
import static akka.pattern.PatternsCS.ask;
import static akka.pattern.PatternsCS.pipe;
import static akka.pattern.Patterns.ask;
import scala.Option;
import java.time.Duration;
import java.util.concurrent.CompletionStage;
@ -23,7 +22,7 @@ public class DnsCompileOnlyDocTest {
ActorSystem system = ActorSystem.create();
ActorRef actorRef = null;
long timeout = 1000;
final Duration timeout = Duration.ofMillis(1000L);
//#resolve
Option<Dns.Resolved> initial = Dns.get(system).cache().resolve("google.com", system, actorRef);

6
akka-docs/src/test/java/jdocs/camel/ProducerTestBase.java
View file

@ -4,16 +4,17 @@
package jdocs.camel;
import java.time.Duration;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CompletionStage;
import akka.pattern.Patterns;
import akka.testkit.javadsl.TestKit;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.actor.Props;
import akka.camel.CamelMessage;
import akka.pattern.PatternsCS;
public class ProducerTestBase {
public void tellJmsProducer() {
@ -33,7 +34,8 @@ public class ProducerTestBase {
ActorSystem system = ActorSystem.create("some-system");
Props props = Props.create(FirstProducer.class);
ActorRef producer = system.actorOf(props,"myproducer");
CompletionStage<Object> future = PatternsCS.ask(producer, "some request", 1000);
CompletionStage<Object> future = Patterns.ask(producer, "some request",
Duration.ofMillis(1000L));
//#AskProducer
system.stop(producer);
TestKit.shutdownActorSystem(system);

2
akka-docs/src/test/java/jdocs/circuitbreaker/DangerousJavaActor.java
View file

@ -12,7 +12,7 @@ import java.time.Duration;
import akka.pattern.CircuitBreaker;
import akka.event.Logging;
import static akka.pattern.PatternsCS.pipe;
import static akka.pattern.Patterns.pipe;
import java.util.concurrent.CompletableFuture;

2
akka-docs/src/test/java/jdocs/cluster/FactorialBackend.java
View file

@ -8,7 +8,7 @@ import java.math.BigInteger;
import java.util.concurrent.CompletableFuture;
import akka.actor.AbstractActor;
import static akka.pattern.PatternsCS.pipe;
import static akka.pattern.Patterns.pipe;
//#backend
public class FactorialBackend extends AbstractActor {

13
akka-docs/src/test/java/jdocs/future/FutureDocTest.java
View file

@ -7,7 +7,6 @@ package jdocs.future;
//#imports1
import akka.dispatch.*;
import jdocs.AbstractJavaTest;
import scala.Function0;
import scala.concurrent.ExecutionContext;
import scala.concurrent.Future;
import scala.concurrent.Await;
@ -64,15 +63,15 @@ import java.util.Arrays;
//#imports8
import static akka.pattern.PatternsCS.retry;
import static akka.pattern.Patterns.retry;
//#imports8
//#imports-ask
import static akka.pattern.PatternsCS.ask;
import static akka.pattern.Patterns.ask;
//#imports-ask
//#imports-pipe
import static akka.pattern.PatternsCS.pipe;
import static akka.pattern.Patterns.pipe;
//#imports-pipe
@ -124,11 +123,11 @@ public class FutureDocTest extends AbstractJavaTest {
//#pipe-to-usage
public class ActorUsingPipeTo extends AbstractActor {
ActorRef target;
Timeout timeout;
Duration timeout;
ActorUsingPipeTo(ActorRef target) {
this.target = target;
this.timeout = Timeout.create(Duration.ofSeconds(5));
this.timeout = Duration.ofSeconds(5);
}
@Override
@ -216,7 +215,7 @@ public class FutureDocTest extends AbstractJavaTest {
public class UserProxyActor extends AbstractActor {
ActorRef userActor;
ActorRef userActivityActor;
Timeout timeout = Timeout.create(Duration.ofSeconds(5));
Duration timeout = Duration.ofSeconds(5);
UserProxyActor(ActorRef userActor, ActorRef userActivityActor) {
this.userActor = userActor;

15
akka-docs/src/test/java/jdocs/pattern/SupervisedAsk.java
View file

@ -19,17 +19,16 @@ import akka.actor.Status;
import akka.actor.SupervisorStrategy;
import akka.actor.Terminated;
import akka.actor.AbstractActor;
import akka.pattern.PatternsCS;
import akka.util.Timeout;
import akka.pattern.Patterns;
public class SupervisedAsk {
private static class AskParam {
Props props;
Object message;
Timeout timeout;
Duration timeout;
AskParam(Props props, Object message, Timeout timeout) {
AskParam(Props props, Object message, Duration timeout) {
this.props = props;
this.message = message;
this.timeout = timeout;
@ -77,7 +76,7 @@ public class SupervisedAsk {
getContext().watch(targetActor);
targetActor.forward(askParam.message, getContext());
Scheduler scheduler = getContext().getSystem().scheduler();
timeoutMessage = scheduler.scheduleOnce(askParam.timeout.duration(),
timeoutMessage = scheduler.scheduleOnce(askParam.timeout,
getSelf(), new AskTimeout(), getContext().dispatcher(), null);
})
.match(Terminated.class, message -> {
@ -97,13 +96,13 @@ public class SupervisedAsk {
}
public static CompletionStage<Object> askOf(ActorRef supervisorCreator, Props props,
Object message, Timeout timeout) {
Object message, Duration timeout) {
AskParam param = new AskParam(props, message, timeout);
return PatternsCS.ask(supervisorCreator, param, timeout);
return Patterns.ask(supervisorCreator, param, timeout);
}
synchronized public static ActorRef createSupervisorCreator(
ActorRefFactory factory) {
return factory.actorOf(Props.create(AskSupervisorCreator.class));
}
}
}

7
akka-docs/src/test/java/jdocs/pattern/SupervisedAskSpec.java
View file

@ -11,12 +11,14 @@ import akka.actor.AbstractActor;
import akka.util.Timeout;
import scala.concurrent.duration.FiniteDuration;
import java.time.Duration;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.TimeUnit;
public class SupervisedAskSpec {
public Object execute(Class<? extends AbstractActor> someActor,
Object message, Timeout timeout, ActorRefFactory actorSystem)
Object message, Duration timeout, ActorRefFactory actorSystem)
throws Exception {
// example usage
try {
@ -24,8 +26,7 @@ public class SupervisedAskSpec {
.createSupervisorCreator(actorSystem);
CompletionStage<Object> finished = SupervisedAsk.askOf(supervisorCreator,
Props.create(someActor), message, timeout);
FiniteDuration d = timeout.duration();
return finished.toCompletableFuture().get(d.length(), d.unit());
return finished.toCompletableFuture().get(timeout.toMillis(), TimeUnit.MILLISECONDS);
} catch (Exception e) {
// exception propagated by supervision
throw e;

54
akka-docs/src/test/java/jdocs/persistence/PersistenceQueryDocTest.java
View file

@ -4,7 +4,9 @@
package jdocs.persistence;
import static akka.pattern.PatternsCS.ask;
import static akka.pattern.Patterns.ask;
import java.time.Duration;
import java.util.HashSet;
import java.util.Set;
@ -18,9 +20,7 @@ import akka.persistence.query.*;
import akka.stream.ActorMaterializer;
import akka.stream.javadsl.Sink;
import akka.stream.javadsl.Source;
import akka.util.Timeout;
import com.typesafe.config.ConfigFactory;
import docs.persistence.query.MyEventsByTagPublisher;
import org.reactivestreams.Subscriber;
import scala.concurrent.duration.FiniteDuration;
@ -34,13 +34,13 @@ public class PersistenceQueryDocTest {
final ActorSystem system = ActorSystem.create();
final ActorMaterializer mat = ActorMaterializer.create(system);
static
//#advanced-journal-query-types
public class RichEvent {
public final Set<String >tags;
public final Object payload;
public RichEvent(Set<String> tags, Object payload) {
this.tags = tags;
this.payload = payload;
@ -70,7 +70,7 @@ public class PersistenceQueryDocTest {
public MyReadJournalProvider(ExtendedActorSystem system, Config config) {
this.javadslReadJournal = new MyJavadslReadJournal(system, config);
}
@Override
public MyScaladslReadJournal scaladslReadJournal() {
return new MyScaladslReadJournal(javadslReadJournal);
@ -79,13 +79,13 @@ public class PersistenceQueryDocTest {
@Override
public MyJavadslReadJournal javadslReadJournal() {
return this.javadslReadJournal;
}
}
}
//#my-read-journal
static
//#my-read-journal
public class MyJavadslReadJournal implements
public class MyJavadslReadJournal implements
akka.persistence.query.javadsl.ReadJournal,
akka.persistence.query.javadsl.EventsByTagQuery,
akka.persistence.query.javadsl.EventsByPersistenceIdQuery,
@ -95,8 +95,8 @@ public class PersistenceQueryDocTest {
private final FiniteDuration refreshInterval;
public MyJavadslReadJournal(ExtendedActorSystem system, Config config) {
refreshInterval =
FiniteDuration.create(config.getDuration("refresh-interval",
refreshInterval =
FiniteDuration.create(config.getDuration("refresh-interval",
TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS);
}
@ -136,13 +136,13 @@ public class PersistenceQueryDocTest {
// implement in a similar way as eventsByTag
throw new UnsupportedOperationException("Not implemented yet");
}
@Override
public Source<String, NotUsed> currentPersistenceIds() {
// implement in a similar way as eventsByTag
throw new UnsupportedOperationException("Not implemented yet");
}
// possibility to add more plugin specific queries
//#advanced-journal-query-definition
@ -154,16 +154,16 @@ public class PersistenceQueryDocTest {
}
//#my-read-journal
static
//#my-read-journal
public class MyScaladslReadJournal implements
public class MyScaladslReadJournal implements
akka.persistence.query.scaladsl.ReadJournal,
akka.persistence.query.scaladsl.EventsByTagQuery,
akka.persistence.query.scaladsl.EventsByPersistenceIdQuery,
akka.persistence.query.scaladsl.PersistenceIdsQuery,
akka.persistence.query.scaladsl.CurrentPersistenceIdsQuery {
private final MyJavadslReadJournal javadslReadJournal;
public MyScaladslReadJournal(MyJavadslReadJournal javadslReadJournal) {
@ -179,7 +179,7 @@ public class PersistenceQueryDocTest {
@Override
public akka.stream.scaladsl.Source<EventEnvelope, NotUsed> eventsByPersistenceId(
String persistenceId, long fromSequenceNr, long toSequenceNr) {
return javadslReadJournal.eventsByPersistenceId(persistenceId, fromSequenceNr,
return javadslReadJournal.eventsByPersistenceId(persistenceId, fromSequenceNr,
toSequenceNr).asScala();
}
@ -187,12 +187,12 @@ public class PersistenceQueryDocTest {
public akka.stream.scaladsl.Source<String, NotUsed> persistenceIds() {
return javadslReadJournal.persistenceIds().asScala();
}
@Override
public akka.stream.scaladsl.Source<String, NotUsed> currentPersistenceIds() {
return javadslReadJournal.currentPersistenceIds().asScala();
}
// possibility to add more plugin specific queries
public akka.stream.scaladsl.Source<RichEvent, QueryMetadata> byTagsWithMeta(
@ -306,13 +306,13 @@ public class PersistenceQueryDocTest {
"infinite: " + meta.infinite);
return meta;
});
events.map(event -> {
System.out.println("Event payload: " + event.payload);
System.out.println("Event payload: " + event.payload);
return event.payload;
}).runWith(Sink.ignore(), mat);
//#advanced-journal-query-usage
}
@ -408,7 +408,7 @@ public class PersistenceQueryDocTest {
//#projection-into-different-store-actor-run
final Timeout timeout = Timeout.apply(3, TimeUnit.SECONDS);
final Duration timeout = Duration.ofSeconds(3);
final MyResumableProjection bidProjection = new MyResumableProjection("bid");
@ -451,17 +451,17 @@ public class PersistenceQueryDocTest {
public TheOneWhoWritesToQueryJournal() {
store = new ExampleStore();
}
@Override
public Receive createReceive() {
return receiveBuilder()
.matchAny(message -> {
state = updateState(state, message);
// example saving logic that requires state to become ready:
if (state.readyToSave())
store.save(Record.of(state));
})
.build();
}

6
akka-docs/src/test/java/jdocs/stream/FlowStreamRefsDocTest.java
View file

@ -9,7 +9,7 @@ import akka.actor.AbstractActor;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.actor.Props;
import akka.pattern.PatternsCS;
import akka.pattern.Patterns;
import akka.stream.*;
import akka.stream.javadsl.*;
import akka.testkit.javadsl.TestKit;
@ -59,7 +59,7 @@ public class FlowStreamRefsDocTest extends AbstractJavaTest {
Source<String, NotUsed> logs = streamLogs(requestLogs.streamId);
CompletionStage<SourceRef<String>> logsRef = logs.runWith(StreamRefs.sourceRef(), mat);
PatternsCS.pipe(logsRef.thenApply(ref -> new LogsOffer(ref)), context().dispatcher())
Patterns.pipe(logsRef.thenApply(ref -> new LogsOffer(ref)), context().dispatcher())
.to(sender());
}
@ -111,7 +111,7 @@ public class FlowStreamRefsDocTest extends AbstractJavaTest {
Sink<String, NotUsed> sink = logsSinkFor(prepare.id);
CompletionStage<SinkRef<String>> sinkRef = StreamRefs.<String>sinkRef().to(sink).run(mat);
PatternsCS.pipe(sinkRef.thenApply(ref -> new MeasurementsSinkReady(prepare.id, ref)), context().dispatcher())
Patterns.pipe(sinkRef.thenApply(ref -> new MeasurementsSinkReady(prepare.id, ref)), context().dispatcher())
.to(sender());
})
.build();

5
akka-docs/src/test/java/jdocs/stream/IntegrationDocTest.java
View file

@ -20,7 +20,6 @@ import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Tweet;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import scala.concurrent.duration.FiniteDuration;
import java.time.Duration;
import java.util.Arrays;
@ -33,7 +32,7 @@ import java.util.concurrent.CompletionStage;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import static akka.pattern.PatternsCS.ask;
import static akka.pattern.Patterns.ask;
import static jdocs.stream.TwitterStreamQuickstartDocTest.Model.AKKA;
import static jdocs.stream.TwitterStreamQuickstartDocTest.Model.tweets;
import static junit.framework.TestCase.assertTrue;
@ -602,7 +601,7 @@ public class IntegrationDocTest extends AbstractJavaTest {
final RunnableGraph<NotUsed> saveTweets =
akkaTweets
.mapAsync(4, tweet -> ask(database, new Save(tweet), 300))
.mapAsync(4, tweet -> ask(database, new Save(tweet), Duration.ofMillis(300L)))
.to(Sink.ignore());
//#save-tweets

4
akka-docs/src/test/java/jdocs/stream/StreamTestKitDocTest.java
View file

@ -97,7 +97,7 @@ public class StreamTestKitDocTest extends AbstractJavaTest {
final CompletionStage<List<List<Integer>>> future = sourceUnderTest
.grouped(2)
.runWith(Sink.head(), mat);
akka.pattern.PatternsCS.pipe(future, system.dispatcher()).to(probe.getRef());
akka.pattern.Patterns.pipe(future, system.dispatcher()).to(probe.getRef());
probe.expectMsg(Duration.ofSeconds(3), Arrays.asList(Arrays.asList(1, 2), Arrays.asList(3, 4)));
//#pipeto-testprobe
}
@ -200,7 +200,7 @@ public class StreamTestKitDocTest extends AbstractJavaTest {
public void testSourceAndTestSink() throws Exception {
//#test-source-and-sink
final Flow<Integer, Integer, NotUsed> flowUnderTest = Flow.of(Integer.class)
.mapAsyncUnordered(2, sleep -> akka.pattern.PatternsCS.after(
.mapAsyncUnordered(2, sleep -> akka.pattern.Patterns.after(
Duration.ofMillis(10),
system.scheduler(),
system.dispatcher(),

7
akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeGlobalRateLimit.java
View file

@ -6,13 +6,12 @@ package jdocs.stream.javadsl.cookbook;
import akka.NotUsed;
import akka.actor.*;
import akka.pattern.PatternsCS;
import akka.pattern.Patterns;
import akka.stream.*;
import akka.stream.javadsl.*;
import akka.stream.testkit.TestSubscriber;
import akka.stream.testkit.javadsl.TestSink;
import akka.testkit.javadsl.TestKit;
import akka.util.Timeout;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@ -83,7 +82,7 @@ public class RecipeGlobalRateLimit extends RecipeTest {
getContext().getSystem().dispatcher(),
getSelf());
}
@Override
public Receive createReceive() {
return open();
@ -150,7 +149,7 @@ public class RecipeGlobalRateLimit extends RecipeTest {
return f.mapAsync(parallelism, element -> {
final CompletionStage<Object> limiterTriggerFuture =
PatternsCS.ask(limiter, Limiter.WANT_TO_PASS, maxAllowedWait);
Patterns.ask(limiter, Limiter.WANT_TO_PASS, maxAllowedWait);
return limiterTriggerFuture.thenApplyAsync(response -> element, system.dispatcher());
});
}

4
akka-docs/src/test/java/jdocs/testkit/TestKitDocTest.java
View file

@ -6,7 +6,7 @@ package jdocs.testkit;
import static org.junit.Assert.*;
import akka.pattern.PatternsCS;
import akka.pattern.Patterns;
import jdocs.AbstractJavaTest;
import org.junit.Assert;
import akka.japi.JavaPartialFunction;
@ -99,7 +99,7 @@ public class TestKitDocTest extends AbstractJavaTest {
//#test-behavior
final Props props = Props.create(MyActor.class);
final TestActorRef<MyActor> ref = TestActorRef.create(system, props, "testB");
final CompletableFuture<Object> future = PatternsCS.ask(ref, "say42", 3000).toCompletableFuture();
final CompletableFuture<Object> future = Patterns.ask(ref, "say42", Duration.ofMillis(3000)).toCompletableFuture();
assertTrue(future.isDone());
assertEquals(42, future.get());
//#test-behavior