From e589956664ac9ca3b4e823373731d9e926a6e2a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Brychta?= Date: Wed, 17 Jul 2024 13:44:43 +0100 Subject: [PATCH] Replace akkahttpcirce with pekkohttpcirce (#2678) --- .../weco/storage_service/bag_tracker/BagTrackerApi.scala | 2 +- .../storage_service/bag_tracker/client/BagTrackerClient.scala | 2 +- .../weco/storage_service/bag_tracker/services/GetBag.scala | 2 +- .../storage_service/bag_tracker/services/GetLatestBag.scala | 2 +- .../bag_tracker/services/LookupBagVersions.scala | 2 +- indexer/bag_indexer/src/main/resources/application.conf | 2 +- indexer/bag_indexer/src/test/resources/logback-test.xml | 4 ++-- .../storage_service/ingests_api/CreateIngestApiTest.scala | 2 +- .../storage_service/ingests_tracker/IngestsTrackerApi.scala | 2 +- .../ingests_tracker/client/IngestTrackerClient.scala | 2 +- 10 files changed, 11 insertions(+), 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 index c509b8fcd9..53352a7b0d 100644 --- 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 index 0d4a24ef3f..e309fc445f 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 @@ -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 index b9d746da5c..892ee578f8 100644 --- 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 index 18cafd5b78..e8a6daadb3 100644 --- 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 index 7e14a2d4b5..14b9d4f7f9 100644 --- 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 index f51dd6041c..d77ff95e08 100644 --- 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 index 753b606e8d..66d21f8251 100644 --- a/indexer/bag_indexer/src/test/resources/logback-test.xml +++ b/indexer/bag_indexer/src/test/resources/logback-test.xml @@ -15,6 +15,6 @@ - - + + diff --git a/ingests/ingests_api/src/test/scala/weco/storage_service/ingests_api/CreateIngestApiTest.scala b/ingests/ingests_api/src/test/scala/weco/storage_service/ingests_api/CreateIngestApiTest.scala index cac5064a9a..13fcc52e6e 100644 --- a/ingests/ingests_api/src/test/scala/weco/storage_service/ingests_api/CreateIngestApiTest.scala +++ b/ingests/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/ingests/ingests_tracker/src/main/scala/weco/storage_service/ingests_tracker/IngestsTrackerApi.scala b/ingests/ingests_tracker/src/main/scala/weco/storage_service/ingests_tracker/IngestsTrackerApi.scala index a489ae2cd1..a0a2cca8c8 100644 --- a/ingests/ingests_tracker/src/main/scala/weco/storage_service/ingests_tracker/IngestsTrackerApi.scala +++ b/ingests/ingests_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/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 b2dfe67e56..e58f4d2a4a 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 @@ -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}