Skip to content
This repository was archived by the owner on Oct 10, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ lazy val root = (project in file("."))
scalacOptions in IntegrationTest := (scalacOptions in Compile).value.filterNot(_ == "-Ywarn-dead-code")
)

val akkaVersion = "2.5.31"
val akkaVersion = "2.6.4"
val akkaHttpVersion = "10.1.11"

lazy val akkaDependencies = Seq(
Expand All @@ -44,7 +44,7 @@ lazy val awsDependencies = Seq(
lazy val testDependencies = Seq(
"org.scalatest" %% "scalatest" % "3.1.1" % Test,
"org.mockito" %% "mockito-scala" % "1.13.9" % Test,
"org.mock-server" % "mockserver-netty" % "5.10.0" % Test
"org.mock-server" % "mockserver-netty" % "5.10.0" % Test
)

lazy val loggingDependencies = Seq(
Expand Down
2 changes: 0 additions & 2 deletions src/it/scala/io/moia/scalaHttpClient/HeaderExample.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import akka.actor.ActorSystem
import akka.http.scaladsl.model._
import akka.http.scaladsl.model.headers.{ModeledCustomHeader, ModeledCustomHeaderCompanion}
import akka.http.scaladsl.unmarshalling.{Unmarshal, Unmarshaller}
import akka.stream.ActorMaterializer
import io.moia.scalaHttpClient.ExampleModel.{DomainErrorObject, GatewayException, MySuccessObject}

import scala.concurrent.duration._
Expand All @@ -28,7 +27,6 @@ object HeaderExample {

implicit val system: ActorSystem = ActorSystem("test")
implicit val executionContext: ExecutionContext = system.dispatcher
implicit val mat: ActorMaterializer = ActorMaterializer()
implicit val um1: Unmarshaller[HttpResponse, MySuccessObject] = ???
implicit val um2: Unmarshaller[HttpResponse, DomainErrorObject] = ???

Expand Down
2 changes: 0 additions & 2 deletions src/it/scala/io/moia/scalaHttpClient/SimpleExample.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import java.time.Clock
import akka.actor.ActorSystem
import akka.http.scaladsl.model._
import akka.http.scaladsl.unmarshalling.{Unmarshal, Unmarshaller}
import akka.stream.ActorMaterializer
import io.moia.scalaHttpClient.ExampleModel.{DomainErrorObject, GatewayException, MySuccessObject}

import scala.concurrent.duration._
Expand All @@ -21,7 +20,6 @@ object SimpleExample {

implicit val system: ActorSystem = ActorSystem("test")
implicit val executionContext: ExecutionContext = system.dispatcher
implicit val mat: ActorMaterializer = ActorMaterializer()
implicit val um1: Unmarshaller[HttpResponse, MySuccessObject] = ???
implicit val um2: Unmarshaller[HttpResponse, DomainErrorObject] = ???

Expand Down
5 changes: 1 addition & 4 deletions src/main/scala/io/moia/scalaHttpClient/HttpClient.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import akka.actor.ActorSystem
import akka.http.scaladsl.Http
import akka.http.scaladsl.model._
import akka.http.scaladsl.model.headers.{`Retry-After`, RetryAfterDateTime, RetryAfterDuration}
import akka.stream.ActorMaterializer
import com.typesafe.scalalogging.{Logger, LoggerTakingImplicit}
import org.slf4j.LoggerFactory

Expand Down Expand Up @@ -128,10 +127,8 @@ abstract class HttpLayer[LoggingContext](
case other => Future.successful(HttpClientError(other))
}

private[this] def strictify(response: HttpResponse)(implicit ec: ExecutionContext): Future[HttpResponse] = {
implicit val materializer: ActorMaterializer = ActorMaterializer()
private[this] def strictify(response: HttpResponse)(implicit ec: ExecutionContext): Future[HttpResponse] =
response.toStrict(retryConfig.strictifyResponseTimeout)
}

private[this] def retryCount(statusCode: StatusCode)(implicit ctx: LoggingContext): Int = statusCode match {
case StatusCodes.RequestTimeout => retryConfig.retriesRequestTimeout
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package io.moia.scalaHttpClient
import akka.actor.ActorSystem
import akka.http.scaladsl.model.HttpHeader.ParsingResult.Ok
import akka.http.scaladsl.model.{HttpHeader, HttpRequest, Uri}
import akka.stream.ActorMaterializer
import io.moia.scalaHttpClient.AwsRequestSigner.AwsRequestSignerConfig
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpecLike
Expand All @@ -12,7 +11,6 @@ import scala.concurrent.duration.{FiniteDuration, _}

class AwsRequestSignerTest extends AnyWordSpecLike with Matchers with FutureValues {
private implicit val system: ActorSystem = ActorSystem("test")
private implicit val mat: ActorMaterializer = ActorMaterializer()
protected implicit val patienceConfig: FiniteDuration = 2.seconds

classOf[AwsRequestSigner].getSimpleName should {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import akka.actor.ActorSystem
import akka.http.scaladsl.model.HttpHeader.ParsingResult.Ok
import akka.http.scaladsl.model.headers.Host
import akka.http.scaladsl.model.{HttpHeader, HttpRequest, Uri}
import akka.stream.ActorMaterializer
import com.amazonaws.auth.{AWS4Signer, BasicAWSCredentials}
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpecLike
Expand All @@ -17,7 +16,6 @@ import scala.concurrent.ExecutionContext

class SignableHttpRequestTest extends AnyWordSpecLike with Matchers with FutureValues {
private implicit def system: ActorSystem = ActorSystem("test")
private implicit val mat: ActorMaterializer = ActorMaterializer()
private implicit def executionContext: ExecutionContext = system.dispatcher
private val amzDateFormat = DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmssX")

Expand Down
2 changes: 0 additions & 2 deletions src/test/scala/io/moia/scalaHttpClient/TestSetup.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@ import java.time.Clock

import akka.actor.ActorSystem
import akka.http.scaladsl.model.{HttpMethod, HttpResponse, Uri}
import akka.stream.ActorMaterializer
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpecLike

import scala.concurrent.ExecutionContext

trait TestSetup extends AnyWordSpecLike with Matchers with FutureValues {
implicit val system: ActorSystem = ActorSystem("test")
implicit val mat: ActorMaterializer = ActorMaterializer()
implicit val executionContext: ExecutionContext = system.dispatcher

val clock: Clock = Clock.systemUTC()
Expand Down