From c3083c057030cbaa6fc72240f9d1aacaee30388a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 14 Jan 2025 13:55:13 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.4 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 1de89a55..38830b26 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.3 +version = 3.8.4 runner.dialect = scala213 maxColumn = 120 From a485aac47efed8c075ac6e11d1464824422f0a77 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 14 Jan 2025 13:55:32 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.4 Executed command: scalafmt --non-interactive --- aws/src/main/scala/com/kevel/apso/aws/S3Bucket.scala | 2 +- .../src/main/scala/com/kevel/apso/collection/DeboxMap.scala | 3 ++- .../apso/elasticsearch/pekko/ElasticsearchBulkInserter.scala | 3 +-- .../kevel/apso/elasticsearch/ElasticsearchBulkInserter.scala | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/aws/src/main/scala/com/kevel/apso/aws/S3Bucket.scala b/aws/src/main/scala/com/kevel/apso/aws/S3Bucket.scala index 33fda8c8..d7b04cf6 100644 --- a/aws/src/main/scala/com/kevel/apso/aws/S3Bucket.scala +++ b/aws/src/main/scala/com/kevel/apso/aws/S3Bucket.scala @@ -116,7 +116,7 @@ class S3Bucket( /** Returns the last modified timestamp of the file in the location specified by `key` in the bucket. If the file * doesn't exist the return value is 0L. The decision to return 0L in those cases is to align with - * `java.io.File#lastModified()`'s behavior. + * `java.io.File#lastModified()` 's behavior. * * @param key * the remote pathname for the file diff --git a/collections/src/main/scala/com/kevel/apso/collection/DeboxMap.scala b/collections/src/main/scala/com/kevel/apso/collection/DeboxMap.scala index 6c7b452a..9b433f0d 100644 --- a/collections/src/main/scala/com/kevel/apso/collection/DeboxMap.scala +++ b/collections/src/main/scala/com/kevel/apso/collection/DeboxMap.scala @@ -200,7 +200,8 @@ final class DeboxMap[ if (status == 3 && keys(j) == key) { buckets(j) = 2 len -= 1 - } else if (status == 0) {} else { + } else if (status == 0) {} + else { loop((i << 2) + i + perturbation + 1, perturbation >> 5) } } diff --git a/elasticsearch-pekko/src/main/scala/com/kevel/apso/elasticsearch/pekko/ElasticsearchBulkInserter.scala b/elasticsearch-pekko/src/main/scala/com/kevel/apso/elasticsearch/pekko/ElasticsearchBulkInserter.scala index a5c71f25..b90c5143 100644 --- a/elasticsearch-pekko/src/main/scala/com/kevel/apso/elasticsearch/pekko/ElasticsearchBulkInserter.scala +++ b/elasticsearch-pekko/src/main/scala/com/kevel/apso/elasticsearch/pekko/ElasticsearchBulkInserter.scala @@ -218,8 +218,7 @@ class ElasticsearchBulkInserter( super.postStop() log.info("Stopping Bulk Inserter...") - val stop = if (buffer.nonEmpty) flush().andThen { case _ => client.close() } - else Future(client.close()) + val stop = if (buffer.nonEmpty) flush().andThen { case _ => client.close() } else Future(client.close()) Try(Await.result(stop, timeoutOnStop)).failed.foreach { ex => logErrorOrWarning("Failed to cleanly stop Bulk Inserter!", Some(ex)) diff --git a/elasticsearch/src/main/scala/com/kevel/apso/elasticsearch/ElasticsearchBulkInserter.scala b/elasticsearch/src/main/scala/com/kevel/apso/elasticsearch/ElasticsearchBulkInserter.scala index 6fd4fad1..195999d1 100644 --- a/elasticsearch/src/main/scala/com/kevel/apso/elasticsearch/ElasticsearchBulkInserter.scala +++ b/elasticsearch/src/main/scala/com/kevel/apso/elasticsearch/ElasticsearchBulkInserter.scala @@ -218,8 +218,7 @@ class ElasticsearchBulkInserter( super.postStop() log.info("Stopping Bulk Inserter...") - val stop = if (buffer.nonEmpty) flush().andThen { case _ => client.close() } - else Future(client.close()) + val stop = if (buffer.nonEmpty) flush().andThen { case _ => client.close() } else Future(client.close()) Try(Await.result(stop, timeoutOnStop)).failed.foreach { ex => logErrorOrWarning("Failed to cleanly stop Bulk Inserter!", Some(ex)) From 15a74b9b802a95166c590a4bdffa937537a2945d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 14 Jan 2025 13:55:32 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.4' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index aefd43a8..2ce35d6d 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.7.5 465602629d39f68ce5442d609ec0f90c0b085625 + +# Scala Steward: Reformat with scalafmt 3.8.4 +a485aac47efed8c075ac6e11d1464824422f0a77