From 01ff954d6869b76e2fe43558d6608dc2e33727a2 Mon Sep 17 00:00:00 2001 From: Buildkite on behalf of Wellcome Collection Date: Tue, 16 Jul 2024 11:30:27 +0000 Subject: [PATCH] Apply auto-formatting rules --- .../bag_tagger/services/BagTaggerWorker.scala | 5 +---- .../bag_tracker/client/BagTrackerClient.scala | 2 +- .../src/main/scala/weco/storage_service/bags_api/Main.scala | 4 ++-- .../storage_service/storage/models/IngestStepResult.scala | 5 +---- .../scala/weco/storage_service/indexer/IndexerWorker.scala | 5 +---- .../indexer/file_finder/FileFinderWorker.scala | 5 +---- .../main/scala/weco/storage_service/ingests_api/Main.scala | 4 ++-- .../ingests_tracker/client/IngestTrackerClient.scala | 2 +- .../ingests_worker/services/IngestsWorkerService.scala | 5 +---- .../storage_service/notifier/services/NotifierWorker.scala | 5 +---- 10 files changed, 12 insertions(+), 30 deletions(-) diff --git a/bag_tagger/src/main/scala/weco/storage_service/bag_tagger/services/BagTaggerWorker.scala b/bag_tagger/src/main/scala/weco/storage_service/bag_tagger/services/BagTaggerWorker.scala index d1b258987..ea094eeaa 100644 --- a/bag_tagger/src/main/scala/weco/storage_service/bag_tagger/services/BagTaggerWorker.scala +++ b/bag_tagger/src/main/scala/weco/storage_service/bag_tagger/services/BagTaggerWorker.scala @@ -7,10 +7,7 @@ import grizzled.slf4j.Logging import io.circe.Decoder import software.amazon.awssdk.services.sqs.SqsAsyncClient import software.amazon.awssdk.services.sqs.model.Message -import weco.messaging.sqsworker.pekko.{ - PekkoSQSWorker, - PekkoSQSWorkerConfig -} +import weco.messaging.sqsworker.pekko.{PekkoSQSWorker, PekkoSQSWorkerConfig} import weco.messaging.worker.models.{Result, RetryableFailure, Successful} import weco.monitoring.Metrics import weco.storage_service.bag_tracker.client.BagTrackerClient diff --git a/bag_tracker/src/main/scala/weco/storage_service/bag_tracker/client/BagTrackerClient.scala b/bag_tracker/src/main/scala/weco/storage_service/bag_tracker/client/BagTrackerClient.scala index f9ab697c0..0d4a24ef3 100644 --- a/bag_tracker/src/main/scala/weco/storage_service/bag_tracker/client/BagTrackerClient.scala +++ b/bag_tracker/src/main/scala/weco/storage_service/bag_tracker/client/BagTrackerClient.scala @@ -12,7 +12,7 @@ import weco.storage_service.bag_tracker.models.BagVersionList import weco.storage_service.bagit.models.{BagId, BagVersion} import weco.storage_service.storage.models.StorageManifest import weco.storage.RetryableError -import weco.http.client.{PekkoHttpClient, HttpClient, HttpGet, HttpPost} +import weco.http.client.{HttpClient, HttpGet, HttpPost, PekkoHttpClient} import weco.http.json.CirceMarshalling import scala.concurrent.{ExecutionContext, Future} diff --git a/bags_api/src/main/scala/weco/storage_service/bags_api/Main.scala b/bags_api/src/main/scala/weco/storage_service/bags_api/Main.scala index c5a45b099..7cefdefb6 100644 --- a/bags_api/src/main/scala/weco/storage_service/bags_api/Main.scala +++ b/bags_api/src/main/scala/weco/storage_service/bags_api/Main.scala @@ -9,8 +9,8 @@ import software.amazon.awssdk.services.s3.presigner.S3Presigner import weco.http.typesafe.HTTPServerBuilder import weco.monitoring.typesafe.CloudWatchBuilder import weco.storage_service.bag_tracker.client.{ - PekkoBagTrackerClient, - BagTrackerClient + BagTrackerClient, + PekkoBagTrackerClient } import weco.storage.providers.s3.S3ObjectLocationPrefix import weco.storage.services.s3.{S3PresignedUrls, S3Uploader} diff --git a/common/src/main/scala/weco/storage_service/storage/models/IngestStepResult.scala b/common/src/main/scala/weco/storage_service/storage/models/IngestStepResult.scala index 3b1e77358..7f90ebd2e 100644 --- a/common/src/main/scala/weco/storage_service/storage/models/IngestStepResult.scala +++ b/common/src/main/scala/weco/storage_service/storage/models/IngestStepResult.scala @@ -6,10 +6,7 @@ import org.apache.pekko.stream.connectors.sqs.MessageAction import io.circe.Decoder import software.amazon.awssdk.services.sqs.SqsAsyncClient import software.amazon.awssdk.services.sqs.model.Message -import weco.messaging.sqsworker.pekko.{ - PekkoSQSWorker, - PekkoSQSWorkerConfig -} +import weco.messaging.sqsworker.pekko.{PekkoSQSWorker, PekkoSQSWorkerConfig} import weco.messaging.worker.models.{ Result, RetryableFailure, diff --git a/indexer/common/src/main/scala/weco/storage_service/indexer/IndexerWorker.scala b/indexer/common/src/main/scala/weco/storage_service/indexer/IndexerWorker.scala index 2158f4c91..6adb83b37 100644 --- a/indexer/common/src/main/scala/weco/storage_service/indexer/IndexerWorker.scala +++ b/indexer/common/src/main/scala/weco/storage_service/indexer/IndexerWorker.scala @@ -9,10 +9,7 @@ import grizzled.slf4j.Logging import io.circe.Decoder import software.amazon.awssdk.services.sqs.SqsAsyncClient import software.amazon.awssdk.services.sqs.model.Message -import weco.messaging.sqsworker.pekko.{ - PekkoSQSWorker, - PekkoSQSWorkerConfig -} +import weco.messaging.sqsworker.pekko.{PekkoSQSWorker, PekkoSQSWorkerConfig} import weco.messaging.worker.models.{ Result, RetryableFailure, diff --git a/indexer/file_finder/src/main/scala/weco/storage_service/indexer/file_finder/FileFinderWorker.scala b/indexer/file_finder/src/main/scala/weco/storage_service/indexer/file_finder/FileFinderWorker.scala index 634f342d9..e7df8a987 100644 --- a/indexer/file_finder/src/main/scala/weco/storage_service/indexer/file_finder/FileFinderWorker.scala +++ b/indexer/file_finder/src/main/scala/weco/storage_service/indexer/file_finder/FileFinderWorker.scala @@ -6,10 +6,7 @@ import io.circe.Decoder import software.amazon.awssdk.services.sqs.SqsAsyncClient import weco.json.JsonUtil._ import weco.messaging.MessageSender -import weco.messaging.sqsworker.pekko.{ - PekkoSQSWorker, - PekkoSQSWorkerConfig -} +import weco.messaging.sqsworker.pekko.{PekkoSQSWorker, PekkoSQSWorkerConfig} import weco.messaging.worker.models.{Result, RetryableFailure, Successful} import weco.monitoring.Metrics import weco.storage_service.bag_tracker.client.{ diff --git a/ingests/ingests_api/src/main/scala/weco/storage_service/ingests_api/Main.scala b/ingests/ingests_api/src/main/scala/weco/storage_service/ingests_api/Main.scala index 9ff7c2f19..3eba45ced 100644 --- a/ingests/ingests_api/src/main/scala/weco/storage_service/ingests_api/Main.scala +++ b/ingests/ingests_api/src/main/scala/weco/storage_service/ingests_api/Main.scala @@ -9,8 +9,8 @@ import weco.messaging.typesafe.SNSBuilder import weco.monitoring.typesafe.CloudWatchBuilder import weco.storage_service.ingests_api.services.IngestCreator import weco.storage_service.ingests_tracker.client.{ - PekkoIngestTrackerClient, - IngestTrackerClient + IngestTrackerClient, + PekkoIngestTrackerClient } import weco.typesafe.WellcomeTypesafeApp import weco.typesafe.config.builders.EnrichConfig._ diff --git a/ingests/ingests_tracker/src/main/scala/weco/storage_service/ingests_tracker/client/IngestTrackerClient.scala b/ingests/ingests_tracker/src/main/scala/weco/storage_service/ingests_tracker/client/IngestTrackerClient.scala index a4227c355..b2dfe67e5 100644 --- a/ingests/ingests_tracker/src/main/scala/weco/storage_service/ingests_tracker/client/IngestTrackerClient.scala +++ b/ingests/ingests_tracker/src/main/scala/weco/storage_service/ingests_tracker/client/IngestTrackerClient.scala @@ -10,7 +10,7 @@ import de.heikoseeberger.akkahttpcirce.ErrorAccumulatingCirceSupport._ import grizzled.slf4j.Logging import weco.json.JsonUtil._ import weco.storage_service.ingests.models.{Ingest, IngestID, IngestUpdate} -import weco.http.client.{PekkoHttpClient, HttpClient, HttpGet, HttpPost} +import weco.http.client.{HttpClient, HttpGet, HttpPost, PekkoHttpClient} import scala.concurrent.{ExecutionContext, Future} diff --git a/ingests/ingests_worker/src/main/scala/weco/storage_service/ingests_worker/services/IngestsWorkerService.scala b/ingests/ingests_worker/src/main/scala/weco/storage_service/ingests_worker/services/IngestsWorkerService.scala index 9190d0702..52a16bb63 100644 --- a/ingests/ingests_worker/src/main/scala/weco/storage_service/ingests_worker/services/IngestsWorkerService.scala +++ b/ingests/ingests_worker/src/main/scala/weco/storage_service/ingests_worker/services/IngestsWorkerService.scala @@ -4,10 +4,7 @@ import org.apache.pekko.actor.ActorSystem import grizzled.slf4j.Logging import software.amazon.awssdk.services.sqs.SqsAsyncClient import weco.json.JsonUtil._ -import weco.messaging.sqsworker.pekko.{ - PekkoSQSWorker, - PekkoSQSWorkerConfig -} +import weco.messaging.sqsworker.pekko.{PekkoSQSWorker, PekkoSQSWorkerConfig} import weco.messaging.worker.models.{ Result, RetryableFailure, diff --git a/notifier/src/main/scala/weco/storage_service/notifier/services/NotifierWorker.scala b/notifier/src/main/scala/weco/storage_service/notifier/services/NotifierWorker.scala index 2e159e032..52a23ab6c 100644 --- a/notifier/src/main/scala/weco/storage_service/notifier/services/NotifierWorker.scala +++ b/notifier/src/main/scala/weco/storage_service/notifier/services/NotifierWorker.scala @@ -5,10 +5,7 @@ import grizzled.slf4j.Logging import software.amazon.awssdk.services.sqs.SqsAsyncClient import weco.json.JsonUtil._ import weco.messaging.MessageSender -import weco.messaging.sqsworker.pekko.{ - PekkoSQSWorker, - PekkoSQSWorkerConfig -} +import weco.messaging.sqsworker.pekko.{PekkoSQSWorker, PekkoSQSWorkerConfig} import weco.messaging.worker.models.{Result, Successful} import weco.monitoring.Metrics import weco.storage_service.ingests.models.{