util/util-logging: Add Scala3 cross-build

Cross build util-logging with Scala 3. Util PR #295

Signed-off-by: Hamdi Allam <[email protected]>

JIRA Issues: CSL-11409

Differential Revision: https://phabricator.twitter.biz/D764508

Author: felixbr

build.sbt

@@ -540,7 +540,7 @@ lazy val utilLogging = Project(
   id = "util-logging",
   base = file("util-logging")
 ).settings(
-    sharedSettings
+    sharedScala3EnabledSettings
   ).settings(
     name := "util-logging"
   ).dependsOn(utilCore, utilApp, utilStats)

util-logging/src/main/scala/com/twitter/logging/FileHandler.scala

@@ -16,11 +16,21 @@
 
 package com.twitter.logging
 
-import java.io.{File, FileOutputStream, FilenameFilter, OutputStream}
+import java.io.File
+import java.io.FileOutputStream
+import java.io.FilenameFilter
+import java.io.OutputStream
 import java.nio.charset.Charset
-import java.util.{Calendar, Date, logging => javalog}
+import java.util.Calendar
+import java.util.Date
+import java.util.{logging => javalog}
 
-import com.twitter.util.{TwitterDateFormat, HandleSignal, Return, StorageUnit, Time, Try}
+import com.twitter.util.TwitterDateFormat
+import com.twitter.util.HandleSignal
+import com.twitter.util.Return
+import com.twitter.util.StorageUnit
+import com.twitter.util.Time
+import com.twitter.util.Try
 
 sealed abstract class Policy
 object Policy {
@@ -224,9 +234,12 @@ class FileHandler(
       }
       case Policy.Weekly(weekday) => {
         next.set(Calendar.HOUR_OF_DAY, 0)
-        do {
+
+        next.add(Calendar.DAY_OF_MONTH, 1)
+        while (next.get(Calendar.DAY_OF_WEEK) != weekday) {
           next.add(Calendar.DAY_OF_MONTH, 1)
-        } while (next.get(Calendar.DAY_OF_WEEK) != weekday)
+        }
+
         Some(next)
       }
     }

util-logging/src/main/scala/com/twitter/logging/Handler.scala

@@ -150,5 +150,5 @@ class ConsoleHandler(formatter: Formatter = new Formatter(), level: Option[Level
 
   def close(): Unit = {}
 
-  def flush(): Unit = Console.flush
+  def flush(): Unit = Console.flush()
 }

util-logging/src/main/scala/com/twitter/logging/Logger.scala

@@ -66,7 +66,7 @@ class Logger protected (val name: String, private val wrapped: javalog.Logger) {
    */
   @varargs
   final def log(level: Level, thrown: Throwable, message: String, items: Any*): Unit = {
-    val myLevel = getLevel
+    val myLevel = getLevel()
     if ((myLevel eq null) || (level.intValue >= myLevel.intValue)) {
 
       val record =
@@ -136,7 +136,7 @@ class Logger protected (val name: String, private val wrapped: javalog.Logger) {
    * and attach an exception and stack trace.
    */
   def logLazy(level: Level, thrown: Throwable, message: => AnyRef): Unit = {
-    val myLevel = getLevel
+    val myLevel = getLevel()
     if ((myLevel eq null) || (level.intValue >= myLevel.intValue)) {
       val record = new LazyLogRecord(level, message)
       record.setLoggerName(wrapped.getName)

util-logging/src/test/scala/com/twitter/logging/FileHandlerTest.scala

@@ -17,13 +17,18 @@
 package com.twitter.logging
 
 import java.io._
-import java.util.{Calendar, Date, UUID, logging => javalog}
+import java.util.Calendar
+import java.util.Date
+import java.util.UUID
+import java.util.{logging => javalog}
 import com.twitter.conversions.StorageUnitOps._
 import com.twitter.conversions.DurationOps._
 import com.twitter.io.TempFolder
 import com.twitter.util.Time
 import java.nio.file.attribute.BasicFileAttributes
-import java.nio.file.{Files, Path, Paths}
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
 import java.util.function.BiPredicate
 import org.scalatest.wordspec.AnyWordSpec
 
@@ -353,7 +358,7 @@ class FileHandlerTest extends AnyWordSpec with TempFolder {
         }
 
         val files = listLogFiles(folderName + "/LogFileDir")
-        files.foreach { f: File =>
+        files.foreach { (f: File) =>
           val len = f.length().bytes
           if (len > fileSizeInMegaBytes.megabytes) {
             fail("Failed to roll over the log file")

util-logging/src/test/scala/com/twitter/logging/LogRecordTest.scala

@@ -6,7 +6,7 @@ import org.scalatest.funsuite.AnyFunSuite
 class LogRecordTest extends AnyFunSuite {
   test("LogRecord should getMethod properly") {
     Logger.withLoggers(Nil) {
-      new LogRecordTestHelper({ r: JRecord => r.getSourceMethodName() }) {
+      new LogRecordTestHelper({ (r: JRecord) => r.getSourceMethodName() }) {
         def makingLogRecord() = {
           logger.log(Level.INFO, "OK")
           assert(handler.get == "makingLogRecord")
@@ -34,7 +34,7 @@ abstract class LogRecordTestHelper(formats: JRecord => String) {
   logger.addHandler(handler)
 }
 
-class Foo extends LogRecordTestHelper({ r: JRecord => r.getSourceClassName() }) {
+class Foo extends LogRecordTestHelper({ (r: JRecord) => r.getSourceClassName }) {
   def makingLogRecord(): Unit = {
     logger.log(Level.INFO, "OK")
   }

util-logging/src/test/scala/com/twitter/logging/LoggerTest.scala

@@ -19,7 +19,11 @@ package com.twitter.logging
 import com.twitter.conversions.DurationOps._
 import com.twitter.io.TempFolder
 import java.net.InetSocketAddress
-import java.util.concurrent.{Callable, CountDownLatch, Executors, Future, TimeUnit}
+import java.util.concurrent.Callable
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.Executors
+import java.util.concurrent.Future
+import java.util.concurrent.TimeUnit
 import java.util.{logging => javalog}
 import org.scalatest.BeforeAndAfter
 import scala.collection.mutable
@@ -68,7 +72,7 @@ class LoggerTest extends AnyWordSpec with TempFolder with BeforeAndAfter {
     logger.addHandler(traceHandler)
   }
 
-  def logLines(): Seq[String] = traceHandler.get.split("\n")
+  def logLines(): Seq[String] = traceHandler.get.split("\n").toIndexedSeq
 
   /**
    * Verify that the logger set up with `traceLogger` has received a log line with the given
@@ -124,7 +128,7 @@ class LoggerTest extends AnyWordSpec with TempFolder with BeforeAndAfter {
         "asdf" + executed + " hi there"
       }
 
-      logger.debugLazy(function)
+      logger.debugLazy(function())
       assert(!executed)
     }
 
@@ -136,7 +140,7 @@ class LoggerTest extends AnyWordSpec with TempFolder with BeforeAndAfter {
         executed = true
         "asdf" + executed + " hi there"
       }
-      logger.debugLazy(function)
+      logger.debugLazy(function())
       assert(executed)
     }
 
@@ -263,11 +267,11 @@ class LoggerTest extends AnyWordSpec with TempFolder with BeforeAndAfter {
       val otherFactories = List(LoggerFactory(node = "", level = Some(Level.INFO)))
       Logger.configure(initialFactories)
 
-      assert(Logger.get("").getLevel == Level.DEBUG)
+      assert(Logger.get("").getLevel() == Level.DEBUG)
       Logger.withLoggers(otherFactories) {
         assert(Logger.get("").getLevel() == Level.INFO)
       }
-      assert(Logger.get("").getLevel == Level.DEBUG)
+      assert(Logger.get("").getLevel() == Level.DEBUG)
     }
 
     "configure logging" should {
@@ -294,13 +298,13 @@ class LoggerTest extends AnyWordSpec with TempFolder with BeforeAndAfter {
             ) :: Nil
           ).apply()
 
-          assert(log.getLevel == Level.DEBUG)
+          assert(log.getLevel() == Level.DEBUG)
           assert(log.getHandlers().length == 1)
           val handler = log.getHandlers()(0).asInstanceOf[FileHandler]
           val fileName = folderName + separator + "test.log"
           assert(handler.filename == fileName)
           assert(handler.append == false)
-          assert(handler.getLevel == Level.INFO)
+          assert(handler.getLevel() == Level.INFO)
           val formatter = handler.formatter
           assert(
             formatter.formatPrefix(javalog.Level.WARNING, "10:55", "hello") == "WARNING 10:55 hello"
@@ -325,7 +329,7 @@ class LoggerTest extends AnyWordSpec with TempFolder with BeforeAndAfter {
             ) :: Nil
           ).apply()
 
-          assert(log.getHandlers.length == 1)
+          assert(log.getHandlers().length == 1)
           val h = log.getHandlers()(0).asInstanceOf[SyslogHandler]
           assert(h.dest.asInstanceOf[InetSocketAddress].getHostName == "localhost")
           assert(h.dest.asInstanceOf[InetSocketAddress].getPort == 212)
@@ -365,9 +369,9 @@ class LoggerTest extends AnyWordSpec with TempFolder with BeforeAndAfter {
           ) :: Nil
 
           Logger.configure(factories)
-          assert(Logger.get("").getLevel == Level.INFO)
-          assert(Logger.get("w3c").getLevel == Level.OFF)
-          assert(Logger.get("bad_jobs").getLevel == Level.INFO)
+          assert(Logger.get("").getLevel() == Level.INFO)
+          assert(Logger.get("w3c").getLevel() == Level.OFF)
+          assert(Logger.get("bad_jobs").getLevel() == Level.INFO)
           try {
             Logger.get("").getHandlers()(0).asInstanceOf[ThrottledHandler]
           } catch {

util-logging/src/test/scala/com/twitter/logging/SyslogHandlerTest.scala

@@ -16,7 +16,8 @@
 
 package com.twitter.logging
 
-import java.net.{DatagramPacket, DatagramSocket}
+import java.net.DatagramPacket
+import java.net.DatagramSocket
 import java.util.{logging => javalog}
 
 import org.scalatest.wordspec.AnyWordSpec
@@ -45,7 +46,7 @@ class SyslogHandlerTest extends AnyWordSpec {
       syslog.publish(record1)
       syslog.publish(record2)
 
-      SyslogFuture.sync
+      SyslogFuture.sync()
       val p = new DatagramPacket(new Array[Byte](1024), 1024)
       serverSocket.receive(p)
       assert(
@@ -78,7 +79,7 @@ class SyslogHandlerTest extends AnyWordSpec {
       ).apply()
       syslog.publish(record1)
 
-      SyslogFuture.sync
+      SyslogFuture.sync()
       val p = new DatagramPacket(new Array[Byte](1024), 1024)
       serverSocket.receive(p)
       assert(
@@ -104,7 +105,7 @@ class SyslogHandlerTest extends AnyWordSpec {
       ).apply()
       syslog.publish(record1)
 
-      SyslogFuture.sync
+      SyslogFuture.sync()
       val p = new DatagramPacket(new Array[Byte](1024), 1024)
       serverSocket.receive(p)
       assert(