Skip to content

Commit 325dbcc

Browse files
committed
update scheduler service and scheduler endpoints - update scheduler test kits
1 parent a707002 commit 325dbcc

File tree

28 files changed

+371
-116
lines changed

28 files changed

+371
-116
lines changed

api/src/main/scala/app/softnetwork/scheduler/api/SchedulerWithOneOffCookiePostgresLauncher.scala renamed to api/src/main/scala/app/softnetwork/scheduler/api/SchedulerEndpointsWithOneOffCookiePostgresLauncher.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import app.softnetwork.session.service.SessionEndpoints
77
import com.softwaremill.session.CsrfCheckHeaderAndForm
88
import org.slf4j.{Logger, LoggerFactory}
99

10-
object SchedulerWithOneOffCookiePostgresLauncher
10+
object SchedulerEndpointsWithOneOffCookiePostgresLauncher
1111
extends SchedulerEndpointsApi
1212
with JdbcSchemaProvider
1313
with CsrfCheckHeaderAndForm {

api/src/main/scala/app/softnetwork/scheduler/api/SchedulerWithOneOffHeaderPostgresLauncher.scala renamed to api/src/main/scala/app/softnetwork/scheduler/api/SchedulerEndpointsWithOneOffHeaderPostgresLauncher.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import app.softnetwork.session.service.SessionEndpoints
77
import com.softwaremill.session.CsrfCheckHeaderAndForm
88
import org.slf4j.{Logger, LoggerFactory}
99

10-
object SchedulerWithOneOffHeaderPostgresLauncher
10+
object SchedulerEndpointsWithOneOffHeaderPostgresLauncher
1111
extends SchedulerEndpointsApi
1212
with JdbcSchemaProvider
1313
with CsrfCheckHeaderAndForm {

api/src/main/scala/app/softnetwork/scheduler/api/SchedulerWithRefreshableCookiePostgresLauncher.scala renamed to api/src/main/scala/app/softnetwork/scheduler/api/SchedulerEndpointsWithRefreshableCookiePostgresLauncher.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import app.softnetwork.session.service.SessionEndpoints
77
import com.softwaremill.session.CsrfCheckHeaderAndForm
88
import org.slf4j.{Logger, LoggerFactory}
99

10-
object SchedulerWithRefreshableCookiePostgresLauncher
10+
object SchedulerEndpointsWithRefreshableCookiePostgresLauncher
1111
extends SchedulerEndpointsApi
1212
with JdbcSchemaProvider
1313
with CsrfCheckHeaderAndForm {

api/src/main/scala/app/softnetwork/scheduler/api/SchedulerWithRefreshableHeaderPostgresLauncher.scala renamed to api/src/main/scala/app/softnetwork/scheduler/api/SchedulerEndpointsWithRefreshableHeaderPostgresLauncher.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import app.softnetwork.session.service.SessionEndpoints
77
import com.softwaremill.session.CsrfCheckHeaderAndForm
88
import org.slf4j.{Logger, LoggerFactory}
99

10-
object SchedulerWithRefreshableHeaderPostgresLauncher
10+
object SchedulerEndpointsWithRefreshableHeaderPostgresLauncher
1111
extends SchedulerEndpointsApi
1212
with JdbcSchemaProvider
1313
with CsrfCheckHeaderAndForm {
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package app.softnetwork.scheduler.api
2+
3+
import app.softnetwork.persistence.schema.SchemaProvider
4+
import app.softnetwork.scheduler.launch.SchedulerRoutes
5+
6+
trait SchedulerRoutesApi extends SchedulerApi with SchedulerRoutes { _: SchemaProvider => }

api/src/main/scala/app/softnetwork/scheduler/api/SchedulerPostgresLauncher.scala renamed to api/src/main/scala/app/softnetwork/scheduler/api/SchedulerRoutesWithOneOffCookiePostgresLauncher.scala

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
package app.softnetwork.scheduler.api
22

3+
import akka.actor.typed.ActorSystem
34
import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
45
import app.softnetwork.persistence.schema.SchemaType
6+
import app.softnetwork.session.service.SessionService
57
import org.slf4j.{Logger, LoggerFactory}
68

7-
object SchedulerPostgresLauncher extends SchedulerApi with JdbcSchemaProvider {
8-
9+
object SchedulerRoutesWithOneOffCookiePostgresLauncher
10+
extends SchedulerRoutesApi
11+
with JdbcSchemaProvider {
912
lazy val log: Logger = LoggerFactory getLogger getClass.getName
1013

1114
def schemaType: SchemaType = JdbcSchemaTypes.Postgres
15+
16+
override def sessionService: ActorSystem[_] => SessionService = system =>
17+
SessionService.oneOffCookie(system)
1218
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package app.softnetwork.scheduler.api
2+
3+
import akka.actor.typed.ActorSystem
4+
import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
5+
import app.softnetwork.persistence.schema.SchemaType
6+
import app.softnetwork.session.service.SessionService
7+
import org.slf4j.{Logger, LoggerFactory}
8+
9+
object SchedulerRoutesWithOneOffHeaderPostgresLauncher
10+
extends SchedulerRoutesApi
11+
with JdbcSchemaProvider {
12+
lazy val log: Logger = LoggerFactory getLogger getClass.getName
13+
14+
def schemaType: SchemaType = JdbcSchemaTypes.Postgres
15+
16+
override def sessionService: ActorSystem[_] => SessionService = system =>
17+
SessionService.oneOffHeader(system)
18+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package app.softnetwork.scheduler.api
2+
3+
import akka.actor.typed.ActorSystem
4+
import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
5+
import app.softnetwork.persistence.schema.SchemaType
6+
import app.softnetwork.session.service.SessionService
7+
import org.slf4j.{Logger, LoggerFactory}
8+
9+
object SchedulerRoutesWithRefreshableCookiePostgresLauncher
10+
extends SchedulerRoutesApi
11+
with JdbcSchemaProvider {
12+
lazy val log: Logger = LoggerFactory getLogger getClass.getName
13+
14+
def schemaType: SchemaType = JdbcSchemaTypes.Postgres
15+
16+
override def sessionService: ActorSystem[_] => SessionService = system =>
17+
SessionService.refreshableCookie(system)
18+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package app.softnetwork.scheduler.api
2+
3+
import akka.actor.typed.ActorSystem
4+
import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
5+
import app.softnetwork.persistence.schema.SchemaType
6+
import app.softnetwork.session.service.SessionService
7+
import org.slf4j.{Logger, LoggerFactory}
8+
9+
object SchedulerRoutesWithRefreshableHeaderPostgresLauncher
10+
extends SchedulerRoutesApi
11+
with JdbcSchemaProvider {
12+
lazy val log: Logger = LoggerFactory getLogger getClass.getName
13+
14+
def schemaType: SchemaType = JdbcSchemaTypes.Postgres
15+
16+
override def sessionService: ActorSystem[_] => SessionService = system =>
17+
SessionService.refreshableHeader(system)
18+
}

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.1.1"
34+
ThisBuild / version := "0.3.1.2"
3535

3636
ThisBuild / scalaVersion := "2.12.15"
3737

0 commit comments

Comments
 (0)