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

Update scalafmt-core to 3.8.4 (#1717)

Browse source 
* Update scalafmt-core to 3.8.4

* Reformat with scalafmt 3.8.4

Executed command: scalafmt --non-interactive

* Add 'Reformat with scalafmt 3.8.4' to .git-blame-ignore-revs

* remove postfixOps imports

Assuming we want to keep the default
`rewrite.avoidInfix.excludePostfix = false` - otherwise
we can drop this commit

---------

Co-authored-by: scala-steward-asf[bot] <147768647+scala-steward-asf[bot]@users.noreply.github.com>
Co-authored-by: Arnout Engelen <arnout@bzzt.net>
This commit is contained in:
scala-steward-asf[bot] 2025-01-18 10:36:38 +08:00 • committed by GitHub
parent a75bc7a772
commit 5b2aab6f7a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
126 changed files with 728 additions and 860 deletions
Download patch file Download diff file Expand all files Collapse all files

29
slf4j/src/test/scala/org/apache/pekko/event/slf4j/Slf4jLoggerSpec.scala
View file

@ -19,7 +19,6 @@ import java.nio.charset.StandardCharsets
import scala.concurrent.duration._
import ch.qos.logback.core.OutputStreamAppender
import language.postfixOps
import org.scalatest.BeforeAndAfterEach
import org.slf4j.{ Marker, MarkerFactory }
@ -100,7 +99,7 @@ class Slf4jLoggerSpec extends PekkoSpec(Slf4jLoggerSpec.config) with BeforeAndAf
"log error with stackTrace" in {
producer ! new RuntimeException("Simulated error")
awaitCond(outputString.contains("----"), 5 seconds)
awaitCond(outputString.contains("----"), 5.seconds)
val s = outputString
s should include("pekkoSource=pekko://Slf4jLoggerSpec/user/logProducer")
s should include("pekkoAddress=pekko://Slf4jLoggerSpec")
@ -116,7 +115,7 @@ class Slf4jLoggerSpec extends PekkoSpec(Slf4jLoggerSpec.config) with BeforeAndAf
"log info with parameters" in {
producer ! (("test x={} y={}", 3, 17))
awaitCond(outputString.contains("----"), 5 seconds)
awaitCond(outputString.contains("----"), 5.seconds)
val s = outputString
s should include("pekkoSource=pekko://Slf4jLoggerSpec/user/logProducer")
s should include("pekkoAddress=pekko://Slf4jLoggerSpec")
@ -129,7 +128,7 @@ class Slf4jLoggerSpec extends PekkoSpec(Slf4jLoggerSpec.config) with BeforeAndAf
"log info with marker" in {
producer ! StringWithMarker("security-wise interesting message", LogMarker("SECURITY"))
awaitCond(outputString.contains("----"), 5 seconds)
awaitCond(outputString.contains("----"), 5.seconds)
val s = outputString
s should include("marker=[SECURITY]")
s should include("msg=[security-wise interesting message]")
@ -138,7 +137,7 @@ class Slf4jLoggerSpec extends PekkoSpec(Slf4jLoggerSpec.config) with BeforeAndAf
"log info with marker and properties" in {
producer ! StringWithMarker("interesting message", LogMarker("testMarker", Map("p1" -> 1, "p2" -> "B")))
awaitCond(outputString.contains("----"), 5 seconds)
awaitCond(outputString.contains("----"), 5.seconds)
val s = outputString
s should include("marker=[testMarker]")
s should include("p1=1")
@ -151,7 +150,7 @@ class Slf4jLoggerSpec extends PekkoSpec(Slf4jLoggerSpec.config) with BeforeAndAf
slf4jMarker.add(MarkerFactory.getMarker("ADDED")) // slf4j markers can have children
producer ! StringWithSlf4jMarker("security-wise interesting message", slf4jMarker)
awaitCond(outputString.contains("----"), 5 seconds)
awaitCond(outputString.contains("----"), 5.seconds)
val s = outputString
s should include("marker=[SLF [ ADDED ]]")
s should include("msg=[security-wise interesting message]")
@ -164,7 +163,7 @@ class Slf4jLoggerSpec extends PekkoSpec(Slf4jLoggerSpec.config) with BeforeAndAf
slf4jMarker,
Map("ticketNumber" -> 3671, "ticketDesc" -> "Custom MDC Values"))
awaitCond(outputString.contains("----"), 5 seconds)
awaitCond(outputString.contains("----"), 5.seconds)
val s = outputString
s should include("marker=[SLF [ ADDED ]]")
s should include("ticketDesc=Custom MDC Values")
@ -176,7 +175,7 @@ class Slf4jLoggerSpec extends PekkoSpec(Slf4jLoggerSpec.config) with BeforeAndAf
"Message with custom MDC values",
Map("ticketNumber" -> 3671, "ticketDesc" -> "Custom MDC Values"))
awaitCond(outputString.contains("----"), 5 seconds)
awaitCond(outputString.contains("----"), 5.seconds)
val s = outputString
s should include("pekkoSource=pekko://Slf4jLoggerSpec/user/logProducer")
s should include("level=[INFO]")
@ -189,7 +188,7 @@ class Slf4jLoggerSpec extends PekkoSpec(Slf4jLoggerSpec.config) with BeforeAndAf
"support null marker" in {
producer ! StringWithMarker("security-wise interesting message", null)
awaitCond(outputString.contains("----"), 5 seconds)
awaitCond(outputString.contains("----"), 5.seconds)
val s = outputString
s should include("msg=[security-wise interesting message]")
}
@ -197,7 +196,7 @@ class Slf4jLoggerSpec extends PekkoSpec(Slf4jLoggerSpec.config) with BeforeAndAf
"Support null values in custom MDC" in {
producer ! StringWithMDC("Message with null custom MDC values", Map("ticketNumber" -> 3671, "ticketDesc" -> null))
awaitCond(outputString.contains("----"), 5 seconds)
awaitCond(outputString.contains("----"), 5.seconds)
val s = outputString
s should include("pekkoSource=pekko://Slf4jLoggerSpec/user/logProducer")
s should include("level=[INFO]")
@ -211,7 +210,7 @@ class Slf4jLoggerSpec extends PekkoSpec(Slf4jLoggerSpec.config) with BeforeAndAf
"include system info in pekkoSource when creating Logging with system" in {
val log = Logging(system, "org.apache.pekko.event.slf4j.Slf4jLoggerSpec.MyLogSource")
log.info("test")
awaitCond(outputString.contains("----"), 5 seconds)
awaitCond(outputString.contains("----"), 5.seconds)
val s = outputString
s should include("pekkoSource=org.apache.pekko.event.slf4j.Slf4jLoggerSpec.MyLogSource(pekko://Slf4jLoggerSpec)")
s should include("logger=[org.apache.pekko.event.slf4j.Slf4jLoggerSpec.MyLogSource(pekko://Slf4jLoggerSpec)]")
@ -220,7 +219,7 @@ class Slf4jLoggerSpec extends PekkoSpec(Slf4jLoggerSpec.config) with BeforeAndAf
"not include system info in pekkoSource when creating Logging with system.eventStream" in {
val log = Logging(system.eventStream, "org.apache.pekko.event.slf4j.Slf4jLoggerSpec.MyLogSource")
log.info("test")
awaitCond(outputString.contains("----"), 5 seconds)
awaitCond(outputString.contains("----"), 5.seconds)
val s = outputString
s should include("pekkoSource=org.apache.pekko.event.slf4j.Slf4jLoggerSpec.MyLogSource")
s should include("logger=[org.apache.pekko.event.slf4j.Slf4jLoggerSpec.MyLogSource]")
@ -229,7 +228,7 @@ class Slf4jLoggerSpec extends PekkoSpec(Slf4jLoggerSpec.config) with BeforeAndAf
"use short class name and include system info in pekkoSource when creating Logging with system and class" in {
val log = Logging(system, classOf[MyLogSource])
log.info("test")
awaitCond(outputString.contains("----"), 5 seconds)
awaitCond(outputString.contains("----"), 5.seconds)
val s = outputString
s should include("pekkoSource=Slf4jLoggerSpec$MyLogSource(pekko://Slf4jLoggerSpec)")
s should include("logger=[org.apache.pekko.event.slf4j.Slf4jLoggerSpec$MyLogSource]")
@ -238,7 +237,7 @@ class Slf4jLoggerSpec extends PekkoSpec(Slf4jLoggerSpec.config) with BeforeAndAf
"use short class name in pekkoSource when creating Logging with system.eventStream and class" in {
val log = Logging(system.eventStream, classOf[MyLogSource])
log.info("test")
awaitCond(outputString.contains("----"), 5 seconds)
awaitCond(outputString.contains("----"), 5.seconds)
val s = outputString
s should include("pekkoSource=Slf4jLoggerSpec$MyLogSource")
s should include("logger=[org.apache.pekko.event.slf4j.Slf4jLoggerSpec$MyLogSource]")
@ -247,7 +246,7 @@ class Slf4jLoggerSpec extends PekkoSpec(Slf4jLoggerSpec.config) with BeforeAndAf
"include actorSystem name in sourceActorSystem" in {
val log = Logging(system.eventStream, classOf[MyLogSource])
log.info("test")
awaitCond(outputString.contains("----"), 5 seconds)
awaitCond(outputString.contains("----"), 5.seconds)
val s = outputString
s should include("sourceActorSystem=Slf4jLoggerSpec")
}