From 5ccfc12eb56fe911856023adc5c818769c50863e Mon Sep 17 00:00:00 2001 From: Josep Prat Date: Tue, 4 Dec 2018 09:54:17 +0100 Subject: [PATCH] Add additional constructors for CapturedLogEvent (#26016) As requested in PR #25907 - more constructors to cover more simple cases --- .../testkit/typed/CapturedLogEvent.scala | 28 +++++++++++++++++++ .../typed/javadsl/BehaviorTestKitTest.java | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/CapturedLogEvent.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/CapturedLogEvent.scala index e20b453f69..499384449d 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/CapturedLogEvent.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/CapturedLogEvent.scala @@ -31,6 +31,34 @@ final case class CapturedLogEvent( this(logLevel, message, errorCause.asScala, marker.asScala, mdc.asScala.toMap) } + /** + * Constructor for Java API + */ + def this(logLevel: LogLevel, message: String) { + this(logLevel, message, Option.empty, Option.empty, Map.empty[String, Any]) + } + + /** + * Constructor for Java API + */ + def this(logLevel: LogLevel, message: String, errorCause: Throwable) { + this(logLevel, message, Some(errorCause), Option.empty[LogMarker], Map.empty[String, Any]) + } + + /** + * Constructor for Java API + */ + def this(logLevel: LogLevel, message: String, marker: LogMarker) { + this(logLevel, message, Option.empty[Throwable], Some(marker), Map.empty[String, Any]) + } + + /** + * Constructor for Java API + */ + def this(logLevel: LogLevel, message: String, errorCause: Throwable, marker: LogMarker) { + this(logLevel, message, Some(errorCause), Some(marker), Map.empty[String, Any]) + } + def getMdc: java.util.Map[String, Any] = mdc.asJava def getErrorCause: Optional[Throwable] = cause.asJava diff --git a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/BehaviorTestKitTest.java b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/BehaviorTestKitTest.java index 2ae292f9a7..37bfff6b0f 100644 --- a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/BehaviorTestKitTest.java +++ b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/BehaviorTestKitTest.java @@ -217,7 +217,7 @@ public class BehaviorTestKitTest extends JUnitSuite { test.run(new Log(what)); final List allLogEntries = test.getAllLogEntries(); assertEquals(1, allLogEntries.size()); - assertEquals(new CapturedLogEvent(Logging.InfoLevel(), what, Optional.empty(), Optional.empty(), new HashMap<>()), allLogEntries.get(0)); + assertEquals(new CapturedLogEvent(Logging.InfoLevel(), what), allLogEntries.get(0)); } @Test