Skip to content

Commit c893a05

Browse files
fupelaqufupelaqu
committed
update project structure, upgrade server dependencies
1 parent 0921ad4 commit c893a05

19 files changed

+41
-191
lines changed

‎api/build.sbt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
import app.softnetwork.sbt.build._
21
import com.typesafe.sbt.packager.docker._
32

4-
app.softnetwork.sbt.build.Publication.settings
5-
63
Compile / mainClass := Some("app.softnetwork.notification.api.AllNotificationsPostgresLauncher")
74

85
dockerBaseImage := "openjdk:8"

‎api/src/main/scala/app/softnetwork/notification/api/AllNotificationsWithOneOffCookieSchedulerEndpointsPostgresLauncher.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package app.softnetwork.notification.api
33
import akka.actor.typed.ActorSystem
44
import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
55
import app.softnetwork.persistence.schema.SchemaType
6+
import app.softnetwork.session.CsrfCheckHeader
67
import app.softnetwork.session.service.SessionEndpoints
7-
import com.softwaremill.session.CsrfCheckHeaderAndForm
88
import org.slf4j.{Logger, LoggerFactory}
99

1010
object AllNotificationsWithOneOffCookieSchedulerEndpointsPostgresLauncher
1111
extends AllNotificationsWithSchedulerEndpointsApi
1212
with JdbcSchemaProvider
13-
with CsrfCheckHeaderAndForm {
13+
with CsrfCheckHeader {
1414

1515
lazy val log: Logger = LoggerFactory getLogger getClass.getName
1616

‎api/src/main/scala/app/softnetwork/notification/api/AllNotificationsWithOneOffHeaderSchedulerEndpointsPostgresLauncher.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package app.softnetwork.notification.api
33
import akka.actor.typed.ActorSystem
44
import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
55
import app.softnetwork.persistence.schema.SchemaType
6+
import app.softnetwork.session.CsrfCheckHeader
67
import app.softnetwork.session.service.SessionEndpoints
7-
import com.softwaremill.session.CsrfCheckHeaderAndForm
88
import org.slf4j.{Logger, LoggerFactory}
99

1010
object AllNotificationsWithOneOffHeaderSchedulerEndpointsPostgresLauncher
1111
extends AllNotificationsWithSchedulerEndpointsApi
1212
with JdbcSchemaProvider
13-
with CsrfCheckHeaderAndForm {
13+
with CsrfCheckHeader {
1414

1515
lazy val log: Logger = LoggerFactory getLogger getClass.getName
1616

‎api/src/main/scala/app/softnetwork/notification/api/AllNotificationsWithRefreshableCookieSchedulerEndpointsPostgresLauncher.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package app.softnetwork.notification.api
33
import akka.actor.typed.ActorSystem
44
import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
55
import app.softnetwork.persistence.schema.SchemaType
6+
import app.softnetwork.session.CsrfCheckHeader
67
import app.softnetwork.session.service.SessionEndpoints
7-
import com.softwaremill.session.CsrfCheckHeaderAndForm
88
import org.slf4j.{Logger, LoggerFactory}
99

1010
object AllNotificationsWithRefreshableCookieSchedulerEndpointsPostgresLauncher
1111
extends AllNotificationsWithSchedulerEndpointsApi
1212
with JdbcSchemaProvider
13-
with CsrfCheckHeaderAndForm {
13+
with CsrfCheckHeader {
1414

1515
lazy val log: Logger = LoggerFactory getLogger getClass.getName
1616

‎api/src/main/scala/app/softnetwork/notification/api/AllNotificationsWithRefreshableHeaderSchedulerEndpointsPostgresLauncher.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package app.softnetwork.notification.api
33
import akka.actor.typed.ActorSystem
44
import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
55
import app.softnetwork.persistence.schema.SchemaType
6+
import app.softnetwork.session.CsrfCheckHeader
67
import app.softnetwork.session.service.SessionEndpoints
7-
import com.softwaremill.session.CsrfCheckHeaderAndForm
88
import org.slf4j.{Logger, LoggerFactory}
99

1010
object AllNotificationsWithRefreshableHeaderSchedulerEndpointsPostgresLauncher
1111
extends AllNotificationsWithSchedulerEndpointsApi
1212
with JdbcSchemaProvider
13-
with CsrfCheckHeaderAndForm {
13+
with CsrfCheckHeader {
1414

1515
lazy val log: Logger = LoggerFactory getLogger getClass.getName
1616

‎api/src/main/scala/app/softnetwork/notification/api/AllNotificationsWithSchedulerEndpointsApi.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package app.softnetwork.notification.api
22

33
import app.softnetwork.persistence.schema.SchemaProvider
44
import app.softnetwork.scheduler.api.SchedulerEndpointsApi
5-
import com.softwaremill.session.CsrfCheck
5+
import app.softnetwork.session.CsrfCheck
66

77
trait AllNotificationsWithSchedulerEndpointsApi
88
extends AllNotificationsWithSchedulerApi

‎build.sbt‎

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,10 @@
1-
import sbt.Resolver
2-
3-
import Common._
4-
import app.softnetwork.sbt.build._
5-
6-
/////////////////////////////////
7-
// Defaults
8-
/////////////////////////////////
9-
10-
app.softnetwork.sbt.build.Publication.settings
11-
12-
/////////////////////////////////
13-
// Useful aliases
14-
/////////////////////////////////
15-
16-
addCommandAlias("cd", "project") // navigate the projects
17-
18-
addCommandAlias("cc", ";clean;compile") // clean and compile
19-
20-
addCommandAlias("pl", ";clean;publishLocal") // clean and publish locally
21-
22-
addCommandAlias("pr", ";clean;publish") // clean and publish globally
23-
24-
addCommandAlias("pld", ";clean;local:publishLocal;dockerComposeUp") // clean and publish/launch the docker environment
25-
26-
addCommandAlias("dct", ";dockerComposeTest") // navigate the projects
27-
28-
ThisBuild / shellPrompt := prompt
29-
301
ThisBuild / organization := "app.softnetwork"
312

323
name := "notification"
334

34-
ThisBuild / version := "0.3.5"
5+
ThisBuild / version := "0.4.0"
356

36-
ThisBuild / scalaVersion := "2.12.15"
7+
ThisBuild / scalaVersion := "2.12.18"
378

389
ThisBuild / scalacOptions ++= Seq("-deprecation", "-feature", "-target:jvm-1.8")
3910

@@ -65,7 +36,7 @@ lazy val common = project.in(file("common"))
6536

6637
lazy val core = project.in(file("core"))
6738
.configs(IntegrationTest)
68-
.settings(Defaults.itSettings, BuildInfoSettings.settings)
39+
.settings(Defaults.itSettings, app.softnetwork.Info.infoSettings)
6940
.enablePlugins(BuildInfoPlugin)
7041
.dependsOn(
7142
common % "compile->compile;test->test;it->it"
@@ -81,8 +52,8 @@ lazy val testkit = project.in(file("testkit"))
8152

8253
lazy val api = project.in(file("api"))
8354
.configs(IntegrationTest)
84-
.settings(Defaults.itSettings, BuildInfoSettings.settings)
85-
.enablePlugins(DockerComposePlugin, DockerPlugin, JavaAppPackaging, BuildInfoPlugin)
55+
.settings(Defaults.itSettings)
56+
.enablePlugins(DockerPlugin, JavaAppPackaging)
8657
.dependsOn(
8758
core % "compile->compile;test->test;it->it"
8859
)

‎common/build.sbt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import app.softnetwork.sbt.build._
2-
31
organization := "app.softnetwork.notification"
42

53
name := "notification-common"

‎core/src/main/scala/app/softnetwork/notification/launch/NotificationGuardian.scala‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package app.softnetwork.notification.launch
22

33
import akka.actor.typed.ActorSystem
4+
import app.softnetwork.notification.NotificationCoreBuildInfo
45
import app.softnetwork.notification.api.NotificationServer
56
import app.softnetwork.notification.model.Notification
6-
import app.softnetwork.notification.persistence.query.{
7-
NotificationCommandProcessorStream,
8-
Scheduler2NotificationProcessorStream
9-
}
7+
import app.softnetwork.notification.persistence.query.{NotificationCommandProcessorStream, Scheduler2NotificationProcessorStream}
108
import app.softnetwork.notification.persistence.typed.NotificationBehavior
119
import app.softnetwork.persistence.launch.{PersistenceGuardian, PersistentEntity}
1210
import app.softnetwork.persistence.query.EventProcessorStream
@@ -48,4 +46,7 @@ trait NotificationGuardian[T <: Notification] extends PersistenceGuardian with S
4846
/** initialize all notification servers
4947
*/
5048
def notificationServers: ActorSystem[_] => Seq[NotificationServer]
49+
50+
override def systemVersion(): String =
51+
sys.env.getOrElse("VERSION", NotificationCoreBuildInfo.version)
5152
}

‎project/Common.scala‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)