Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update http4s-blaze-client, ... to 0.23.12 #1492

Merged
merged 3 commits into from
May 26, 2022
Merged

Update http4s-blaze-client, ... to 0.23.12 #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2f213c
Update http4s-blaze-client, ... to 0.23.12
scala-steward May 25, 2022
5961dd9
Upgrading to the new Multiparts API
blast-hardcheese May 26, 2022
da0c0be
Golfing
blast-hardcheese May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions ...a-http4s/src/main/scala/dev/guardrail/generators/scala/http4s/Http4sClientGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,23 @@ class Http4sClientGeneratorLoader extends ClientGeneratorLoader {

def apply(parameters: Set[String]) =
for {
_ <- parameters.collectFirst { case Http4sVersion(version) => version }
} yield Http4sClientGenerator()
version <- parameters.collectFirst { case Http4sVersion(version) => version }
} yield Http4sClientGenerator(version)
}

object Http4sClientGenerator {
@deprecated("Please specify which http4s version to use", "0.72.0")
def apply(): ClientTerms[ScalaLanguage, Target] =
new Http4sClientGenerator
new Http4sClientGenerator(Http4sVersion.V0_23)

def apply(version: Http4sVersion): ClientTerms[ScalaLanguage, Target] =
new Http4sClientGenerator(version)
}

class Http4sClientGenerator extends ClientTerms[ScalaLanguage, Target] {
class Http4sClientGenerator(version: Http4sVersion) extends ClientTerms[ScalaLanguage, Target] {
@deprecated("Please specify which http4s version to use", "0.72.0")
def this() = this(Http4sVersion.V0_23)

implicit def MonadF: Monad[Target] = Target.targetInstances

def splitOperationParts(operationId: String): (List[String], String) = {
Expand Down Expand Up @@ -226,9 +233,17 @@ class Http4sClientGenerator extends ClientTerms[ScalaLanguage, Target] {
(List(q"""val tracingHttpClient = traceBuilder(s"$${clientName}:$${methodName}")(httpClient)"""), q"tracingHttpClient")
else
(List(), q"httpClient")
multipartExpr = formDataParams
.filter(_ => formDataNeedsMultipart)
.map(formDataParams => q"""val _multipart = Multipart($formDataParams.flatten.toVector)""")
embedMultipart =
formDataParams
.filter(_ => formDataNeedsMultipart)
.map(formDataParams =>
if (version == Http4sVersion.V0_23) { (inner: List[Stat]) =>
q"""Multiparts.forSync[F].flatMap(_.multipart($formDataParams.flatten.toVector).flatMap { _multipart => ..${inner} })"""
} else { (inner: List[Stat]) =>
Term.Block(List(q"val _multipart = Multipart($formDataParams.flatten.toVector)") ++ inner)
}
)
.getOrElse[List[Stat] => Term](Term.Block(_))
headersExpr =
if (formDataNeedsMultipart) {
List(q"val allHeaders = headers ++ $headerParams ++ _multipart.headers.headers.map(Header.ToRaw.rawToRaw)")
Expand Down Expand Up @@ -298,11 +313,7 @@ class Http4sClientGenerator extends ClientTerms[ScalaLanguage, Target] {
executeReqExpr =
if (isGeneric) List(q"""$httpClientName.run(${reqBinding}).evalMap(${Term.PartialFunction(cases :+ unexpectedCase)})""")
else List(q"""$httpClientName.run(${reqBinding}).use(${Term.PartialFunction(cases :+ unexpectedCase)})""")
methodBody: Term = q"""
{
..${tracingExpr ++ multipartExpr ++ headersExpr ++ reqExpr ++ executeReqExpr}
}
"""
methodBody: Term = embedMultipart(tracingExpr ++ headersExpr ++ reqExpr ++ executeReqExpr)

formParams = formArgs.map(scalaParam =>
scalaParam.param.copy(
Expand Down
2 changes: 1 addition & 1 deletion project/src/main/scala/modules/scalaHttp4s.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ object scalaHttp4s {

val dependencies = {
val catsEffectVersion = "3.3.12"
val http4sVersion = "0.23.11"
val http4sVersion = "0.23.12"

Seq(
"javax.annotation" % "javax.annotation-api" % javaxAnnotationVersion, // for jdk11
Expand Down