Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.sbt
#	src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala
#	src/main/scala/xyz/driver/pdsuicommon/domain/User.scala
#	src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiPartialUser.scala

1 files changed, 13 insertions, 13 deletions

diff --git a/src/main/scala/xyz/driver/pdsuicommon/db/MySqlContext.scala b/src/main/scala/xyz/driver/pdsuicommon/db/MySqlContext.scala
index f804e87..c547bf4 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/db/MySqlContext.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/db/MySqlContext.scala
@@ -18,20 +18,20 @@ import scala.util.{Failure, Success, Try}
 
 object MySqlContext extends PhiLogging {
 
-  case class DbCredentials(user: String,
-                           password: String,
-                           host: String,
-                           port: Int,
-                           dbName: String,
-                           dbCreateFlag: Boolean,
-                           dbContext: String,
-                           connectionParams: String,
-                           url: String)
+  final case class DbCredentials(user: String,
+                                 password: String,
+                                 host: String,
+                                 port: Int,
+                                 dbName: String,
+                                 dbCreateFlag: Boolean,
+                                 dbContext: String,
+                                 connectionParams: String,
+                                 url: String)
 
-  case class Settings(credentials: DbCredentials,
-                      connection: Config,
-                      connectionAttemptsOnStartup: Int,
-                      threadPoolSize: Int)
+  final case class Settings(credentials: DbCredentials,
+                            connection: Config,
+                            connectionAttemptsOnStartup: Int,
+                            threadPoolSize: Int)
 
   def apply(settings: Settings): MySqlContext = {
     // Prevent leaking credentials to a log