diff --git a/akka-actor-tests/src/test/java/akka/event/LoggingAdapterTest.java b/akka-actor-tests/src/test/java/akka/event/LoggingAdapterTest.java index b66732bb16..ecdce04cac 100644 --- a/akka-actor-tests/src/test/java/akka/event/LoggingAdapterTest.java +++ b/akka-actor-tests/src/test/java/akka/event/LoggingAdapterTest.java @@ -36,7 +36,7 @@ public class LoggingAdapterTest extends JUnitSuite { ); @Rule - public AkkaJUnitActorSystemResource actorSystemResource = + public AkkaJUnitActorSystemResource actorSystemResource = new AkkaJUnitActorSystemResource("LoggingAdapterTest", config); private ActorSystem system = null; @@ -50,7 +50,7 @@ public class LoggingAdapterTest extends JUnitSuite { public void mustFormatMessage() { final LoggingAdapter log = Logging.getLogger(system, this); new LogJavaTestKit(system) {{ - system.eventStream().subscribe(getRef(), LogEvent.class); + system.getEventStream().subscribe(getRef(), LogEvent.class); log.error("One arg message: {}", "the arg"); expectLog(ErrorLevel(), "One arg message: the arg"); @@ -82,7 +82,7 @@ public class LoggingAdapterTest extends JUnitSuite { @Test public void mustCallMdcForEveryLog() throws Exception { new LogJavaTestKit(system) {{ - system.eventStream().subscribe(getRef(), LogEvent.class); + system.getEventStream().subscribe(getRef(), LogEvent.class); ActorRef ref = system.actorOf(Props.create(ActorWithMDC.class)); ref.tell(new Log(ErrorLevel(), "An Error"), system.deadLetters()); @@ -101,7 +101,7 @@ public class LoggingAdapterTest extends JUnitSuite { @Test public void mustSupportMdcNull() throws Exception { new LogJavaTestKit(system) {{ - system.eventStream().subscribe(getRef(), LogEvent.class); + system.getEventStream().subscribe(getRef(), LogEvent.class); ActorRef ref = system.actorOf(Props.create(ActorWithMDC.class)); ref.tell(new Log(InfoLevel(), "Null MDC"), system.deadLetters()); diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/AdapterTest.java b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/AdapterTest.java index 80413a42e7..d180f8b896 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/AdapterTest.java +++ b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/AdapterTest.java @@ -307,16 +307,16 @@ public class AdapterTest extends JUnitSuite { akka.actor.ActorRef ignore = system.actorOf(akka.actor.Props.empty()); ActorRef typedRef = Adapter.spawnAnonymous(system, Typed1.create(ignore, probe.getRef())); - int originalLogLevel = system.eventStream().logLevel(); + int originalLogLevel = system.getEventStream().logLevel(); try { // suppress the logging with stack trace - system.eventStream().setLogLevel(Integer.MIN_VALUE); // OFF + system.getEventStream().setLogLevel(Integer.MIN_VALUE); // OFF // only stop supervisorStrategy typedRef.tell("supervise-stop"); probe.expectMsg("terminated"); } finally { - system.eventStream().setLogLevel(originalLogLevel); + system.getEventStream().setLogLevel(originalLogLevel); } probe.expectNoMessage(Duration.ofMillis(100)); // no pong } diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala index 7c50e57c0b..a33ddf8860 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala @@ -467,6 +467,11 @@ abstract class ActorSystem extends ActorRefFactory { */ def eventStream: EventStream + /** + * Java API: Main event bus of this actor system, used for example for logging. + */ + def getEventStream: EventStream = eventStream + /** * Convenient logging adapter for logging to the [[ActorSystem#eventStream]]. */ diff --git a/akka-docs/src/test/java/jdocs/actor/FaultHandlingTest.java b/akka-docs/src/test/java/jdocs/actor/FaultHandlingTest.java index 85dbe2131e..2df526e891 100644 --- a/akka-docs/src/test/java/jdocs/actor/FaultHandlingTest.java +++ b/akka-docs/src/test/java/jdocs/actor/FaultHandlingTest.java @@ -159,7 +159,7 @@ public class FaultHandlingTest extends AbstractJavaTest { EventFilter ex3 = new ErrorFilter(IllegalArgumentException.class); EventFilter ex4 = new ErrorFilter(Exception.class); EventFilter[] ignoreExceptions = { ex1, ex2, ex3, ex4 }; - system.eventStream().publish(new TestEvent.Mute(immutableSeq(ignoreExceptions))); + system.getEventStream().publish(new TestEvent.Mute(immutableSeq(ignoreExceptions))); //#create Props superprops = Props.create(Supervisor.class); diff --git a/akka-docs/src/test/java/jdocs/event/LoggingDocTest.java b/akka-docs/src/test/java/jdocs/event/LoggingDocTest.java index 6a5f51f71f..7e2289421c 100644 --- a/akka-docs/src/test/java/jdocs/event/LoggingDocTest.java +++ b/akka-docs/src/test/java/jdocs/event/LoggingDocTest.java @@ -59,7 +59,7 @@ public class LoggingDocTest extends AbstractJavaTest { //#deadletters final ActorSystem system = ActorSystem.create("DeadLetters"); final ActorRef actor = system.actorOf(Props.create(DeadLetterActor.class)); - system.eventStream().subscribe(actor, DeadLetter.class); + system.getEventStream().subscribe(actor, DeadLetter.class); //#deadletters TestKit.shutdownActorSystem(system); } @@ -84,10 +84,10 @@ public class LoggingDocTest extends AbstractJavaTest { @Override public Receive createReceive() { return receiveBuilder() - .match(Jazz.class, msg -> + .match(Jazz.class, msg -> System.out.printf("%s is listening to: %s%n", getSelf().path().name(), msg) ) - .match(Electronic.class, msg -> + .match(Electronic.class, msg -> System.out.printf("%s is listening to: %s%n", getSelf().path().name(), msg) ) .build(); @@ -100,18 +100,18 @@ public class LoggingDocTest extends AbstractJavaTest { final ActorSystem system = ActorSystem.create("DeadLetters"); //#superclass-subscription-eventstream final ActorRef actor = system.actorOf(Props.create(DeadLetterActor.class)); - system.eventStream().subscribe(actor, DeadLetter.class); + system.getEventStream().subscribe(actor, DeadLetter.class); final ActorRef jazzListener = system.actorOf(Props.create(Listener.class)); final ActorRef musicListener = system.actorOf(Props.create(Listener.class)); - system.eventStream().subscribe(jazzListener, Jazz.class); - system.eventStream().subscribe(musicListener, AllKindsOfMusic.class); + system.getEventStream().subscribe(jazzListener, Jazz.class); + system.getEventStream().subscribe(musicListener, AllKindsOfMusic.class); // only musicListener gets this message, since it listens to *all* kinds of music: - system.eventStream().publish(new Electronic("Parov Stelar")); + system.getEventStream().publish(new Electronic("Parov Stelar")); // jazzListener and musicListener will be notified about Jazz: - system.eventStream().publish(new Jazz("Sonny Rollins")); + system.getEventStream().publish(new Jazz("Sonny Rollins")); //#superclass-subscription-eventstream TestKit.shutdownActorSystem(system); @@ -123,7 +123,7 @@ public class LoggingDocTest extends AbstractJavaTest { final ActorRef actor = system.actorOf(Props.create(DeadLetterActor.class)); //#suppressed-deadletters - system.eventStream().subscribe(actor, SuppressedDeadLetter.class); + system.getEventStream().subscribe(actor, SuppressedDeadLetter.class); //#suppressed-deadletters TestKit.shutdownActorSystem(system); @@ -134,7 +134,7 @@ public class LoggingDocTest extends AbstractJavaTest { final ActorRef actor = system.actorOf(Props.create(DeadLetterActor.class)); //#all-deadletters - system.eventStream().subscribe(actor, AllDeadLetters.class); + system.getEventStream().subscribe(actor, AllDeadLetters.class); //#all-deadletters TestKit.shutdownActorSystem(system); @@ -217,10 +217,10 @@ public class LoggingDocTest extends AbstractJavaTest { // ... }) .match(Warning.class, msg -> { - // ... + // ... }) .match(Info.class, msg -> { - // ... + // ... }) .match(Debug.class, msg -> { // ... diff --git a/akka-docs/src/test/java/jdocs/persistence/PersistentActorExample.java b/akka-docs/src/test/java/jdocs/persistence/PersistentActorExample.java index e67e71733b..7eb0dca54b 100644 --- a/akka-docs/src/test/java/jdocs/persistence/PersistentActorExample.java +++ b/akka-docs/src/test/java/jdocs/persistence/PersistentActorExample.java @@ -99,7 +99,7 @@ class ExamplePersistentActor extends AbstractPersistentActor { final Evt evt = new Evt(data + "-" + getNumEvents()); persist(evt, (Evt e) -> { state.update(e); - getContext().getSystem().eventStream().publish(e); + getContext().getSystem().getEventStream().publish(e); if (lastSequenceNr() % snapShotInterval == 0 && lastSequenceNr() != 0) // IMPORTANT: create a copy of snapshot because ExampleState is mutable saveSnapshot(state.copy());