Skip to content

Commit f6d5321

Browse files
Search/replace akka-http to pekko-http
1 parent 129670b commit f6d5321

38 files changed

+175
-175
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dev.guardrail.generators.scala.akkaHttp.AkkaHttpClientGeneratorLoader
1+
dev.guardrail.generators.scala.pekkoHttp.PekkoHttpClientGeneratorLoader
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dev.guardrail.generators.scala.akkaHttp.AkkaHttpGeneratorLoader
1+
dev.guardrail.generators.scala.pekkoHttp.PekkoHttpGeneratorLoader
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dev.guardrail.generators.scala.akkaHttp.AkkaHttpServerGeneratorLoader
1+
dev.guardrail.generators.scala.pekkoHttp.PekkoHttpServerGeneratorLoader

modules/scala-pekko-http/src/main/scala/dev/guardrail/generators/scala/akkaHttp/AkkaHttpVersion.scala

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.guardrail.generators.scala.akkaHttp
1+
package dev.guardrail.generators.scala.pekkoHttp
22

33
import _root_.io.swagger.v3.oas.models.Components
44
import _root_.io.swagger.v3.oas.models.PathItem.HttpMethod
@@ -35,27 +35,27 @@ import java.net.URI
3535
import scala.meta._
3636
import scala.reflect.runtime.universe.typeTag
3737

38-
class AkkaHttpClientGeneratorLoader extends ClientGeneratorLoader {
38+
class PekkoHttpClientGeneratorLoader extends ClientGeneratorLoader {
3939
type L = ScalaLanguage
4040
def reified = typeTag[Target[ScalaLanguage]]
4141
val apply = ModuleLoadResult.forProduct2(
42-
ClientGeneratorLoader.label -> Seq(AkkaHttpVersion.mapping),
42+
ClientGeneratorLoader.label -> Seq(PekkoHttpVersion.mapping),
4343
ProtocolGeneratorLoader.label -> Seq(
4444
CirceModelGenerator.mapping,
4545
CirceRefinedModelGenerator.mapping.view.mapValues(_.toCirce).toMap,
4646
JacksonModelGenerator.mapping
4747
)
4848
) { (_, collectionVersion) =>
49-
AkkaHttpClientGenerator(collectionVersion)
49+
PekkoHttpClientGenerator(collectionVersion)
5050
}
5151
}
5252

53-
object AkkaHttpClientGenerator {
53+
object PekkoHttpClientGenerator {
5454
def apply(modelGeneratorType: ModelGeneratorType): ClientTerms[ScalaLanguage, Target] =
55-
new AkkaHttpClientGenerator(modelGeneratorType)
55+
new PekkoHttpClientGenerator(modelGeneratorType)
5656
}
5757

58-
class AkkaHttpClientGenerator private (modelGeneratorType: ModelGeneratorType) extends ClientTerms[ScalaLanguage, Target] {
58+
class PekkoHttpClientGenerator private (modelGeneratorType: ModelGeneratorType) extends ClientTerms[ScalaLanguage, Target] {
5959
private def splitOperationParts(operationId: String): (List[String], String) = {
6060
val parts = operationId.split('.')
6161
(parts.drop(1).toList, parts.last)
@@ -500,7 +500,7 @@ class AkkaHttpClientGenerator private (modelGeneratorType: ModelGeneratorType) e
500500
param"mat: Materializer"
501501
)
502502
for {
503-
protocolImplicits <- AkkaHttpHelper.protocolImplicits(modelGeneratorType)
503+
protocolImplicits <- PekkoHttpHelper.protocolImplicits(modelGeneratorType)
504504
} yield List(
505505
Term.ParamClause(
506506
List(formatHost(serverUrls)) ++ (if (tracing)
@@ -547,7 +547,7 @@ class AkkaHttpClientGenerator private (modelGeneratorType: ModelGeneratorType) e
547547
}
548548

549549
for {
550-
protocolImplicits <- AkkaHttpHelper.protocolImplicits(modelGeneratorType)
550+
protocolImplicits <- PekkoHttpHelper.protocolImplicits(modelGeneratorType)
551551
args = List(
552552
Term.ParamClause(
553553
List(param"httpClient: HttpRequest => Future[HttpResponse]", formatHost(serverUrls)) ++ tracingParams,
@@ -635,7 +635,7 @@ class AkkaHttpClientGenerator private (modelGeneratorType: ModelGeneratorType) e
635635
responses.value.flatTraverse { resp =>
636636
resp.value.map(_._2).toList.traverse { tpe =>
637637
for {
638-
(decoder, baseType) <- AkkaHttpHelper.generateDecoder(tpe, produces, modelGeneratorType)
638+
(decoder, baseType) <- PekkoHttpHelper.generateDecoder(tpe, produces, modelGeneratorType)
639639
} yield q"val ${Pat.Var(Term.Name(s"$methodName${resp.statusCodeName}Decoder"))} = ${decoder}"
640640
}
641641
}
Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.guardrail.generators.scala.akkaHttp
1+
package dev.guardrail.generators.scala.pekkoHttp
22

33
import scala.meta._
44
import scala.reflect.runtime.universe.typeTag
@@ -8,28 +8,28 @@ import dev.guardrail.generators.scala.{ CirceModelGenerator, CirceRefinedModelGe
88
import dev.guardrail.generators.spi.{ FrameworkGeneratorLoader, ModuleLoadResult, ProtocolGeneratorLoader }
99
import dev.guardrail.terms.framework._
1010

11-
class AkkaHttpGeneratorLoader extends FrameworkGeneratorLoader {
11+
class PekkoHttpGeneratorLoader extends FrameworkGeneratorLoader {
1212
type L = ScalaLanguage
1313
def reified = typeTag[Target[ScalaLanguage]]
1414
val apply =
1515
ModuleLoadResult.forProduct2(
16-
FrameworkGeneratorLoader.label -> Seq(AkkaHttpVersion.mapping),
16+
FrameworkGeneratorLoader.label -> Seq(PekkoHttpVersion.mapping),
1717
ProtocolGeneratorLoader.label -> Seq(
1818
CirceModelGenerator.mapping,
1919
CirceRefinedModelGenerator.mapping.view.mapValues(_.toCirce).toMap,
2020
JacksonModelGenerator.mapping
2121
)
22-
) { (akkaHttpVersion, collectionVersion) =>
23-
AkkaHttpGenerator(akkaHttpVersion, collectionVersion)
22+
) { (pekkoHttpVersion, collectionVersion) =>
23+
PekkoHttpGenerator(pekkoHttpVersion, collectionVersion)
2424
}
2525
}
2626

27-
object AkkaHttpGenerator {
28-
def apply(akkaHttpVersion: AkkaHttpVersion, modelGeneratorType: ModelGeneratorType): FrameworkTerms[ScalaLanguage, Target] =
29-
new AkkaHttpGenerator(akkaHttpVersion, modelGeneratorType)
27+
object PekkoHttpGenerator {
28+
def apply(pekkoHttpVersion: PekkoHttpVersion, modelGeneratorType: ModelGeneratorType): FrameworkTerms[ScalaLanguage, Target] =
29+
new PekkoHttpGenerator(pekkoHttpVersion, modelGeneratorType)
3030
}
3131

32-
class AkkaHttpGenerator private (akkaHttpVersion: AkkaHttpVersion, modelGeneratorType: ModelGeneratorType) extends FrameworkTerms[ScalaLanguage, Target] {
32+
class PekkoHttpGenerator private (pekkoHttpVersion: PekkoHttpVersion, modelGeneratorType: ModelGeneratorType) extends FrameworkTerms[ScalaLanguage, Target] {
3333
override def fileType(format: Option[String]) = Target.pure(format.fold[Type](t"BodyPartEntity")(Type.Name(_)))
3434
override def objectType(format: Option[String]) =
3535
modelGeneratorType match {
@@ -46,16 +46,16 @@ class AkkaHttpGenerator private (akkaHttpVersion: AkkaHttpVersion, modelGenerato
4646
case _ => Target.raiseError(RuntimeFailure(s"Unknown modelGeneratorType: ${modelGeneratorType}"))
4747
}
4848
} yield List(
49-
q"import akka.http.scaladsl.model._",
50-
q"import akka.http.scaladsl.model.headers.RawHeader",
51-
q"import akka.http.scaladsl.unmarshalling.{Unmarshal, Unmarshaller, FromEntityUnmarshaller, FromRequestUnmarshaller, FromStringUnmarshaller}",
52-
q"import akka.http.scaladsl.marshalling.{Marshal, Marshaller, Marshalling, ToEntityMarshaller, ToResponseMarshaller}",
53-
q"import akka.http.scaladsl.server.Directives._",
54-
q"import akka.http.scaladsl.server.{Directive, Directive0, Directive1, ExceptionHandler, MalformedFormFieldRejection, MalformedHeaderRejection, MissingFormFieldRejection, MalformedRequestContentRejection, Rejection, RejectionError, Route}",
55-
q"import akka.http.scaladsl.util.FastFuture",
56-
q"import akka.stream.{IOResult, Materializer}",
57-
q"import akka.stream.scaladsl.{FileIO, Keep, Sink, Source}",
58-
q"import akka.util.ByteString",
49+
q"import org.apache.pekko.http.scaladsl.model._",
50+
q"import org.apache.pekko.http.scaladsl.model.headers.RawHeader",
51+
q"import org.apache.pekko.http.scaladsl.unmarshalling.{Unmarshal, Unmarshaller, FromEntityUnmarshaller, FromRequestUnmarshaller, FromStringUnmarshaller}",
52+
q"import org.apache.pekko.http.scaladsl.marshalling.{Marshal, Marshaller, Marshalling, ToEntityMarshaller, ToResponseMarshaller}",
53+
q"import org.apache.pekko.http.scaladsl.server.Directives._",
54+
q"import org.apache.pekko.http.scaladsl.server.{Directive, Directive0, Directive1, ExceptionHandler, MalformedFormFieldRejection, MalformedHeaderRejection, MissingFormFieldRejection, MalformedRequestContentRejection, Rejection, RejectionError, Route}",
55+
q"import org.apache.pekko.http.scaladsl.util.FastFuture",
56+
q"import org.apache.pekko.stream.{IOResult, Materializer}",
57+
q"import org.apache.pekko.stream.scaladsl.{FileIO, Keep, Sink, Source}",
58+
q"import org.apache.pekko.util.ByteString",
5959
q"import cats.{Functor, Id}",
6060
q"import cats.data.EitherT",
6161
q"import cats.implicits._",
@@ -76,7 +76,7 @@ class AkkaHttpGenerator private (akkaHttpVersion: AkkaHttpVersion, modelGenerato
7676
case _ => Target.raiseError(RuntimeFailure(s"Unknown modelGeneratorType: ${modelGeneratorType}"))
7777
}
7878
defn = q"""
79-
object AkkaHttpImplicits {
79+
object PekkoHttpImplicits {
8080
private[this] def pathEscape(s: String): String = Uri.Path.Segment.apply(s, Uri.Path.Empty).toString
8181
implicit def addShowablePath[T](implicit ev: Show[T]): AddPath[T] = AddPath.build[T](v => pathEscape(ev.show(v)))
8282

@@ -149,7 +149,7 @@ class AkkaHttpGenerator private (akkaHttpVersion: AkkaHttpVersion, modelGenerato
149149
..$protocolImplicits
150150
}
151151
"""
152-
} yield Some((q"AkkaHttpImplicits", defn))
152+
} yield Some((q"PekkoHttpImplicits", defn))
153153

154154
private def circeImplicits(circeVersion: CirceModelGenerator): List[Defn] = {
155155
val jsonEncoderTypeclass: Type = t"io.circe.Encoder"
@@ -426,9 +426,9 @@ class AkkaHttpGenerator private (akkaHttpVersion: AkkaHttpVersion, modelGenerato
426426
Target.pure(
427427
(
428428
413,
429-
akkaHttpVersion match {
430-
case AkkaHttpVersion.V10_1 => q"RequestEntityTooLarge"
431-
case AkkaHttpVersion.V10_2 => q"PayloadTooLarge"
429+
pekkoHttpVersion match {
430+
case PekkoHttpVersion.V10_1 => q"RequestEntityTooLarge"
431+
case PekkoHttpVersion.V10_2 => q"PayloadTooLarge"
432432
}
433433
)
434434
)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.guardrail.generators.scala.akkaHttp
1+
package dev.guardrail.generators.scala.pekkoHttp
22

33
import cats.data.NonEmptyList
44
import cats.syntax.all._
@@ -8,7 +8,7 @@ import dev.guardrail.generators.scala.{ CirceModelGenerator, JacksonModelGenerat
88
import dev.guardrail.terms.{ ApplicationJson, ContentType, TextPlain }
99
import scala.meta._
1010

11-
object AkkaHttpHelper {
11+
object PekkoHttpHelper {
1212
def generateDecoder(tpe: Type, consumes: Tracker[NonEmptyList[ContentType]], modelGeneratorType: ModelGeneratorType): Target[(Term, Type)] = {
1313
val baseType = tpe match {
1414
case t"Option[$x]" => x
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package dev.guardrail.generators.scala.akkaHttp
1+
package dev.guardrail.generators.scala.pekkoHttp
22

33
import scala.meta._
44

55
import dev.guardrail.core.PathExtractor
66
import dev.guardrail.generators.scala.{ ModelGeneratorType, ScalaLanguage }
77
import dev.guardrail.generators.LanguageParameter
88

9-
object AkkaHttpPathExtractor
9+
object PekkoHttpPathExtractor
1010
extends PathExtractor[ScalaLanguage, Term, Term.Name, ModelGeneratorType](
1111
pathSegmentConverter = { case (LanguageParameter(_, param, _, argName, argType), base, modelGeneratorType) =>
1212
base.fold {
@@ -19,7 +19,7 @@ object AkkaHttpPathExtractor
1919
case t"Long" => Right(q"LongNumber")
2020
case t"BigInt" => Right(q"Segment.map(BigInt.apply _)")
2121
case tpe =>
22-
AkkaHttpHelper
22+
PekkoHttpHelper
2323
.fromStringConverter(tpe, modelGeneratorType)
2424
.map(tpe => q"Segment.flatMap(str => ${tpe})")
2525
}
@@ -30,7 +30,7 @@ object AkkaHttpPathExtractor
3030
Right(q"${segment}.map(BigDecimal.apply _)")
3131
case t"BigInt" => Right(q"${segment}.map(BigInt.apply _)")
3232
case tpe =>
33-
AkkaHttpHelper
33+
PekkoHttpHelper
3434
.fromStringConverter(tpe, modelGeneratorType)
3535
.map(tpe => q"${segment}.flatMap(str => ${tpe})")
3636
}

0 commit comments

Comments
 (0)