Replace akkahttpcirce with pekkohttpcirce (#2678)

wellcomecollection · Jul 17, 2024 · e589956 · e589956
1 parent 01ff954
commit e589956
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/bag_tracker/src/main/scala/weco/storage_service/bag_tracker/BagTrackerApi.scala b/bag_tracker/src/main/scala/weco/storage_service/bag_tracker/BagTrackerApi.scala
@@ -4,7 +4,7 @@ import org.apache.pekko.actor.ActorSystem
 import org.apache.pekko.http.scaladsl.Http
 import org.apache.pekko.http.scaladsl.server.Directives._
 import org.apache.pekko.http.scaladsl.server.Route
-import de.heikoseeberger.akkahttpcirce.ErrorAccumulatingCirceSupport._
+import com.github.pjfanning.pekkohttpcirce.ErrorAccumulatingCirceSupport._
 import grizzled.slf4j.Logging
 import weco.json.JsonUtil._
 import weco.storage_service.bag_tracker.services.{

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
@@ -5,7 +5,7 @@ import org.apache.pekko.http.scaladsl.model.Uri.Path
 import org.apache.pekko.http.scaladsl.model._
 import org.apache.pekko.http.scaladsl.unmarshalling.{Unmarshal, Unmarshaller}
 import org.apache.pekko.stream.{Materializer, StreamTcpException}
-import de.heikoseeberger.akkahttpcirce.ErrorAccumulatingCirceSupport._
+import com.github.pjfanning.pekkohttpcirce.ErrorAccumulatingCirceSupport._
 import grizzled.slf4j.Logging
 import weco.json.JsonUtil._
 import weco.storage_service.bag_tracker.models.BagVersionList

diff --git a/bag_tracker/src/main/scala/weco/storage_service/bag_tracker/services/GetBag.scala b/bag_tracker/src/main/scala/weco/storage_service/bag_tracker/services/GetBag.scala
@@ -3,7 +3,7 @@ package weco.storage_service.bag_tracker.services
 import org.apache.pekko.http.scaladsl.model.StatusCodes
 import org.apache.pekko.http.scaladsl.server.Directives.complete
 import org.apache.pekko.http.scaladsl.server.Route
-import de.heikoseeberger.akkahttpcirce.ErrorAccumulatingCirceSupport._
+import com.github.pjfanning.pekkohttpcirce.ErrorAccumulatingCirceSupport._
 import grizzled.slf4j.Logging
 import weco.json.JsonUtil._
 import weco.storage_service.bag_tracker.storage.StorageManifestDao

diff --git a/bag_tracker/src/main/scala/weco/storage_service/bag_tracker/services/GetLatestBag.scala b/bag_tracker/src/main/scala/weco/storage_service/bag_tracker/services/GetLatestBag.scala
@@ -3,7 +3,7 @@ package weco.storage_service.bag_tracker.services
 import org.apache.pekko.http.scaladsl.model.StatusCodes
 import org.apache.pekko.http.scaladsl.server.Directives.complete
 import org.apache.pekko.http.scaladsl.server.Route
-import de.heikoseeberger.akkahttpcirce.ErrorAccumulatingCirceSupport._
+import com.github.pjfanning.pekkohttpcirce.ErrorAccumulatingCirceSupport._
 import grizzled.slf4j.Logging
 import weco.json.JsonUtil._
 import weco.storage_service.bag_tracker.storage.StorageManifestDao

diff --git a/bag_tracker/src/main/scala/weco/storage_service/bag_tracker/services/LookupBagVersions.scala b/bag_tracker/src/main/scala/weco/storage_service/bag_tracker/services/LookupBagVersions.scala
@@ -3,7 +3,7 @@ package weco.storage_service.bag_tracker.services
 import org.apache.pekko.http.scaladsl.model.StatusCodes
 import org.apache.pekko.http.scaladsl.server.Directives.complete
 import org.apache.pekko.http.scaladsl.server.Route
-import de.heikoseeberger.akkahttpcirce.ErrorAccumulatingCirceSupport._
+import com.github.pjfanning.pekkohttpcirce.ErrorAccumulatingCirceSupport._
 import grizzled.slf4j.Logging
 import weco.json.JsonUtil._
 import weco.storage_service.bag_tracker.models.{BagVersionEntry, BagVersionList}

diff --git a/indexer/bag_indexer/src/main/resources/application.conf b/indexer/bag_indexer/src/main/resources/application.conf
@@ -7,7 +7,7 @@ es.username=${?es_username}
 es.password=${?es_password}
 es.protocol=${?es_protocol}
 es.bags.index-name=${?es_bags_index_name}
-akka {
+pekko {
   http.server.request-timeout=60s
   # The maximum serialised size of a bag is ~200000000
   # At time of writing this digitised/b19974760 (Chemist & Druggist)

diff --git a/indexer/bag_indexer/src/test/resources/logback-test.xml b/indexer/bag_indexer/src/test/resources/logback-test.xml
@@ -15,6 +15,6 @@
   <logger name="com.amazonaws" level="WARN"/>
   <logger name="software.amazon.awssdk" level="WARN"/>
 
-  <!-- This class logs the merged Akka config at INFO level -->
-  <logger name="pekko.actor.ActorSystemImpl" level="WARN"/>
+  <!-- This class logs the merged Pekko config at INFO level -->
+  <logger name="org.apache.pekko.actor.ActorSystemImpl" level="WARN"/>
 </configuration>
diff --git a/...sts/ingests_api/src/test/scala/weco/storage_service/ingests_api/CreateIngestApiTest.scala b/...sts/ingests_api/src/test/scala/weco/storage_service/ingests_api/CreateIngestApiTest.scala
@@ -5,7 +5,7 @@ import java.util.UUID
 
 import org.apache.pekko.http.scaladsl.model._
 import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal
-import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport._
+import com.github.pjfanning.pekkohttpcirce.FailFastCirceSupport._
 import io.circe.Json
 import io.circe.optics.JsonPath.root
 import io.circe.parser._

diff --git a/...gests_tracker/src/main/scala/weco/storage_service/ingests_tracker/IngestsTrackerApi.scala b/...gests_tracker/src/main/scala/weco/storage_service/ingests_tracker/IngestsTrackerApi.scala
@@ -5,7 +5,7 @@ import org.apache.pekko.http.scaladsl.Http
 import org.apache.pekko.http.scaladsl.model._
 import org.apache.pekko.http.scaladsl.server.Directives.{get, _}
 import org.apache.pekko.http.scaladsl.server.Route
-import de.heikoseeberger.akkahttpcirce.ErrorAccumulatingCirceSupport._
+import com.github.pjfanning.pekkohttpcirce.ErrorAccumulatingCirceSupport._
 import grizzled.slf4j.Logging
 import weco.json.JsonUtil._
 import weco.storage_service.ingests.models.{Ingest, IngestID, IngestUpdate}

diff --git a/...cker/src/main/scala/weco/storage_service/ingests_tracker/client/IngestTrackerClient.scala b/...cker/src/main/scala/weco/storage_service/ingests_tracker/client/IngestTrackerClient.scala
@@ -6,7 +6,7 @@ import org.apache.pekko.http.scaladsl.model.Uri.Path
 import org.apache.pekko.http.scaladsl.model._
 import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal
 import org.apache.pekko.stream.Materializer
-import de.heikoseeberger.akkahttpcirce.ErrorAccumulatingCirceSupport._
+import com.github.pjfanning.pekkohttpcirce.ErrorAccumulatingCirceSupport._
 import grizzled.slf4j.Logging
 import weco.json.JsonUtil._
 import weco.storage_service.ingests.models.{Ingest, IngestID, IngestUpdate}