Repository: logging-log4j-scala Updated Branches: refs/heads/master c7ecd07b2 -> cc09ebef2
Implement foreach in LoggingContext Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/commit/cc09ebef Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/cc09ebef Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/cc09ebef Branch: refs/heads/master Commit: cc09ebef277702bd02101184aeaa4586d392b015 Parents: c7ecd07 Author: Mikael Ståldal <[email protected]> Authored: Fri Mar 31 16:17:08 2017 +0200 Committer: Mikael Ståldal <[email protected]> Committed: Fri Mar 31 16:17:08 2017 +0200 ---------------------------------------------------------------------- .../apache/logging/log4j/scala/LoggingContext.scala | 2 ++ .../logging/log4j/scala/LoggingContextTest.scala | 13 +++++++++++++ .../apache/logging/log4j/scala/LoggingContext.scala | 2 ++ .../logging/log4j/scala/LoggingContextTest.scala | 13 +++++++++++++ .../apache/logging/log4j/scala/LoggingContext.scala | 2 ++ .../logging/log4j/scala/LoggingContextTest.scala | 13 +++++++++++++ 6 files changed, 45 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/cc09ebef/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/LoggingContext.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/LoggingContext.scala b/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/LoggingContext.scala index 6c91b62..246ab02 100644 --- a/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/LoggingContext.scala +++ b/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/LoggingContext.scala @@ -75,6 +75,8 @@ object LoggingContext extends mutable.Map[String, String] { override def iterator: Iterator[(String, String)] = ThreadContext.getImmutableContext.asScala.iterator + override def foreach[U](f: ((String, String)) => U): Unit = ThreadContext.getImmutableContext.asScala.foreach(f) + override def size: Int = ThreadContext.getImmutableContext.size() override def isEmpty: Boolean = ThreadContext.isEmpty http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/cc09ebef/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala b/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala index def2164..80ca940 100644 --- a/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala +++ b/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala @@ -20,6 +20,8 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import org.scalatest.{FunSuite, Matchers} +import scala.collection.mutable + @RunWith(classOf[JUnitRunner]) class LoggingContextTest extends FunSuite with Matchers { @@ -99,4 +101,15 @@ class LoggingContextTest extends FunSuite with Matchers { LoggingContext.iterator.toSet shouldBe Set("key1" -> "value1", "key2" -> "value2") } + test("foreach") { + LoggingContext += ("key1" -> "value1") + LoggingContext += ("key2" -> "value2") + + val result = mutable.Set.empty[(String, String)] + + LoggingContext.foreach { result += _ } + + result shouldBe Set("key1" -> "value1", "key2" -> "value2") + } + } http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/cc09ebef/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggingContext.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggingContext.scala b/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggingContext.scala index 70f9ec8..79efecc 100644 --- a/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggingContext.scala +++ b/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggingContext.scala @@ -75,6 +75,8 @@ object LoggingContext extends mutable.Map[String, String] { override def iterator: Iterator[(String, String)] = ThreadContext.getImmutableContext.asScala.iterator + override def foreach[U](f: ((String, String)) => U): Unit = ThreadContext.getImmutableContext.asScala.foreach(f) + override def size: Int = ThreadContext.getImmutableContext.size() override def isEmpty: Boolean = ThreadContext.isEmpty http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/cc09ebef/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala b/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala index def2164..80ca940 100644 --- a/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala +++ b/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala @@ -20,6 +20,8 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import org.scalatest.{FunSuite, Matchers} +import scala.collection.mutable + @RunWith(classOf[JUnitRunner]) class LoggingContextTest extends FunSuite with Matchers { @@ -99,4 +101,15 @@ class LoggingContextTest extends FunSuite with Matchers { LoggingContext.iterator.toSet shouldBe Set("key1" -> "value1", "key2" -> "value2") } + test("foreach") { + LoggingContext += ("key1" -> "value1") + LoggingContext += ("key2" -> "value2") + + val result = mutable.Set.empty[(String, String)] + + LoggingContext.foreach { result += _ } + + result shouldBe Set("key1" -> "value1", "key2" -> "value2") + } + } http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/cc09ebef/log4j-api-scala_2.12/src/main/scala/org/apache/logging/log4j/scala/LoggingContext.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.12/src/main/scala/org/apache/logging/log4j/scala/LoggingContext.scala b/log4j-api-scala_2.12/src/main/scala/org/apache/logging/log4j/scala/LoggingContext.scala index 70f9ec8..79efecc 100644 --- a/log4j-api-scala_2.12/src/main/scala/org/apache/logging/log4j/scala/LoggingContext.scala +++ b/log4j-api-scala_2.12/src/main/scala/org/apache/logging/log4j/scala/LoggingContext.scala @@ -75,6 +75,8 @@ object LoggingContext extends mutable.Map[String, String] { override def iterator: Iterator[(String, String)] = ThreadContext.getImmutableContext.asScala.iterator + override def foreach[U](f: ((String, String)) => U): Unit = ThreadContext.getImmutableContext.asScala.foreach(f) + override def size: Int = ThreadContext.getImmutableContext.size() override def isEmpty: Boolean = ThreadContext.isEmpty http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/cc09ebef/log4j-api-scala_2.12/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.12/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala b/log4j-api-scala_2.12/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala index def2164..80ca940 100644 --- a/log4j-api-scala_2.12/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala +++ b/log4j-api-scala_2.12/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala @@ -20,6 +20,8 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import org.scalatest.{FunSuite, Matchers} +import scala.collection.mutable + @RunWith(classOf[JUnitRunner]) class LoggingContextTest extends FunSuite with Matchers { @@ -99,4 +101,15 @@ class LoggingContextTest extends FunSuite with Matchers { LoggingContext.iterator.toSet shouldBe Set("key1" -> "value1", "key2" -> "value2") } + test("foreach") { + LoggingContext += ("key1" -> "value1") + LoggingContext += ("key2" -> "value2") + + val result = mutable.Set.empty[(String, String)] + + LoggingContext.foreach { result += _ } + + result shouldBe Set("key1" -> "value1", "key2" -> "value2") + } + }
