Fix compile warnings due to scala update

eikek · Mar 2, 2024 · c48f960 · c48f960
1 parent cb6109e
commit c48f960
Show file tree

Hide file tree

Showing 22 changed files with 81 additions and 59 deletions.
diff --git a/modules/backend/src/main/scala/sharry/backend/BackendApp.scala b/modules/backend/src/main/scala/sharry/backend/BackendApp.scala
@@ -67,7 +67,7 @@ object BackendApp {
         cfg.computeChecksum,
         cfg.files.defaultStoreConfig,
         connectEC,
-        true
+        runMigration = true
       )
 
       backend <- create(cfg, store)

diff --git a/modules/backend/src/main/scala/sharry/backend/account/OAccount.scala b/modules/backend/src/main/scala/sharry/backend/account/OAccount.scala
@@ -80,7 +80,7 @@ object OAccount {
           shares <- OptionT.liftF(store.transact(RShare.getAllByAccount(id)))
           _ <- OptionT.liftF(logger.info(s"Delete ${shares.size} shares of account $id"))
           _ <- OptionT.liftF(
-            shares.traverse(shareId => ShareQueries.deleteShare(shareId, false)(store))
+            shares.traverse(shareId => ShareQueries.deleteShare(shareId, background = false)(store))
           )
           _ <- OptionT.liftF(store.transact(RAccount.delete(id)))
         } yield acc

diff --git a/modules/backend/src/main/scala/sharry/backend/auth/AuthConfig.scala b/modules/backend/src/main/scala/sharry/backend/auth/AuthConfig.scala
@@ -93,7 +93,7 @@ object AuthConfig {
     def github(clientId: String, clientSecret: String): OAuth =
       OAuth(
         Ident.unsafe("github"),
-        true,
+        enabled = true,
         "Github",
         LenientUri.unsafe("https://github.com/login/oauth/authorize"),
         LenientUri.unsafe("https://github.com/login/oauth/access_token"),

diff --git a/modules/backend/src/main/scala/sharry/backend/auth/CommandAuth.scala b/modules/backend/src/main/scala/sharry/backend/auth/CommandAuth.scala
@@ -24,7 +24,7 @@ final class CommandAuth[F[_]: Async](
         Ident.fromString(up.user) match {
           case Right(login) =>
             def okResult: F[LoginResult] =
-              AddAccount(login, false, ops)
+              AddAccount(login, admin = false, ops)
                 .flatMap(accId =>
                   AuthToken.user(accId, cfg.serverSecret).map(LoginResult.ok)
                 )

diff --git a/modules/backend/src/main/scala/sharry/backend/auth/FixedAuth.scala b/modules/backend/src/main/scala/sharry/backend/auth/FixedAuth.scala
@@ -35,7 +35,7 @@ final class FixedAuth[F[_]: Async](cfg: AuthConfig, op: OAccount[F]) {
     }
 
   private def addAccount(cfg: AuthConfig.Fixed): F[AccountId] =
-    AddAccount[F](cfg.user, true, AddAccount.AccountOps.from(op))
+    AddAccount[F](cfg.user, admin = true, AddAccount.AccountOps.from(op))
 
   def withPosition: (Int, LoginModule[F]) = (cfg.fixed.order, login)
 

diff --git a/modules/backend/src/main/scala/sharry/backend/auth/HttpAuth.scala b/modules/backend/src/main/scala/sharry/backend/auth/HttpAuth.scala
@@ -25,7 +25,7 @@ final class HttpAuth[F[_]: Async](
         Ident.fromString(up.user) match {
           case Right(login) =>
             def okResult: F[LoginResult] =
-              AddAccount(login, false, ops)
+              AddAccount(login, admin = false, ops)
                 .flatMap(accId =>
                   AuthToken.user(accId, cfg.serverSecret).map(LoginResult.ok)
                 )

diff --git a/modules/backend/src/main/scala/sharry/backend/auth/HttpBasicAuth.scala b/modules/backend/src/main/scala/sharry/backend/auth/HttpBasicAuth.scala
@@ -23,7 +23,7 @@ final class HttpBasicAuth[F[_]: Async](
         Ident.fromString(up.user) match {
           case Right(login) =>
             def okResult: F[LoginResult] =
-              AddAccount(login, false, ops)
+              AddAccount(login, admin = false, ops)
                 .flatMap(accId =>
                   AuthToken.user(accId, cfg.serverSecret).map(LoginResult.ok)
                 )

diff --git a/modules/backend/src/main/scala/sharry/backend/mail/OMail.scala b/modules/backend/src/main/scala/sharry/backend/mail/OMail.scala
@@ -82,7 +82,12 @@ object OMail {
             templates = receivers.map { case (login, mailAddress) =>
               (
                 mailAddress,
-                TemplateData(login, baseUrl / shareId.id, false, data.aliasName)
+                TemplateData(
+                  login,
+                  baseUrl / shareId.id,
+                  password = false,
+                  data.aliasName
+                )
               )
             }
             res <- OptionT.liftF(templates.traverse((send _).tupled))
@@ -118,7 +123,7 @@ object OMail {
           baseUrl: LenientUri
       ): F[MailData] = {
         val tpl = cfg.templates.alias
-        val td = TemplateData(acc.userLogin, baseUrl / aliasId.id, false, "")
+        val td = TemplateData(acc.userLogin, baseUrl / aliasId.id, password = false, "")
         MailData(td.render(tpl.subject), td.render(tpl.body)).pure[F]
       }
 

diff --git a/modules/backend/src/main/scala/sharry/backend/share/OShare.scala b/modules/backend/src/main/scala/sharry/backend/share/OShare.scala
@@ -358,7 +358,7 @@ object OShare {
           case AddResult.Success =>
             1.pure[F]
           case AddResult.EntityExists(_) =>
-            store.transact(RPublishShare.update(share, true, reuseId))
+            store.transact(RPublishShare.update(share, enable = true, reuseId = reuseId))
           case AddResult.Failure(ex) =>
             Async[F].raiseError(ex)
         }
@@ -370,7 +370,7 @@ object OShare {
       }
 
       def unpublish(share: Ident, accId: AccountId): OptionT[F, Unit] = {
-        val remove = store.transact(RPublishShare.update(share, false, true))
+        val remove = store.transact(RPublishShare.update(share, enable = false, reuseId = true))
         for {
           _ <- OptionT(store.transact(Queries.checkShare(share, accId)))
           _ <- OptionT.liftF(remove)
@@ -414,7 +414,7 @@ object OShare {
       def deleteShare(accId: AccountId, share: Ident): OptionT[F, Unit] =
         for {
           _ <- OptionT(store.transact(Queries.checkShare(share, accId)))
-          _ <- OptionT.liftF(Queries.deleteShare(share, true)(store))
+          _ <- OptionT.liftF(Queries.deleteShare(share, background = true)(store))
         } yield ()
 
       def setDescription(
@@ -473,7 +473,7 @@ object OShare {
                     s"Cleaning up expired share '${share.name.getOrElse("")}' " +
                       s"owned by '${account.login.value.id}' (${share.id.id})"
                   ) *> Queries
-                  .deleteShare(share.id, false)(
+                  .deleteShare(share.id, background = false)(
                     store
                   )
               }

diff --git a/modules/backend/src/main/scala/sharry/backend/signup/OSignup.scala b/modules/backend/src/main/scala/sharry/backend/signup/OSignup.scala
@@ -95,7 +95,7 @@ object OSignup {
             AccountState.Active,
             data.password,
             None,
-            false
+            admin = false
           )
           res <- OAccount(store).use(_.create(acc))
         } yield res

diff --git a/modules/common/src/main/scala/sharry/common/AccountId.scala b/modules/common/src/main/scala/sharry/common/AccountId.scala
@@ -17,7 +17,7 @@ case class AccountId(id: Ident, userLogin: Ident, admin: Boolean, alias: Option[
 object AccountId {
 
   val empty: AccountId =
-    AccountId(Ident.empty, Ident.empty, false, None)
+    AccountId(Ident.empty, Ident.empty, admin = false, None)
 
   def parse(str: String): Either[String, AccountId] = {
     val parts = str.split('/').toList.appended("").take(4)

diff --git a/modules/common/src/main/scala/sharry/common/LenientUri.scala b/modules/common/src/main/scala/sharry/common/LenientUri.scala
@@ -72,7 +72,11 @@ case class LenientUri(
       .covary[F]
       .rethrow
       .flatMap(url =>
-        fs2.io.readInputStream(Sync[F].delay(url.openStream()), chunkSize, true)
+        fs2.io.readInputStream(
+          Sync[F].delay(url.openStream()),
+          chunkSize,
+          closeAfterUse = true
+        )
       )
 
   def readText[F[_]: Sync](chunkSize: Int): F[String] =
@@ -115,15 +119,15 @@ object LenientUri {
     val isRoot = true
     val isEmpty = false
     def /(seg: String): Path =
-      NonEmptyPath(NonEmptyList.of(seg), false)
+      NonEmptyPath(NonEmptyList.of(seg), trailingSlash = false)
     def asString = "/"
   }
   case object EmptyPath extends Path {
     val segments = Nil
     val isRoot = false
     val isEmpty = true
     def /(seg: String): Path =
-      NonEmptyPath(NonEmptyList.of(seg), false)
+      NonEmptyPath(NonEmptyList.of(seg), trailingSlash = false)
     def asString = ""
   }
   case class NonEmptyPath(segs: NonEmptyList[String], trailingSlash: Boolean)

diff --git a/modules/restserver/src/main/scala/sharry/restserver/RestServer.scala b/modules/restserver/src/main/scala/sharry/restserver/RestServer.scala
@@ -82,7 +82,7 @@ object RestServer {
       ).orNotFound
 
       // With Middlewares in place
-      finalHttpApp = Http4sLogger.httpApp(false, false)(httpApp)
+      finalHttpApp = Http4sLogger.httpApp(logHeaders = false, logBody = false)(httpApp)
 
     } yield finalHttpApp
   }

diff --git a/modules/restserver/src/main/scala/sharry/restserver/routes/AccountRoutes.scala b/modules/restserver/src/main/scala/sharry/restserver/routes/AccountRoutes.scala
@@ -49,9 +49,9 @@ object AccountRoutes {
           res <- backend.account.delete(id).value
           resp <- res match {
             case Some(_) =>
-              Ok(BasicResult(true, "Account successfully deleted."))
+              Ok(BasicResult(success = true, "Account successfully deleted."))
             case None =>
-              NotFound(BasicResult(false, "Account not found"))
+              NotFound(BasicResult(success = false, "Account not found"))
           }
         } yield resp
 

diff --git a/modules/restserver/src/main/scala/sharry/restserver/routes/Conv.scala b/modules/restserver/src/main/scala/sharry/restserver/routes/Conv.scala
@@ -43,40 +43,40 @@ object Conv {
   def basicResult(ar: AddResult, successMsg: String): BasicResult =
     ar match {
       case AddResult.Success =>
-        BasicResult(true, successMsg)
+        BasicResult(success = true, successMsg)
       case AddResult.EntityExists(msg) =>
-        BasicResult(false, msg)
+        BasicResult(success = false, msg)
       case AddResult.Failure(ex) =>
-        BasicResult(false, ex.getMessage)
+        BasicResult(success = false, ex.getMessage)
     }
 
   def idResult(successMsg: String)(ar: Either[Throwable, Ident]): IdResult =
     ar match {
-      case Right(id) => IdResult(true, successMsg, id)
-      case Left(ex)  => IdResult(false, s"${ex.getClass}: ${ex.getMessage}", Ident.empty)
+      case Right(id) => IdResult(success = true, successMsg, id)
+      case Left(ex)  => IdResult(success = false, s"${ex.getClass}: ${ex.getMessage}", Ident.empty)
     }
 
   def uploadResult(successMsg: String)(ur: UploadResult[Ident]): IdResult =
     ur match {
       case UploadResult.Success(id) =>
-        IdResult(true, successMsg, id)
+        IdResult(success = true, successMsg, id)
       case UploadResult.ValidityExceeded(max) =>
-        IdResult(false, s"Maximum validity ($max) exceeded", Ident.empty)
+        IdResult(success = false, s"Maximum validity ($max) exceeded", Ident.empty)
       case UploadResult.SizeExceeded(max) =>
-        IdResult(false, s"Maximum size ($max) exceeded", Ident.empty)
+        IdResult(success = false, s"Maximum size ($max) exceeded", Ident.empty)
       case UploadResult.PermanentError(msg) =>
-        IdResult(false, msg, Ident.empty)
+        IdResult(success = false, msg, Ident.empty)
     }
 
   def uploadBasicResult[A](successMsg: String)(ur: UploadResult[A]): BasicResult =
     ur match {
       case UploadResult.Success(_) =>
-        BasicResult(true, successMsg)
+        BasicResult(success = true, successMsg)
       case UploadResult.ValidityExceeded(max) =>
-        BasicResult(false, s"Maximum validity ($max) exceeded")
+        BasicResult(success = false, s"Maximum validity ($max) exceeded")
       case UploadResult.SizeExceeded(max) =>
-        BasicResult(false, s"Maximum size ($max) exceeded")
+        BasicResult(success = false, s"Maximum size ($max) exceeded")
       case UploadResult.PermanentError(msg) =>
-        BasicResult(false, msg)
+        BasicResult(success = false, msg)
     }
 }
diff --git a/modules/restserver/src/main/scala/sharry/restserver/routes/LoginRoutes.scala b/modules/restserver/src/main/scala/sharry/restserver/routes/LoginRoutes.scala
@@ -219,7 +219,7 @@ object LoginRoutes {
               token.account.id,
               token.account.userLogin,
               token.account.admin,
-              true,
+              success = true,
               "Login successful",
               Some(cd.asString),
               cfg.backend.auth.sessionValid.millis
@@ -231,7 +231,15 @@ object LoginRoutes {
           s"Authentication attempt failure for username $accountName from ip ${req.from.map(_.toInetAddress.getHostAddress).getOrElse("Unknown ip")}"
         ) *>
           Ok(
-            AuthResult(Ident.empty, Ident.empty, false, false, "Login failed.", None, 0L)
+            AuthResult(
+              Ident.empty,
+              Ident.empty,
+              admin = false,
+              success = false,
+              "Login failed.",
+              None,
+              0L
+            )
           )
     }
   }

diff --git a/modules/restserver/src/main/scala/sharry/restserver/routes/MailRoutes.scala b/modules/restserver/src/main/scala/sharry/restserver/routes/MailRoutes.scala
@@ -66,25 +66,30 @@ object MailRoutes {
         } yield res
 
         res.foldF(
-          err => Ok(BasicResult(false, s"Some recipient addresses are invalid: $err")),
+          err =>
+            Ok(
+              BasicResult(success = false, s"Some recipient addresses are invalid: $err")
+            ),
           r => Ok(mailSendResult(r))
         )
     }
   }
 
   private def mailSendResult(mr: MailSendResult): BasicResult =
     mr match {
-      case MailSendResult.Success => BasicResult(true, "Mail successfully sent.")
+      case MailSendResult.Success =>
+        BasicResult(success = true, "Mail successfully sent.")
       case MailSendResult.SendFailure(ex) =>
-        BasicResult(false, s"Mail sending failed: ${ex.getMessage}")
-      case MailSendResult.NoRecipients => BasicResult(false, "There are no recipients")
+        BasicResult(success = false, s"Mail sending failed: ${ex.getMessage}")
+      case MailSendResult.NoRecipients =>
+        BasicResult(success = false, "There are no recipients")
       case MailSendResult.NoSender =>
         BasicResult(
-          false,
+          success = false,
           "There are no sender addresses specified. You " +
             "may need to add an e-mail address to your account."
         )
       case MailSendResult.FeatureDisabled =>
-        BasicResult(false, "The mail feature is disabled")
+        BasicResult(success = false, "The mail feature is disabled")
     }
 }
diff --git a/modules/restserver/src/main/scala/sharry/restserver/routes/NotifyRoutes.scala b/modules/restserver/src/main/scala/sharry/restserver/routes/NotifyRoutes.scala
@@ -45,25 +45,25 @@ object NotifyRoutes {
   private def basicResult(n: List[NotifyResult]): BasicResult =
     n match {
       case Nil =>
-        BasicResult(false, "There is no email to notify")
+        BasicResult(success = false, "There is no email to notify")
 
       case NotifyResult.InvalidAlias :: Nil =>
-        BasicResult(false, "Invalid alias")
+        BasicResult(success = false, "Invalid alias")
 
       case NotifyResult.FeatureDisabled :: Nil =>
-        BasicResult(false, "Mail feature is disabled.")
+        BasicResult(success = false, "Mail feature is disabled.")
 
       case _ =>
         val success = n.filter(_.isSuccess).size
         val fails = n.filter(_.isError).size
         if (fails > 0 && success == 0)
-          BasicResult(false, s"Sending failed to all recipients ($fails)")
+          BasicResult(success = false, s"Sending failed to all recipients ($fails)")
         else if (fails > 0)
           BasicResult(
-            true,
+            success = true,
             s"Sending succeeded for $success, but failed for $fails recipients"
           )
-        else BasicResult(true, "Mail sent")
+        else BasicResult(success = true, "Mail sent")
     }
 
 }
diff --git a/modules/restserver/src/main/scala/sharry/restserver/routes/RegisterRoutes.scala b/modules/restserver/src/main/scala/sharry/restserver/routes/RegisterRoutes.scala
@@ -48,25 +48,25 @@ object RegisterRoutes {
   def convert(r: NewInviteResult): InviteResult =
     r match {
       case NewInviteResult.Success(id) =>
-        InviteResult(true, "New invitation created.", Some(id))
+        InviteResult(success = true, "New invitation created.", Some(id))
       case NewInviteResult.InvitationDisabled =>
-        InviteResult(false, "Signing up is not enabled for invitations.", None)
+        InviteResult(success = false, "Signing up is not enabled for invitations.", None)
       case NewInviteResult.PasswordMismatch =>
-        InviteResult(false, "Password is invalid.", None)
+        InviteResult(success = false, "Password is invalid.", None)
     }
 
   def convert(r: SignupResult): BasicResult =
     r match {
       case SignupResult.AccountExists =>
-        BasicResult(false, "An account with this name already exists.")
+        BasicResult(success = false, "An account with this name already exists.")
       case SignupResult.InvalidInvitationKey =>
-        BasicResult(false, "Invalid invitation key.")
+        BasicResult(success = false, "Invalid invitation key.")
       case SignupResult.SignupClosed =>
-        BasicResult(false, "Sorry, registration is closed.")
+        BasicResult(success = false, "Sorry, registration is closed.")
       case SignupResult.Failure(ex) =>
-        BasicResult(false, s"Internal error: ${ex.getMessage}")
+        BasicResult(success = false, s"Internal error: ${ex.getMessage}")
       case SignupResult.Success =>
-        BasicResult(true, "Signup successful")
+        BasicResult(success = true, "Signup successful")
     }
 
   def convert(r: Registration): RegisterData =

diff --git a/modules/restserver/src/main/scala/sharry/restserver/webapp/TemplateRoutes.scala b/modules/restserver/src/main/scala/sharry/restserver/webapp/TemplateRoutes.scala
@@ -90,7 +90,7 @@ object TemplateRoutes {
   def loadUrl[F[_]: Sync](url: URL): F[String] =
     Stream
       .bracket(Sync[F].blocking(url.openStream))(in => Sync[F].blocking(in.close))
-      .flatMap(in => io.readInputStream(in.pure[F], 64 * 1024, false))
+      .flatMap(in => io.readInputStream(in.pure[F], 64 * 1024, closeAfterUse = false))
       .through(text.utf8.decode)
       .compile
       .fold("")(_ + _)

diff --git a/modules/store/src/main/scala/sharry/store/ComputeChecksumConfig.scala b/modules/store/src/main/scala/sharry/store/ComputeChecksumConfig.scala
@@ -23,7 +23,7 @@ case class ComputeChecksumConfig(
 object ComputeChecksumConfig {
   val defaultParallel: Int = math.min(8, math.max(parallelMin, parallelMax))
 
-  val default = ComputeChecksumConfig(true, 5000, 0, true)
+  val default = ComputeChecksumConfig(enable = true, 5000, 0, useDefault = true)
 
   private def parallelMin: Int = 1
   private def parallelMax: Int = Runtime.getRuntime.availableProcessors() - 1