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 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@v6
- uses: coursier/setup-action@v3
with:
jvm: temurin:8
jvm: temurin:21
apps: sbt
- uses: coursier/cache-action@v8
- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ThisBuild / organization := "io.latis-data"
ThisBuild / scalaVersion := "3.3.9"
ThisBuild / scalaVersion := "3.9.0"

val fs2DataVersion = "1.8.1"
val http4sVersion = "0.23.38"
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/latis/service/hapi/DataService.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ import org.log4s.*

/** Implements the `/data` endpoint. */
class DataService[F[_]: Concurrent](
alg: DataAlgebra[F] with InfoAlgebra[F]
alg: DataAlgebra[F] & InfoAlgebra[F]
) extends Http4sDsl[F] {
import Format.*
import Include.*
import QueryDecoders.*

private[this] val logger = getLogger
private val logger = getLogger

private def req2Resp(req: DataRequest, _params:Option[NonEmptyList[String]]): EitherT[F, Status, Response[F]] = {
val dataset = req.dataset
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/latis/service/hapi/InfoService.scala
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import org.log4s.*
class InfoService[F[_]: Concurrent](alg: InfoAlgebra[F]) extends Http4sDsl[F] {
import QueryDecoders.*

private[this] val logger = getLogger
private val logger = getLogger

val service: HttpRoutes[F] =
HttpRoutes.of[F] {
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/latis/service/hapi/Latis3Interpreter.scala
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class Latis3Interpreter(catalog: Catalog) extends HapiInterpreter[IO] {
override def streamJson(data: T, header: JsonObject): Stream[IO, Byte] = {
val dataJson = new JsonEncoder().encode(data)
val headerList = header.add("format", Json.fromString("json")).toList
val map = ListMap(headerList: _*)
val map = ListMap(headerList*)
dataJson
.through(json.ast.tokenize)
.through(json.wrap.asArrayInObject(at = "data", in = map))
Expand Down