Merge branch 'main' into Prefer-MARC-tag-264-over-260

wellcomecollection · Jul 30, 2024 · 90927ba · 90927ba
2 parents 3823850 + 33ece34
commit 90927ba
Show file tree

Hide file tree

Showing 136 changed files with 401 additions and 361 deletions.
diff --git a/...ter/calm_adapter/src/main/scala/weco/pipeline/calm_adapter/CalmAdapterWorkerService.scala b/...ter/calm_adapter/src/main/scala/weco/pipeline/calm_adapter/CalmAdapterWorkerService.scala
@@ -1,8 +1,8 @@
 package weco.pipeline.calm_adapter
 
-import akka.Done
-import akka.stream.Materializer
-import akka.stream.scaladsl._
+import org.apache.pekko.Done
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl._
 import grizzled.slf4j.Logging
 import software.amazon.awssdk.services.sqs.model.{Message => SQSMessage}
 import weco.json.JsonUtil._

diff --git a/calm_adapter/calm_adapter/src/main/scala/weco/pipeline/calm_adapter/CalmRetriever.scala b/calm_adapter/calm_adapter/src/main/scala/weco/pipeline/calm_adapter/CalmRetriever.scala
@@ -1,7 +1,7 @@
 package weco.pipeline.calm_adapter
 
-import akka.NotUsed
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.scaladsl.Source
 import grizzled.slf4j.Logging
 import weco.catalogue.source_model.calm.CalmRecord
 import weco.pipeline.calm_api_client.{

diff --git a/calm_adapter/calm_adapter/src/main/scala/weco/pipeline/calm_adapter/Main.scala b/calm_adapter/calm_adapter/src/main/scala/weco/pipeline/calm_adapter/Main.scala
@@ -1,14 +1,14 @@
 package weco.pipeline.calm_adapter
 
 import scala.concurrent.ExecutionContext
-import akka.actor.ActorSystem
+import org.apache.pekko.actor.ActorSystem
 import weco.typesafe.WellcomeTypesafeApp
 import weco.typesafe.config.builders.EnrichConfig._
 import weco.messaging.typesafe.{SNSBuilder, SQSBuilder}
 import weco.catalogue.source_model.calm.CalmRecord
 import weco.catalogue.source_model.config.SourceVHSBuilder
 import weco.catalogue.source_model.Implicits._
-import weco.pipeline.calm_api_client.AkkaHttpCalmApiClient
+import weco.pipeline.calm_api_client.PekkoHttpCalmApiClient
 
 object Main extends WellcomeTypesafeApp {
 
@@ -20,7 +20,7 @@ object Main extends WellcomeTypesafeApp {
         actorSystem.dispatcher
 
       val calmRetriever = new ApiCalmRetriever(
-        apiClient = new AkkaHttpCalmApiClient(
+        apiClient = new PekkoHttpCalmApiClient(
           url = config.requireString("calm.api.url"),
           username = config.requireString("calm.api.username"),
           password = config.requireString("calm.api.password")

diff --git a/calm_adapter/calm_adapter/src/test/resources/logback-test.xml b/calm_adapter/calm_adapter/src/test/resources/logback-test.xml
@@ -20,6 +20,6 @@
   <logger name="io.netty" level="OFF"/>
   <logger name="com.amazonaws" level="OFF"/>
   <logger name="software.amazon.awssdk" level="OFF"/>
-  <logger name="akka.actor" level="OFF"/>
+  <logger name="org.apache.pekko.actor" level="OFF"/>
   <logger name="com.sksamuel.elastic4s" level="OFF"/>
 </configuration>
diff --git a/...calm_adapter/src/test/scala/weco/pipeline/calm_adapter/CalmAdapterWorkerServiceTest.scala b/...calm_adapter/src/test/scala/weco/pipeline/calm_adapter/CalmAdapterWorkerServiceTest.scala
@@ -1,14 +1,14 @@
 package weco.pipeline.calm_adapter
 
 import java.time.{Instant, LocalDate}
-import akka.NotUsed
-import akka.stream.scaladsl._
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.scaladsl._
 import io.circe.Encoder
 import org.scalatest.EitherValues
 import org.scalatest.concurrent.{Eventually, IntegrationPatience}
 import org.scalatest.funspec.AnyFunSpec
 import org.scalatest.matchers.should.Matchers
-import weco.akka.fixtures.Akka
+import weco.pekko.fixtures.Pekko
 import weco.fixtures.TestWith
 import weco.json.JsonUtil._
 import weco.messaging.fixtures.SQS
@@ -37,7 +37,7 @@ class CalmAdapterWorkerServiceTest
     extends AnyFunSpec
     with Matchers
     with EitherValues
-    with Akka
+    with Pekko
     with SQS
     with Eventually
     with IntegrationPatience

diff --git a/calm_adapter/calm_adapter/src/test/scala/weco/pipeline/calm_adapter/CalmRetrieverTest.scala b/calm_adapter/calm_adapter/src/test/scala/weco/pipeline/calm_adapter/CalmRetrieverTest.scala
@@ -1,8 +1,8 @@
 package weco.pipeline.calm_adapter
 
 import java.time.LocalDate
-import akka.http.scaladsl.model.headers._
-import akka.stream.scaladsl._
+import org.apache.pekko.http.scaladsl.model.headers._
+import org.apache.pekko.stream.scaladsl._
 import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.funspec.AnyFunSpec
 import org.scalatest.matchers.should.Matchers

diff --git a/..._adapter/calm_api_client/src/main/scala/weco/pipeline/calm_api_client/CalmApiClient.scala b/..._adapter/calm_api_client/src/main/scala/weco/pipeline/calm_api_client/CalmApiClient.scala
@@ -1,16 +1,16 @@
 package weco.pipeline.calm_api_client
 
-import akka.Done
-import akka.actor.ActorSystem
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.model.headers.{
+import org.apache.pekko.Done
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.model.headers.{
   BasicHttpCredentials,
   Cookie,
   RawHeader
 }
-import akka.stream.{Materializer, RestartSettings}
+import org.apache.pekko.stream.{Materializer, RestartSettings}
 import weco.catalogue.source_model.calm.CalmRecord
-import weco.http.client.{AkkaHttpClient, HttpClient}
+import weco.http.client.{HttpClient, PekkoHttpClient}
 
 import scala.concurrent.duration._
 import scala.concurrent.{ExecutionContext, Future}
@@ -102,7 +102,7 @@ class HttpCalmApiClient(
   }
 }
 
-class AkkaHttpCalmApiClient(
+class PekkoHttpCalmApiClient(
   url: String,
   username: String,
   password: String,
@@ -112,7 +112,7 @@ class AkkaHttpCalmApiClient(
   maxRestarts: Int = 10
 )(implicit actorSystem: ActorSystem)
     extends HttpCalmApiClient(
-      client = new AkkaHttpClient(),
+      client = new PekkoHttpClient(),
       url,
       username,
       password,

diff --git a/...calm_api_client/src/main/scala/weco/pipeline/calm_api_client/CalmHttpResponseParser.scala b/...calm_api_client/src/main/scala/weco/pipeline/calm_api_client/CalmHttpResponseParser.scala
@@ -2,11 +2,11 @@ package weco.pipeline.calm_api_client
 
 import java.time.Instant
 
-import akka.http.scaladsl.model.{HttpResponse, ResponseEntity}
-import akka.http.scaladsl.model.headers.{`Set-Cookie`, Cookie, Date}
-import akka.http.scaladsl.unmarshalling.Unmarshal
-import akka.stream.Materializer
-import akka.util.ByteString
+import org.apache.pekko.http.scaladsl.model.{HttpResponse, ResponseEntity}
+import org.apache.pekko.http.scaladsl.model.headers.{`Set-Cookie`, Cookie, Date}
+import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.util.ByteString
 import grizzled.slf4j.Logging
 
 import scala.concurrent.{ExecutionContext, Future}

diff --git a/calm_adapter/calm_api_client/src/main/scala/weco/pipeline/calm_api_client/CalmSession.scala b/calm_adapter/calm_api_client/src/main/scala/weco/pipeline/calm_api_client/CalmSession.scala
@@ -1,5 +1,5 @@
 package weco.pipeline.calm_api_client
 
-import akka.http.scaladsl.model.headers.Cookie
+import org.apache.pekko.http.scaladsl.model.headers.Cookie
 
 case class CalmSession(numHits: Int, cookie: Cookie)
diff --git a/...adapter/calm_api_client/src/main/scala/weco/pipeline/calm_api_client/CalmXmlRequest.scala b/...adapter/calm_api_client/src/main/scala/weco/pipeline/calm_api_client/CalmXmlRequest.scala
@@ -1,6 +1,6 @@
 package weco.pipeline.calm_api_client
 
-import akka.Done
+import org.apache.pekko.Done
 import weco.catalogue.source_model.calm.CalmRecord
 
 import scala.xml.Elem

diff --git a/...dapter/calm_api_client/src/main/scala/weco/pipeline/calm_api_client/CalmXmlResponse.scala b/...dapter/calm_api_client/src/main/scala/weco/pipeline/calm_api_client/CalmXmlResponse.scala
@@ -6,8 +6,8 @@ import scala.util.Try
 import scala.xml.{Elem, Node, NodeSeq, XML}
 import java.time.Instant
 
-import akka.Done
-import akka.http.scaladsl.model.headers.Cookie
+import org.apache.pekko.Done
+import org.apache.pekko.http.scaladsl.model.headers.Cookie
 import weco.catalogue.source_model.calm.CalmRecord
 
 trait CalmXmlResponse[T] {

diff --git a/calm_adapter/calm_api_client/src/main/scala/weco/pipeline/calm_api_client/RetryFuture.scala b/calm_adapter/calm_api_client/src/main/scala/weco/pipeline/calm_api_client/RetryFuture.scala
@@ -1,7 +1,7 @@
 package weco.pipeline.calm_api_client
 
-import akka.stream.{Materializer, RestartSettings}
-import akka.stream.scaladsl.{RestartSource, Sink, Source}
+import org.apache.pekko.stream.{Materializer, RestartSettings}
+import org.apache.pekko.stream.scaladsl.{RestartSource, Sink, Source}
 
 import scala.concurrent.Future
 import scala.concurrent.duration._

diff --git a/...pter/calm_api_client/src/test/scala/weco/pipeline/calm_api_client/CalmApiClientTest.scala b/...pter/calm_api_client/src/test/scala/weco/pipeline/calm_api_client/CalmApiClientTest.scala
@@ -1,9 +1,9 @@
 package weco.pipeline.calm_api_client
 
 import java.time.LocalDate
-import akka.Done
-import akka.http.scaladsl.model.HttpResponse
-import akka.http.scaladsl.model.headers.{
+import org.apache.pekko.Done
+import org.apache.pekko.http.scaladsl.model.HttpResponse
+import org.apache.pekko.http.scaladsl.model.headers.{
   Authorization,
   BasicHttpCredentials,
   Cookie,

diff --git a/...er/calm_api_client/src/test/scala/weco/pipeline/calm_api_client/CalmXmlResponseTest.scala b/...er/calm_api_client/src/test/scala/weco/pipeline/calm_api_client/CalmXmlResponseTest.scala
@@ -4,7 +4,7 @@ import java.time.Instant
 
 import org.scalatest.funspec.AnyFunSpec
 import org.scalatest.matchers.should.Matchers
-import akka.http.scaladsl.model.headers.{Cookie, HttpCookiePair}
+import org.apache.pekko.http.scaladsl.model.headers.{Cookie, HttpCookiePair}
 import weco.catalogue.source_model.calm.CalmRecord
 
 class CalmXmlResponseTest extends AnyFunSpec with Matchers {

diff --git a/...dapter/calm_api_client/src/test/scala/weco/pipeline/calm_api_client/RetryFutureTest.scala b/...dapter/calm_api_client/src/test/scala/weco/pipeline/calm_api_client/RetryFutureTest.scala
@@ -1,10 +1,10 @@
 package weco.pipeline.calm_api_client
 
-import akka.stream.RestartSettings
+import org.apache.pekko.stream.RestartSettings
 import org.scalatest.concurrent.{IntegrationPatience, ScalaFutures}
 import org.scalatest.funspec.AnyFunSpec
 import org.scalatest.matchers.should.Matchers
-import weco.akka.fixtures.Akka
+import weco.pekko.fixtures.Pekko
 
 import scala.concurrent.duration._
 import scala.concurrent.Future
@@ -13,7 +13,7 @@ class RetryFutureTest
     extends AnyFunSpec
     with Matchers
     with ScalaFutures
-    with Akka
+    with Pekko
     with IntegrationPatience {
 
   val maxRetries = 5

diff --git a/..._client/src/test/scala/weco/pipeline/calm_api_client/fixtures/CalmApiClientFixtures.scala b/..._client/src/test/scala/weco/pipeline/calm_api_client/fixtures/CalmApiClientFixtures.scala
@@ -1,10 +1,10 @@
 package weco.pipeline.calm_api_client.fixtures
 
-import akka.Done
-import akka.http.scaladsl.model.headers.Cookie
-import akka.http.scaladsl.model.{HttpRequest, HttpResponse}
-import akka.stream.Materializer
-import weco.akka.fixtures.Akka
+import org.apache.pekko.Done
+import org.apache.pekko.http.scaladsl.model.headers.Cookie
+import org.apache.pekko.http.scaladsl.model.{HttpRequest, HttpResponse}
+import org.apache.pekko.stream.Materializer
+import weco.pekko.fixtures.Pekko
 import weco.fixtures.TestWith
 import weco.pipeline.calm_api_client._
 import weco.catalogue.source_model.calm.CalmRecord
@@ -25,7 +25,7 @@ import scala.concurrent.{ExecutionContext, Future}
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration._
 
-trait CalmApiClientFixtures extends Akka {
+trait CalmApiClientFixtures extends Pekko {
   val url = "calm.api"
   val username = "calm-user"
   val password = "calm-password"

diff --git a/...client/src/test/scala/weco/pipeline/calm_api_client/fixtures/CalmResponseGenerators.scala b/...client/src/test/scala/weco/pipeline/calm_api_client/fixtures/CalmResponseGenerators.scala
@@ -2,8 +2,8 @@ package weco.pipeline.calm_api_client.fixtures
 
 import java.time.Instant
 
-import akka.http.scaladsl.model.{DateTime, HttpProtocols, HttpResponse}
-import akka.http.scaladsl.model.headers.{`Set-Cookie`, Date, HttpCookie}
+import org.apache.pekko.http.scaladsl.model.{DateTime, HttpProtocols, HttpResponse}
+import org.apache.pekko.http.scaladsl.model.headers.{`Set-Cookie`, Date, HttpCookie}
 
 import scala.xml.XML
 

diff --git a/...ker/src/main/scala/weco/pipeline/calm_deletion_checker/DeletionCheckerWorkerService.scala b/...ker/src/main/scala/weco/pipeline/calm_deletion_checker/DeletionCheckerWorkerService.scala
@@ -1,7 +1,7 @@
 package weco.pipeline.calm_deletion_checker
 
-import akka.Done
-import akka.stream.scaladsl.{Flow, Keep}
+import org.apache.pekko.Done
+import org.apache.pekko.stream.scaladsl.{Flow, Keep}
 import software.amazon.awssdk.services.sqs.model.Message
 import weco.messaging.MessageSender
 import weco.messaging.sns.NotificationMessage

diff --git a/...apter/calm_deletion_checker/src/main/scala/weco/pipeline/calm_deletion_checker/Main.scala b/...apter/calm_deletion_checker/src/main/scala/weco/pipeline/calm_deletion_checker/Main.scala
@@ -1,12 +1,12 @@
 package weco.pipeline.calm_deletion_checker
 
-import akka.actor.ActorSystem
+import org.apache.pekko.actor.ActorSystem
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient
 import weco.messaging.typesafe.{SNSBuilder, SQSBuilder}
 import weco.storage.typesafe.DynamoBuilder
 import weco.typesafe.WellcomeTypesafeApp
 import weco.typesafe.config.builders.EnrichConfig._
-import weco.pipeline.calm_api_client.AkkaHttpCalmApiClient
+import weco.pipeline.calm_api_client.PekkoHttpCalmApiClient
 
 import scala.concurrent.ExecutionContext
 
@@ -28,7 +28,7 @@ object Main extends WellcomeTypesafeApp {
         messageSender = SNSBuilder
           .buildSNSMessageSender(config, subject = "CALM deletion checker"),
         markDeleted = new DeletionMarker(dynamoConfig.tableName),
-        calmApiClient = new AkkaHttpCalmApiClient(
+        calmApiClient = new PekkoHttpCalmApiClient(
           url = config.requireString("calm.api.url"),
           username = config.requireString("calm.api.username"),
           password = config.requireString("calm.api.password")

diff --git a/calm_adapter/calm_deletion_checker/src/test/resources/logback-test.xml b/calm_adapter/calm_deletion_checker/src/test/resources/logback-test.xml
@@ -20,6 +20,6 @@
     <logger name="io.netty" level="OFF"/>
     <logger name="com.amazonaws" level="OFF"/>
     <logger name="software.amazon.awssdk" level="OFF"/>
-    <logger name="akka.actor" level="OFF"/>
+    <logger name="org.apache.pekko.actor" level="OFF"/>
     <logger name="com.sksamuel.elastic4s" level="OFF"/>
 </configuration>
diff --git a/...ion_checker/src/test/scala/weco/pipeline/calm_deletion_checker/DefectiveCheckerTest.scala b/...ion_checker/src/test/scala/weco/pipeline/calm_deletion_checker/DefectiveCheckerTest.scala
@@ -1,8 +1,8 @@
 package weco.pipeline.calm_deletion_checker
 
 import java.util.concurrent.ConcurrentHashMap
-import akka.Done
-import akka.http.scaladsl.model.headers.Cookie
+import org.apache.pekko.Done
+import org.apache.pekko.http.scaladsl.model.headers.Cookie
 import org.scalacheck.{Gen, Shrink}
 import org.scalatest.concurrent.{PatienceConfiguration, ScalaFutures}
 import org.scalatest.funspec.AnyFunSpec

diff --git a/...src/test/scala/weco/pipeline/calm_deletion_checker/DeletionCheckerWorkerServiceTest.scala b/...src/test/scala/weco/pipeline/calm_deletion_checker/DeletionCheckerWorkerServiceTest.scala
@@ -1,7 +1,7 @@
 package weco.pipeline.calm_deletion_checker
 
-import akka.Done
-import akka.http.scaladsl.model.headers.Cookie
+import org.apache.pekko.Done
+import org.apache.pekko.http.scaladsl.model.headers.Cookie
 import org.scalatest.EitherValues
 import org.scalatest.funspec.AnyFunSpec
 import org.scalatest.matchers.should.Matchers

diff --git a/calm_adapter/calm_indexer/src/main/scala/weco/pipeline/calm_indexer/Main.scala b/calm_adapter/calm_indexer/src/main/scala/weco/pipeline/calm_indexer/Main.scala
@@ -1,6 +1,6 @@
 package weco.pipeline.calm_indexer
 
-import akka.actor.ActorSystem
+import org.apache.pekko.actor.ActorSystem
 import com.sksamuel.elastic4s.{ElasticClient, Index}
 import software.amazon.awssdk.services.s3.S3Client
 import weco.catalogue.source_model.calm.CalmRecord

diff --git a/calm_adapter/calm_indexer/src/test/resources/logback-test.xml b/calm_adapter/calm_indexer/src/test/resources/logback-test.xml
@@ -20,6 +20,6 @@
   <logger name="io.netty" level="OFF"/>
   <logger name="com.amazonaws" level="OFF"/>
   <logger name="software.amazon.awssdk" level="OFF"/>
-  <logger name="akka.actor" level="OFF"/>
+  <logger name="org.apache.pekko.actor" level="OFF"/>
   <logger name="com.sksamuel.elastic4s" level="OFF"/>
 </configuration>
diff --git a/...ter/calm_indexer/src/test/scala/weco/pipeline/calm_indexer/fixtures/IndexerFixtures.scala b/...ter/calm_indexer/src/test/scala/weco/pipeline/calm_indexer/fixtures/IndexerFixtures.scala
@@ -5,7 +5,7 @@ import com.sksamuel.elastic4s.requests.get.GetResponse
 import com.sksamuel.elastic4s.{Index, Response}
 import org.scalatest.concurrent.{Eventually, IntegrationPatience}
 import org.scalatest.{Assertion, Suite}
-import weco.akka.fixtures.Akka
+import weco.pekko.fixtures.Pekko
 import weco.catalogue.source_model.calm.CalmRecord
 import weco.elasticsearch.test.fixtures.ElasticsearchFixtures
 import weco.fixtures.TestWith
@@ -22,7 +22,7 @@ trait IndexerFixtures
     extends ElasticsearchFixtures
     with Eventually
     with IntegrationPatience
-    with Akka
+    with Pekko
     with SQS { this: Suite =>
   def withWorker[R](
     queue: Queue,

diff --git a/common/flows/src/main/scala/weco/flows/FlowOps.scala b/common/flows/src/main/scala/weco/flows/FlowOps.scala
@@ -3,9 +3,9 @@ package weco.flows
 import grizzled.slf4j.Logging
 
 import scala.concurrent.{ExecutionContext, Future}
-import akka.NotUsed
-import akka.stream.FlowShape
-import akka.stream.scaladsl.{Broadcast, Flow, GraphDSL, Merge}
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.FlowShape
+import org.apache.pekko.stream.scaladsl.{Broadcast, Flow, GraphDSL, Merge}
 
 trait FlowOps extends Logging {
 

diff --git a/common/pipeline_storage/src/main/scala/weco/pipeline_storage/PipelineStorageStream.scala b/common/pipeline_storage/src/main/scala/weco/pipeline_storage/PipelineStorageStream.scala
@@ -1,7 +1,7 @@
 package weco.pipeline_storage
 
-import akka.stream.scaladsl.Flow
-import akka.{Done, NotUsed}
+import org.apache.pekko.stream.scaladsl.Flow
+import org.apache.pekko.{Done, NotUsed}
 import grizzled.slf4j.Logging
 import io.circe.Decoder
 import software.amazon.awssdk.services.sqs.model.Message

diff --git a/common/pipeline_storage/src/test/resources/logback-test.xml b/common/pipeline_storage/src/test/resources/logback-test.xml
@@ -20,6 +20,6 @@
   <logger name="io.netty" level="OFF"/>
   <logger name="com.amazonaws" level="OFF"/>
   <logger name="software.amazon.awssdk" level="OFF"/>
-  <logger name="akka.actor" level="OFF"/>
+  <logger name="org.apache.pekko.actor" level="OFF"/>
   <logger name="com.sksamuel.elastic4s" level="OFF"/>
 </configuration>