Skip to content

Commit 9e6244a

Browse files
committed
to fix scheduler endpoints signature
1 parent e7c46c2 commit 9e6244a

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ThisBuild / organization := "app.softnetwork"
3131

3232
name := "scheduler"
3333

34-
ThisBuild / version := "0.3.2.3"
34+
ThisBuild / version := "0.3.2.4"
3535

3636
ThisBuild / scalaVersion := "2.12.15"
3737

core/src/main/scala/app/softnetwork/scheduler/service/SchedulerServiceEndpoints.scala

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import com.softwaremill.session.{
1818
}
1919
import org.slf4j.{Logger, LoggerFactory}
2020
import org.softnetwork.session.model.Session
21+
import sttp.capabilities
22+
import sttp.capabilities.akka.AkkaStreams
2123
import sttp.model.headers.CookieValueWithMeta
2224
import sttp.model.Method
2325
import sttp.monad.FutureMonad
@@ -182,15 +184,16 @@ trait SchedulerServiceEndpoints
182184
}
183185
}
184186

185-
override def endpoints: List[ServerEndpoint[Any, Future]] = List(
186-
addScheduleEndpoint,
187-
removeScheduleEndpoint,
188-
listSchedulesEndpoint,
189-
addCronTabEndpoint,
190-
removeCronTabEndpoint,
191-
listCronTabsEndpoint,
192-
loadSchedulerEndpoint
193-
)
187+
override def endpoints: List[ServerEndpoint[AkkaStreams with capabilities.WebSockets, Future]] =
188+
List(
189+
addScheduleEndpoint,
190+
removeScheduleEndpoint,
191+
listSchedulesEndpoint,
192+
addCronTabEndpoint,
193+
removeCronTabEndpoint,
194+
listCronTabsEndpoint,
195+
loadSchedulerEndpoint
196+
)
194197

195198
lazy val route: Route = apiRoute
196199
}

testkit/src/main/scala/app/softnetwork/scheduler/scalatest/SchedulerEndpointsTestKit.scala

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import akka.actor.typed.ActorSystem
44
import app.softnetwork.scheduler.service.SchedulerServiceEndpoints
55
import app.softnetwork.session.scalatest.SessionEndpointsRoutes
66
import com.softwaremill.session.CsrfCheck
7+
import sttp.capabilities
8+
import sttp.capabilities.akka.AkkaStreams
79
import sttp.tapir.server.ServerEndpoint
810

911
import scala.concurrent.Future
@@ -13,7 +15,8 @@ trait SchedulerEndpointsTestKit extends SessionEndpointsRoutes { _: CsrfCheck =>
1315
def schedulerEndpoints: ActorSystem[_] => SchedulerServiceEndpoints = system =>
1416
SchedulerServiceEndpoints.apply(system, sessionEndpoints(system))
1517

16-
override def endpoints: ActorSystem[_] => List[ServerEndpoint[Any, Future]] = system =>
17-
sessionServiceEndpoints(system).endpoints ++ schedulerEndpoints(system).endpoints
18+
override def endpoints
19+
: ActorSystem[_] => List[ServerEndpoint[AkkaStreams with capabilities.WebSockets, Future]] =
20+
system => sessionServiceEndpoints(system).endpoints ++ schedulerEndpoints(system).endpoints
1821

1922
}

0 commit comments

Comments
 (0)