Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "2.6.4"
version = "2.7.0"

maxColumn = 140
assumeStandardLibraryStripMargin = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ object Http4sClientCircuitBreakerModule {
case tuple @ (response, _) if !httpStatusClassifier.isServerFailure(response.status) => F.pure(tuple)
case (response, close) => F.raiseError[(Response[F], F[Unit])](new ServerFailure(response, close))
}
val lifted = circuitBreaker.protect(raisedInternal).recover {
case serverFailure: ServerFailure => (serverFailure.response, serverFailure.close)
val lifted = circuitBreaker.protect(raisedInternal).recover { case serverFailure: ServerFailure =>
(serverFailure.response, serverFailure.close)
}
Resource(lifted)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,19 @@ class Http4sBlazeServerModuleTest extends AsyncFunSuite with Http4sDsl[IO] {
implicit private val timer: Timer[IO] = IO.timer(ExecutionContext.global)

test("Simple HTTP server") {
val routes = Http4sRouting.make(HttpRoutes.of[IO] {
case GET -> Root / "test" => Ok("test")
val routes = Http4sRouting.make(HttpRoutes.of[IO] { case GET -> Root / "test" =>
Ok("test")
})
val test = for {
server <- Http4sBlazeServerModule.make[IO](Http4sBlazeServerConfig("127.0.0.1", 0), routes, ExecutionContext.global)
client <- Http4sBlazeClientModule.make[IO](Http4sBlazeClientConfig(), ExecutionContext.global)
} yield (server, client)

test
.use {
case (server, client) =>
client
.expect[String](s"http://${server.address.getHostString}:${server.address.getPort}/test")
.map(response => assert(response === "test"))
.use { case (server, client) =>
client
.expect[String](s"http://${server.address.getHostString}:${server.address.getPort}/test")
.map(response => assert(response === "test"))
}
.unsafeToFuture()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ class CorrelationIdMiddlewareTest extends AsyncFunSuite with Http4sDsl[IO] {
middleware <- Resource.liftF(CorrelationIdMiddleware.default[IO])
routes = Http4sRouting.make {
middleware.wrap {
HttpRoutes.of[IO] {
case req @ GET -> Root / "test" =>
val id = middleware.retrieveCorrelationId(req)
Ok("test").map(_.withHeaders(Header("Attribute-Value", id.toString)))
HttpRoutes.of[IO] { case req @ GET -> Root / "test" =>
val id = middleware.retrieveCorrelationId(req)
Ok("test").map(_.withHeaders(Header("Attribute-Value", id.toString)))
}
}
}
Expand All @@ -39,19 +38,18 @@ class CorrelationIdMiddlewareTest extends AsyncFunSuite with Http4sDsl[IO] {
} yield (server, client)

test
.use {
case (server, client) =>
client
.run(
Request[IO](uri = Uri.unsafeFromString(s"http://${server.address.getHostString}:${server.address.getPort}/test"))
.withHeaders(Header("Correlation-Id", "test-value"))
)
.use { response =>
IO.delay {
assert(response.headers.get(CaseInsensitiveString("Correlation-Id")).get.value === "test-value")
assert(response.headers.get(CaseInsensitiveString("Attribute-Value")).get.value === "Some(CorrelationId(test-value))")
}
.use { case (server, client) =>
client
.run(
Request[IO](uri = Uri.unsafeFromString(s"http://${server.address.getHostString}:${server.address.getPort}/test"))
.withHeaders(Header("Correlation-Id", "test-value"))
)
.use { response =>
IO.delay {
assert(response.headers.get(CaseInsensitiveString("Correlation-Id")).get.value === "test-value")
assert(response.headers.get(CaseInsensitiveString("Attribute-Value")).get.value === "Some(CorrelationId(test-value))")
}
}
}
.unsafeToFuture()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,10 @@ private[jmx] class TypeScopeNameObjectNameFactory(separator: String = ".") exten
override def entrySet(): util.Set[util.Map.Entry[String, String]] = map.entrySet()
}

parts.zip(partNames).foreach {
case (part, partName) =>
val quoted = quote(part)
properties.put(partName, quoted)
map.put(partName, quoted)
parts.zip(partNames).foreach { case (part, partName) =>
val quoted = quote(part)
properties.put(partName, quoted)
map.put(partName, quoted)
}

new ObjectName(domain, properties)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ object MicrometerStatsDModule {

meterFilter.foreach(registry.config().meterFilter)

val preprocessedTags = config.commonTags.foldRight(List.empty[String]) {
case (tag, acc) =>
tag._1 :: tag._2 :: acc
val preprocessedTags = config.commonTags.foldRight(List.empty[String]) { case (tag, acc) =>
tag._1 :: tag._2 :: acc
}
registry.config().commonTags(preprocessedTags: _*)

Expand Down