Merge branch 'master' into simplify-fds-impls

Author: jcazevedo

.scalafmt.conf

@@ -6,24 +6,24 @@ newlines.topLevelStatementBlankLines = [
   { blanks: { after: 0 } }
 ]
 
-fileOverride {
-  "glob:**/*.sbt" {
-    runner.dialect = sbt1
-    align.preset = most
-  }
-  "glob:**/project/*.scala" {
-    align.preset = most
-  }
-}
-
 rewrite {
-  rules = [Imports]
+  rules = [Imports, AvoidInfix, RedundantParens, RemoveSemicolons]
   scala3.convertToNewSyntax = true
   scala3.newSyntax.control = false
+  scala3.newSyntax.deprecated = true
 
   imports {
     groups = [["javax?\\..*"], ["scala\\..*"], [".*"], ["com\\.kevel\\..*"]]
     sort = ascii
     selectors = fold
   }
 }
+
+fileOverride {
+  "glob:**/*.sbt" {
+    align.preset = most
+  }
+  "glob:**/project/*.scala" {
+    align.preset = most
+  }
+}

modules/aws/src/main/scala/com/kevel/apso/aws/S3Bucket.scala

@@ -42,7 +42,7 @@ class S3Bucket(
   private[this] lazy val maxErrorRetry = Try(config.getInt(configPrefix + ".max-error-retry"))
 
   @transient private[this] lazy val defaultExecutor = {
-    val maxPoolSize = 100;
+    val maxPoolSize = 100
     val threadCount = new AtomicInteger(0)
     // NOTE: This is the default thread pool used by the `TransferManager`. I had to replicate it here
     // to make sure that threads are daemonized. This could be problematic, e.g. shutting down the
@@ -55,14 +55,14 @@ class S3Bucket(
       60,
       TimeUnit.SECONDS,
       new LinkedBlockingQueue(1_000),
-      (runnable) => {
+      runnable => {
         val thread = new Thread(runnable)
         thread.setName(s"apso-transfer-manager-${threadCount.getAndIncrement()}")
         thread.setDaemon(true)
         thread
       }
     )
-    executor.allowCoreThreadTimeOut(true);
+    executor.allowCoreThreadTimeOut(true)
     executor
   }
 
@@ -82,7 +82,7 @@ class S3Bucket(
 
     val s3 = client.build()
     if (!bucketExists(s3))
-      s3.createBucket({
+      s3.createBucket {
         val requestBuilder = CreateBucketRequest
           .builder()
           .bucket(bucketName)
@@ -97,7 +97,7 @@ class S3Bucket(
             )
             .build()
         else requestBuilder.build()
-      }).join()
+      }.join()
     s3
   }
 
@@ -351,7 +351,10 @@ class S3Bucket(
 
     s3Client
       .putObject(
-        b => { b.bucket(bucketName).key(sanitizeKey(key) + "/"); () },
+        b => {
+          b.bucket(bucketName).key(sanitizeKey(key) + "/")
+          ()
+        },
         AsyncRequestBody.fromInputStream(emptyContent, 0, defaultExecutor)
       )
       .join()
@@ -417,9 +420,11 @@ class S3Bucket(
     case ex: S3Exception =>
       ex.statusCode() match {
         case 404 =>
-          logger.error("The specified file does not exist", ex); true // no need to retry
+          logger.error("The specified file does not exist", ex)
+          true // no need to retry
         case 403 =>
-          logger.error("No permission to access the file", ex); true // no need to retry
+          logger.error("No permission to access the file", ex)
+          true // no need to retry
         case _ =>
           logger.warn(
             s"""|S3 service error: ${ex.getMessage}. Extended request id: ${ex.requestId}
@@ -429,22 +434,27 @@ class S3Bucket(
           false
       }
     case ex: SdkClientException =>
-      log(!ex.retryable, s"Client Exception: ${ex.getMessage}", ex); !ex.retryable
+      log(!ex.retryable, s"Client Exception: ${ex.getMessage}", ex)
+      !ex.retryable
 
     case ex: SdkException =>
-      log(!ex.retryable, s"SDK Exception: ${ex.getMessage}", ex); !ex.retryable
+      log(!ex.retryable, s"SDK Exception: ${ex.getMessage}", ex)
+      !ex.retryable
 
     case ex: CompletionException =>
       logger.warn("Completion Exception", ex)
       handler(ex.getCause)
 
     case ex: Exception =>
-      logger.warn("An error occurred", ex); false
+      logger.warn("An error occurred", ex)
+      false
   }
 
   private[this] def retry[T](f: => T, tries: Int = 3, sleepTime: Int = 5000): Option[T] =
-    if (tries == 0) { logger.error("Max retries reached. Aborting S3 operation"); None }
-    else
+    if (tries == 0) {
+      logger.error("Max retries reached. Aborting S3 operation")
+      None
+    } else
       Try(f) match {
         case Success(res)              => Some(res)
         case Failure(e) if !handler(e) =>

modules/caching/src/main/scala-2/com/kevel/apso/caching/SyncEvidence.scala

@@ -9,13 +9,13 @@ import scala.concurrent.Future
   * @tparam A
   *   the tagged type.
   */
-private[caching] trait SyncEvidence[A]
+class SyncEvidence[A] private[caching] ()
 
-private[caching] object SyncEvidence extends LowPrioritySyncEvidence {
-  implicit def ev1[A]: SyncEvidence[Future[A]] = new SyncEvidence[Future[A]] {}
-  implicit def ev2[A]: SyncEvidence[Future[A]] = new SyncEvidence[Future[A]] {}
+object SyncEvidence extends LowPrioritySyncEvidence {
+  implicit def ev1[A]: SyncEvidence[Future[A]] = new SyncEvidence[Future[A]]
+  implicit def ev2[A]: SyncEvidence[Future[A]] = new SyncEvidence[Future[A]]
 }
 
-private[caching] trait LowPrioritySyncEvidence {
-  implicit def ev[A]: SyncEvidence[A] = new SyncEvidence[A] {}
+trait LowPrioritySyncEvidence {
+  implicit def ev[A]: SyncEvidence[A] = new SyncEvidence[A]
 }

modules/caching/src/main/scala-3/com/kevel/apso/caching/SyncEvidence.scala

@@ -3,13 +3,14 @@ package com.kevel.apso.caching
 import scala.concurrent.Future
 import scala.util.NotGiven
 
-/** An evidence that an `A` is not a `Future[_]`.
+/** An evidence that an `A` is not a `Future[?]`. This class and respective companion object are public since they are
+  * required by public methods, but they should not be used explicitly in user code.
   *
   * @tparam A
   *   the tagged type.
   */
-private[caching] trait SyncEvidence[A]
+class SyncEvidence[A] private[caching] ()
 
-private[caching] object SyncEvidence {
-  implicit def ev[A](implicit notFuture: NotGiven[A <:< Future[_]]): SyncEvidence[A] = new SyncEvidence[A] {}
+object SyncEvidence {
+  given [A](using NotGiven[A <:< Future[?]]): SyncEvidence[A] = SyncEvidence[A]
 }

modules/circe/src/main/scala/com/kevel/apso/circe/ExtraJsonProtocol.scala

@@ -26,13 +26,14 @@ trait ExtraTimeJsonProtocol {
   implicit val finiteDurationEncoder: Encoder[FiniteDuration] =
     Encoder.forProduct1("milliseconds")(_.toMillis)
   implicit val finiteDurationDecoder: Decoder[FiniteDuration] =
-    Decoder[Long].emapPrettyTry(v => tryToParseDuration(v.toString)) or
-      Decoder[String].emapPrettyTry(v => tryToParseDuration(v)) or
-      Decoder.forProduct1[FiniteDuration, Long]("milliseconds")(_.millis) or
-      Decoder.forProduct1[FiniteDuration, Long]("seconds")(_.seconds) or
-      Decoder.forProduct1[FiniteDuration, Long]("minutes")(_.minutes) or
-      Decoder.forProduct1[FiniteDuration, Long]("hours")(_.hours) or
-      Decoder.forProduct1[FiniteDuration, Long]("days")(_.days)
+    Decoder[Long]
+      .emapPrettyTry(v => tryToParseDuration(v.toString))
+      .or(Decoder[String].emapPrettyTry(v => tryToParseDuration(v)))
+      .or(Decoder.forProduct1[FiniteDuration, Long]("milliseconds")(_.millis))
+      .or(Decoder.forProduct1[FiniteDuration, Long]("seconds")(_.seconds))
+      .or(Decoder.forProduct1[FiniteDuration, Long]("minutes")(_.minutes))
+      .or(Decoder.forProduct1[FiniteDuration, Long]("hours")(_.hours))
+      .or(Decoder.forProduct1[FiniteDuration, Long]("days")(_.days))
 
   implicit val intervalEncoder: Encoder[Interval] =
     Encoder.forProduct2("startMillis", "endMillis")(int => (int.getStartMillis, int.getEndMillis))

modules/circe/src/main/scala/com/kevel/apso/circe/Implicits.scala

@@ -29,7 +29,7 @@ object Implicits {
       val (prefix, nextJson) = prefixesAndJsons.dequeue()
 
       nextJson.asObject.foreach(jsonObject =>
-        jsonObject.toIterable.foreach({ case (k, v) =>
+        jsonObject.toIterable.foreach { case (k, v) =>
           if (!(ignoreNull && v.isNull)) {
             val kk = if (prefix.nonEmpty) s"$prefix$separator$k" else k
             if (v.isObject) {
@@ -38,7 +38,7 @@ object Implicits {
               builder += onLeaf(kk, v)
             }
           }
-        })
+        }
       )
     }
     builder.result()

modules/collections/src/main/scala/com/kevel/apso/collection/DeboxMap.scala

@@ -29,19 +29,19 @@ import scala.specialized as spec
   * @param v
   *   the number of values
   */
-class InvalidSizes(k: Int, v: Int) extends Exception("%s, %s" format (k, v))
+class InvalidSizes(k: Int, v: Int) extends Exception("%s, %s".format(k, v))
 
 /** Exception thrown when a `DeboxMap` factory is called requiring an invalid preallocated size.
   * @param n
   *   the requested size
   */
-class MapOverflow(n: Int) extends Exception("size %s exceeds max" format n)
+class MapOverflow(n: Int) extends Exception("size %s exceeds max".format(n))
 
 /** Exception thrown when trying to access a non-existent key in a `DeboxMap`.
   * @param k
   *   the non-existent key
   */
-class NotFound(k: String) extends Exception("key %s was not found" format k)
+class NotFound(k: String) extends Exception("key %s was not found".format(k))
 
 /** Object containing factory methods for `DeboxMaps`.
   */

modules/core/src/main/scala/com/kevel/apso/Retry.scala

@@ -16,7 +16,7 @@ object Retry {
       case 0 =>
         f
       case _ =>
-        f recoverWith {
+        f.recoverWith {
           case NonFatal(
                 _
               ) => // it would be indifferent to use a Throwable here because Futures don't catch Fatal exceptions

modules/core/src/test/scala/com/kevel/apso/ImplicitsSpec.scala

@@ -13,9 +13,21 @@ class ImplicitsSpec extends Specification with ScalaCheck {
 
     class MockRandom(elems: Double*) extends Random {
       private[this] var nextElems = elems.toList
-      override def nextInt() = { val e = nextElems.head.toInt; nextElems = nextElems.tail; e }
-      override def nextInt(n: Int) = { val e = nextElems.head.toInt % n; nextElems = nextElems.tail; e }
-      override def nextDouble() = { val e = nextElems.head; nextElems = nextElems.tail; e }
+      override def nextInt() = {
+        val e = nextElems.head.toInt
+        nextElems = nextElems.tail
+        e
+      }
+      override def nextInt(n: Int) = {
+        val e = nextElems.head.toInt % n
+        nextElems = nextElems.tail
+        e
+      }
+      override def nextDouble() = {
+        val e = nextElems.head
+        nextElems = nextElems.tail
+        e
+      }
     }
 
     def centralMoment(n: Int, xs: Iterable[Double]) = {

modules/gcp/src/main/scala/com/kevel/apso/gcp/GCSBucket.scala

@@ -219,9 +219,11 @@ final class GCSBucket(
     case ex: StorageException =>
       ex.getCode match {
         case 404 =>
-          logger.error("The specified file does not exist", ex); true // no need to retry
+          logger.error("The specified file does not exist", ex)
+          true // no need to retry
         case 403 =>
-          logger.error("No permission to access the file", ex); true // no need to retry
+          logger.error("No permission to access the file", ex)
+          true // no need to retry
         case _ =>
           logger.warn(
             s"""|GCS service error: ${ex.getMessage}.
@@ -232,12 +234,15 @@ final class GCSBucket(
       }
 
     case ex: BaseServiceException =>
-      logger.warn("An error occurred", ex); ex.isRetryable
+      logger.warn("An error occurred", ex)
+      ex.isRetryable
   }
 
   private[this] def retry[T](f: => T, tries: Int = 3, sleepTime: Int = 5000): Option[T] =
-    if (tries == 0) { logger.error("Max retries reached. Aborting GCS operation"); None }
-    else
+    if (tries == 0) {
+      logger.error("Max retries reached. Aborting GCS operation")
+      None
+    } else
       Try(f) match {
         case Success(res)              => Some(res)
         case Failure(e) if !handler(e) =>