Bumped version to 2.6.33

build.sbt

@@ -42,7 +42,7 @@ val buildSettings = Seq(
   scalariformPreferences := scalariformPreferences.value
   .setPreference(DanglingCloseParenthesis, Force)
   .setPreference(AlignSingleLineCaseStatements, true),
-  version := "2.6.32",
+  version := "2.6.33",
   scalaVersion := "2.13.13",
   crossScalaVersions := Seq("2.13.8", "2.13.13"),
   resolvers ++= Resolver.sonatypeOssRepos("snapshots"),

manifest.yml

@@ -5,7 +5,7 @@ applications:
     instances: 1
     host: openolitortest
     domain: applicationcloud.io
-    path: target/universal/openolitor-server-2.6.32.zip
+    path: target/universal/openolitor-server-2.6.33.zip
     buildpack: https://github.com/cloudfoundry/java-buildpack.git
     stack: cflinuxfs2
     env:

src/main/resources/application.conf

@@ -306,9 +306,9 @@ openolitor {
     slick {
       profile = "slick.jdbc.MySQLProfile$"
       db {
-        url = "jdbc:mysql://localhost:3307/try?cachePrepStmts=true&cacheCallableStmts=true&cacheServerConfiguration=true&useLocalSessionState=true&elideSetAutoCommits=true&alwaysSendSetIsolation=false&enableQueryTimeouts=false&connectionAttributes=none&verifyServerCertificate=false&useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&useLegacyDatetimeCode=false&serverTimezone=UTC&rewriteBatchedStatements=true"
-        user = "super"
-        password = "thedefaultdbpasswordneedstobechanged"
+        url = "jdbc:mysql://localhost:3306/csa1?cachePrepStmts=true&cacheCallableStmts=true&cacheServerConfiguration=true&useLocalSessionState=true&elideSetAutoCommits=true&alwaysSendSetIsolation=false&enableQueryTimeouts=false&connectionAttributes=none&verifyServerCertificate=false&useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&useLegacyDatetimeCode=false&serverTimezone=UTC&rewriteBatchedStatements=true"
+        user = "user_csa1"
+        password = "changeThisPasswrod"
         driver = "com.mysql.cj.jdbc.Driver"
         connectionPool = HikariCP
         numThreads = 5
@@ -320,10 +320,10 @@ openolitor {
     # Mandant specific db settings
     db: {
       default: {
-        url = "jdbc:mysql://localhost:3307/try"
+        url = "jdbc:mysql://localhost:3306/csa1"
         driver = "com.mysql.cj.jdbc.Driver"
-        user = "super"
-        password = "thedefaultdbpasswordneedstobechanged"
+        user = "user_csa1"
+        password = "changeThisPasswrod"
       }
     }
 

src/main/resources/logback.xml

@@ -58,7 +58,7 @@
     </logger>
 
     <!-- TO SEE SQL QUERY LOG-OUTPUT SWITCH THIS LEVEL TO DEBUG-->
-    <logger name="scalikejdbc" level="INFO" additivity="false">
+    <logger name="scalikejdbc" level="DEBUG" additivity="false">
         <appender-ref ref="STDOUT"/>
     </logger>
 

src/main/scala/ch/openolitor/core/mailservice/MailService.scala

@@ -25,10 +25,10 @@ package ch.openolitor.core.mailservice
 import java.util.UUID
 import akka.actor._
 import akka.persistence.SnapshotMetadata
-import ch.openolitor.core.domain.{AggregateRoot, _}
+import ch.openolitor.core.domain.{ AggregateRoot, _ }
 import ch.openolitor.core.models.PersonId
 import ch.openolitor.core.db.ConnectionPoolContextAware
-import ch.openolitor.core.{JSONSerializable, SystemConfig}
+import ch.openolitor.core.{ JSONSerializable, SystemConfig }
 import ch.openolitor.core.filestore._
 import ch.openolitor.util.ConfigUtil._
 import courier._
@@ -41,7 +41,7 @@ import scala.collection.compat.immutable.ArraySeq
 import scala.collection.immutable.TreeSet
 import scala.concurrent.duration._
 import scala.concurrent.Await
-import scala.util.{Failure, Success}
+import scala.util.{ Failure, Success }
 
 object MailService {
 
@@ -50,24 +50,19 @@ object MailService {
 
   case class MailServiceState(startTime: DateTime, mailQueue: TreeSet[MailEnqueued]) extends State
 
-  case class SendMailCommandWithCallback[M <: AnyRef](originator: PersonId, entity: Mail, retryDuration: Option[Duration], commandMeta: M)(implicit
-                                                                                                                                           p: Persister[M,
-                                                                                                                                             _]) extends
-    UserCommand
+  case class SendMailCommandWithCallback[M <: AnyRef](originator: PersonId, entity: Mail, retryDuration: Option[Duration], commandMeta: M)(implicit p: Persister[M, _]) extends UserCommand
 
   case class SendMailCommand(originator: PersonId, entity: Mail, retryDuration: Option[Duration]) extends UserCommand
 
   //events raised by this aggregateroot
   case class MailServiceInitialized(meta: EventMetadata) extends PersistentEvent
 
   // resulting send mail event
-  case class SendMailEvent(meta: EventMetadata, uid: String, mail: Mail, expires: DateTime, commandMeta: Option[AnyRef]) extends PersistentEvent with
-    JSONSerializable
+  case class SendMailEvent(meta: EventMetadata, uid: String, mail: Mail, expires: DateTime, commandMeta: Option[AnyRef]) extends PersistentEvent with JSONSerializable
 
   case class MailSentEvent(meta: EventMetadata, uid: String, commandMeta: Option[AnyRef]) extends PersistentEvent with JSONSerializable
 
-  case class SendMailFailedEvent(meta: EventMetadata, uid: String, numberOfRetries: Int, commandMeta: Option[AnyRef]) extends PersistentEvent with
-    JSONSerializable
+  case class SendMailFailedEvent(meta: EventMetadata, uid: String, numberOfRetries: Int, commandMeta: Option[AnyRef]) extends PersistentEvent with JSONSerializable
 
   def props(dbEvolutionActor: ActorRef, fileStore: FileStore)(implicit sysConfig: SystemConfig): Props = Props(classOf[DefaultMailService], sysConfig,
     dbEvolutionActor, fileStore)
@@ -198,7 +193,7 @@ trait MailService extends AggregateRoot
         val result = envelope match {
           case Right(e) => Await.ready(mailer(e), 20 seconds).value match {
             case Some(e) => Right(e)
-            case None => Left("Error sending the email")
+            case None    => Left("Error sending the email")
           }
           case Left(e) => Left(e)
         }
@@ -262,10 +257,10 @@ trait MailService extends AggregateRoot
   override def restoreFromSnapshot(metadata: SnapshotMetadata, state: State): Unit = {
     log.debug(s"restoreFromSnapshot:$state")
     state match {
-      case Removed => context become removed
-      case Created => context become uninitialized
+      case Removed             => context become removed
+      case Created             => context become uninitialized
       case s: MailServiceState => this.state = s
-      case other: Any => log.error(s"Received unsupported state:$other")
+      case other: Any          => log.error(s"Received unsupported state:$other")
     }
   }
 

src/main/scala/ch/openolitor/core/security/LoginService.scala

@@ -22,18 +22,18 @@
 \*                                                                           */
 package ch.openolitor.core.security
 
-import akka.http.caching.scaladsl.{Cache, CachingSettings}
+import akka.http.caching.scaladsl.{ Cache, CachingSettings }
 import akka.http.caching.LfuCache
 import akka.pattern.ask
 import akka.util.Timeout
-import ch.openolitor.core.{ActorReferences, ExecutionContextAware, SystemConfigReference}
+import ch.openolitor.core.{ ActorReferences, ExecutionContextAware, SystemConfigReference }
 import ch.openolitor.core.Macros.copyTo
 import ch.openolitor.core.db.AsyncConnectionPoolContextAware
 import ch.openolitor.core.domain.SystemEvents
 import ch.openolitor.core.mailservice.Mail
-import ch.openolitor.core.mailservice.MailService.{MailServiceState, SendMailCommand, SendMailEvent}
+import ch.openolitor.core.mailservice.MailService.{ MailServiceState, SendMailCommand, SendMailEvent }
 import ch.openolitor.core.models.PersonId
-import ch.openolitor.stammdaten.StammdatenCommandHandler.{PasswortGewechseltEvent, PasswortResetCommand, PasswortResetGesendetEvent, PasswortWechselCommand}
+import ch.openolitor.stammdaten.StammdatenCommandHandler.{ PasswortGewechseltEvent, PasswortResetCommand, PasswortResetGesendetEvent, PasswortWechselCommand }
 import ch.openolitor.stammdaten.models._
 import ch.openolitor.stammdaten.repositories.StammdatenReadRepositoryAsyncComponent
 import ch.openolitor.util.ConfigUtil._