Skip to content

Commit 8e69392

Browse files
Reconsider akka-http -> pekko-http versioning
1 parent f6d5321 commit 8e69392

File tree

3 files changed

+12
-19
lines changed

3 files changed

+12
-19
lines changed

modules/scala-pekko-http/src/main/scala/dev/guardrail/generators/scala/pekkoHttp/PekkoHttpGenerator.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,8 @@ class PekkoHttpGenerator private (pekkoHttpVersion: PekkoHttpVersion, modelGener
427427
(
428428
413,
429429
pekkoHttpVersion match {
430-
case PekkoHttpVersion.V10_1 => q"RequestEntityTooLarge"
431-
case PekkoHttpVersion.V10_2 => q"PayloadTooLarge"
430+
case PekkoHttpVersion.V1_0_0 => q"PayloadTooLarge"
431+
case PekkoHttpVersion.V1_1_0 => q"ContentTooLarge"
432432
}
433433
)
434434
)

modules/scala-pekko-http/src/main/scala/dev/guardrail/generators/scala/pekkoHttp/PekkoHttpServerGenerator.scala

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -804,19 +804,12 @@ class PekkoHttpServerGenerator private (pekkoHttpVersion: PekkoHttpVersion, mode
804804
part.entity.dataBytes.toMat(fileSink)(Keep.right).run()
805805
.transform(${Term.PartialFunction(
806806
List(
807-
if (pekkoHttpVersion == PekkoHttpVersion.V10_1)
808-
Some(p"""
809-
case IOResult(_, Failure(t)) =>
810-
dest.delete()
811-
throw t
812-
""")
813-
else None,
814-
Some(p"""
807+
p"""
815808
case IOResult(_, _) =>
816809
val hash = messageDigest.map(md => javax.xml.bind.DatatypeConverter.printHexBinary(md.digest()).toLowerCase(java.util.Locale.US))
817810
(dest, part.filename, part.entity.contentType, hash)
818-
""")
819-
).flatten
811+
"""
812+
)
820813
)}, { case t =>
821814
dest.delete()
822815
t
@@ -842,8 +835,8 @@ class PekkoHttpServerGenerator private (pekkoHttpVersion: PekkoHttpVersion, mode
842835
}
843836
val info = new ErrorInfo(summary, "Consider increasing the value of pekko.http.server.parsing.max-content-length")
844837
val status = ${pekkoHttpVersion match {
845-
case PekkoHttpVersion.V10_1 => q"StatusCodes.RequestEntityTooLarge"
846-
case PekkoHttpVersion.V10_2 => q"StatusCodes.PayloadTooLarge"
838+
case PekkoHttpVersion.V1_0_0 => q"StatusCodes.PayloadTooLarge"
839+
case PekkoHttpVersion.V1_1_0 => q"StatusCodes.ContentTooLarge"
847840
}}
848841
val msg = if (settings.verboseErrorMessages) info.formatPretty else info.summary
849842
complete(HttpResponse(status, entity = msg))

modules/scala-pekko-http/src/main/scala/dev/guardrail/generators/scala/pekkoHttp/PekkoHttpVersion.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ package dev.guardrail.generators.scala.pekkoHttp
22

33
sealed abstract class PekkoHttpVersion(val value: String)
44
object PekkoHttpVersion {
5-
case object V10_1 extends PekkoHttpVersion("pekko-http-v10.1")
6-
case object V10_2 extends PekkoHttpVersion("pekko-http-v10.2")
5+
case object V1_0_0 extends PekkoHttpVersion("pekko-http-v1.0.0")
6+
case object V1_1_0 extends PekkoHttpVersion("pekko-http-v1.1.0")
77

88
val mapping: Map[String, PekkoHttpVersion] = Map(
9-
"pekko-http" -> V10_2,
10-
V10_1.value -> V10_1,
11-
V10_2.value -> V10_2
9+
"pekko-http" -> V1_1_0,
10+
V1_0_0.value -> V1_0_0,
11+
V1_1_0.value -> V1_1_0
1212
)
1313
}

0 commit comments

Comments
 (0)