Skip to content
This repository was archived by the owner on Oct 10, 2023. It is now read-only.

Commit f497951

Browse files
moia-pipelinescala-stewardsaeltz
authored
Update akka-stream, akka-testkit to 2.6.4 (#16)
* Update akka-stream, akka-testkit to 2.6.4 * Remove ActorMaterializer Co-authored-by: Scala Steward <43047562+scala-steward@users.noreply.github.com> Co-authored-by: Bendix Saeltz <bendix@saeltz.de>
1 parent 0b71893 commit f497951

File tree

7 files changed

+3
-16
lines changed

7 files changed

+3
-16
lines changed

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ lazy val root = (project in file("."))
2525
scalacOptions in IntegrationTest := (scalacOptions in Compile).value.filterNot(_ == "-Ywarn-dead-code")
2626
)
2727

28-
val akkaVersion = "2.5.31"
28+
val akkaVersion = "2.6.4"
2929
val akkaHttpVersion = "10.1.11"
3030

3131
lazy val akkaDependencies = Seq(
@@ -44,7 +44,7 @@ lazy val awsDependencies = Seq(
4444
lazy val testDependencies = Seq(
4545
"org.scalatest" %% "scalatest" % "3.1.1" % Test,
4646
"org.mockito" %% "mockito-scala" % "1.13.9" % Test,
47-
"org.mock-server" % "mockserver-netty" % "5.10.0" % Test
47+
"org.mock-server" % "mockserver-netty" % "5.10.0" % Test
4848
)
4949

5050
lazy val loggingDependencies = Seq(

src/it/scala/io/moia/scalaHttpClient/HeaderExample.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import akka.actor.ActorSystem
66
import akka.http.scaladsl.model._
77
import akka.http.scaladsl.model.headers.{ModeledCustomHeader, ModeledCustomHeaderCompanion}
88
import akka.http.scaladsl.unmarshalling.{Unmarshal, Unmarshaller}
9-
import akka.stream.ActorMaterializer
109
import io.moia.scalaHttpClient.ExampleModel.{DomainErrorObject, GatewayException, MySuccessObject}
1110

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

2928
implicit val system: ActorSystem = ActorSystem("test")
3029
implicit val executionContext: ExecutionContext = system.dispatcher
31-
implicit val mat: ActorMaterializer = ActorMaterializer()
3230
implicit val um1: Unmarshaller[HttpResponse, MySuccessObject] = ???
3331
implicit val um2: Unmarshaller[HttpResponse, DomainErrorObject] = ???
3432

src/it/scala/io/moia/scalaHttpClient/SimpleExample.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import java.time.Clock
55
import akka.actor.ActorSystem
66
import akka.http.scaladsl.model._
77
import akka.http.scaladsl.unmarshalling.{Unmarshal, Unmarshaller}
8-
import akka.stream.ActorMaterializer
98
import io.moia.scalaHttpClient.ExampleModel.{DomainErrorObject, GatewayException, MySuccessObject}
109

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

2221
implicit val system: ActorSystem = ActorSystem("test")
2322
implicit val executionContext: ExecutionContext = system.dispatcher
24-
implicit val mat: ActorMaterializer = ActorMaterializer()
2523
implicit val um1: Unmarshaller[HttpResponse, MySuccessObject] = ???
2624
implicit val um2: Unmarshaller[HttpResponse, DomainErrorObject] = ???
2725

src/main/scala/io/moia/scalaHttpClient/HttpClient.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import akka.actor.ActorSystem
66
import akka.http.scaladsl.Http
77
import akka.http.scaladsl.model._
88
import akka.http.scaladsl.model.headers.{`Retry-After`, RetryAfterDateTime, RetryAfterDuration}
9-
import akka.stream.ActorMaterializer
109
import com.typesafe.scalalogging.{Logger, LoggerTakingImplicit}
1110
import org.slf4j.LoggerFactory
1211

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

131-
private[this] def strictify(response: HttpResponse)(implicit ec: ExecutionContext): Future[HttpResponse] = {
132-
implicit val materializer: ActorMaterializer = ActorMaterializer()
130+
private[this] def strictify(response: HttpResponse)(implicit ec: ExecutionContext): Future[HttpResponse] =
133131
response.toStrict(retryConfig.strictifyResponseTimeout)
134-
}
135132

136133
private[this] def retryCount(statusCode: StatusCode)(implicit ctx: LoggingContext): Int = statusCode match {
137134
case StatusCodes.RequestTimeout => retryConfig.retriesRequestTimeout

src/test/scala/io/moia/scalaHttpClient/AwsRequestSignerTest.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package io.moia.scalaHttpClient
33
import akka.actor.ActorSystem
44
import akka.http.scaladsl.model.HttpHeader.ParsingResult.Ok
55
import akka.http.scaladsl.model.{HttpHeader, HttpRequest, Uri}
6-
import akka.stream.ActorMaterializer
76
import io.moia.scalaHttpClient.AwsRequestSigner.AwsRequestSignerConfig
87
import org.scalatest.matchers.should.Matchers
98
import org.scalatest.wordspec.AnyWordSpecLike
@@ -12,7 +11,6 @@ import scala.concurrent.duration.{FiniteDuration, _}
1211

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

1816
classOf[AwsRequestSigner].getSimpleName should {

src/test/scala/io/moia/scalaHttpClient/SignableHttpRequestTest.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import akka.actor.ActorSystem
88
import akka.http.scaladsl.model.HttpHeader.ParsingResult.Ok
99
import akka.http.scaladsl.model.headers.Host
1010
import akka.http.scaladsl.model.{HttpHeader, HttpRequest, Uri}
11-
import akka.stream.ActorMaterializer
1211
import com.amazonaws.auth.{AWS4Signer, BasicAWSCredentials}
1312
import org.scalatest.matchers.should.Matchers
1413
import org.scalatest.wordspec.AnyWordSpecLike
@@ -17,7 +16,6 @@ import scala.concurrent.ExecutionContext
1716

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

src/test/scala/io/moia/scalaHttpClient/TestSetup.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@ import java.time.Clock
44

55
import akka.actor.ActorSystem
66
import akka.http.scaladsl.model.{HttpMethod, HttpResponse, Uri}
7-
import akka.stream.ActorMaterializer
87
import org.scalatest.matchers.should.Matchers
98
import org.scalatest.wordspec.AnyWordSpecLike
109

1110
import scala.concurrent.ExecutionContext
1211

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

1816
val clock: Clock = Clock.systemUTC()

0 commit comments

Comments
 (0)