Scalafix organize-imports

modules/store/src/main/scala/docspell/store/AddResult.scala

@@ -1,6 +1,6 @@
 package docspell.store
 
-import AddResult._
+import docspell.store.AddResult._
 
 sealed trait AddResult {
   def toEither: Either[Throwable, Unit]

modules/store/src/main/scala/docspell/store/Store.scala

@@ -1,14 +1,16 @@
 package docspell.store
 
-import bitpeace.Bitpeace
+import scala.concurrent.ExecutionContext
+
+import cats.effect._
 import fs2._
-import cats.effect.{Blocker, ContextShift, Effect, Resource}
+
 import docspell.store.impl.StoreImpl
+
+import bitpeace.Bitpeace
 import doobie._
 import doobie.hikari.HikariTransactor
 
-import scala.concurrent.ExecutionContext
-
 trait Store[F[_]] {
 
   def transact[A](prg: ConnectionIO[A]): F[A]

modules/store/src/main/scala/docspell/store/impl/Column.scala

@@ -1,9 +1,12 @@
 package docspell.store.impl
 
-import doobie._, doobie.implicits._
-import docspell.store.impl.DoobieSyntax._
 import cats.data.NonEmptyList
 
+import docspell.store.impl.DoobieSyntax._
+
+import doobie._
+import doobie.implicits._
+
 case class Column(name: String, ns: String = "", alias: String = "") {
 
   val f = {

modules/store/src/main/scala/docspell/store/impl/DoobieMeta.scala

@@ -2,15 +2,16 @@ package docspell.store.impl
 
 import java.time.format.DateTimeFormatter
 import java.time.{Instant, LocalDate}
-import io.circe.{Decoder, Encoder}
+
+import docspell.common._
+import docspell.common.syntax.all._
+
+import com.github.eikek.calev.CalEvent
 import doobie._
 import doobie.implicits.legacy.instant._
 import doobie.util.log.Success
 import emil.doobie.EmilDoobieMeta
-import com.github.eikek.calev.CalEvent
-
-import docspell.common._
-import docspell.common.syntax.all._
+import io.circe.{Decoder, Encoder}
 
 trait DoobieMeta extends EmilDoobieMeta {
 

modules/store/src/main/scala/docspell/store/impl/DoobieSyntax.scala

@@ -1,6 +1,7 @@
 package docspell.store.impl
 
 import docspell.common.Timestamp
+
 import doobie._
 import doobie.implicits._
 

modules/store/src/main/scala/docspell/store/impl/StoreImpl.scala

@@ -1,11 +1,13 @@
 package docspell.store.impl
 
-import bitpeace.{Bitpeace, BitpeaceConfig, TikaMimetypeDetect}
 import cats.effect.Effect
 import cats.implicits._
+
 import docspell.common.Ident
 import docspell.store.migrate.FlywayMigrate
 import docspell.store.{AddResult, JdbcConfig, Store}
+
+import bitpeace.{Bitpeace, BitpeaceConfig, TikaMimetypeDetect}
 import doobie._
 import doobie.implicits._
 

modules/store/src/main/scala/docspell/store/migrate/FlywayMigrate.scala

@@ -1,7 +1,9 @@
 package docspell.store.migrate
 
 import cats.effect.Sync
+
 import docspell.store.JdbcConfig
+
 import org.flywaydb.core.Flyway
 import org.log4s._
 

modules/store/src/main/scala/docspell/store/queries/QAttachment.scala

@@ -1,16 +1,18 @@
 package docspell.store.queries
 
-import fs2.Stream
-import cats.implicits._
-import cats.effect.Sync
 import cats.data.OptionT
-import doobie._
-import doobie.implicits._
+import cats.effect.Sync
+import cats.implicits._
+import fs2.Stream
+
 import docspell.common._
+import docspell.common.syntax.all._
 import docspell.store.Store
 import docspell.store.impl.Implicits._
 import docspell.store.records._
-import docspell.common.syntax.all._
+
+import doobie._
+import doobie.implicits._
 
 object QAttachment {
   private[this] val logger = org.log4s.getLogger

modules/store/src/main/scala/docspell/store/queries/QCollective.scala

@@ -1,12 +1,14 @@
 package docspell.store.queries
 
 import fs2.Stream
-import doobie._
-import doobie.implicits._
+
+import docspell.common.ContactKind
 import docspell.common.{Direction, Ident}
 import docspell.store.impl.Implicits._
 import docspell.store.records._
-import docspell.common.ContactKind
+
+import doobie._
+import doobie.implicits._
 
 object QCollective {
 

modules/store/src/main/scala/docspell/store/queries/QItem.scala

@@ -1,19 +1,21 @@
 package docspell.store.queries
 
-import bitpeace.FileMeta
-import cats.effect.Sync
-import cats.data.OptionT
 import cats.data.NonEmptyList
-import cats.implicits._
+import cats.data.OptionT
+import cats.effect.Sync
 import cats.effect.concurrent.Ref
+import cats.implicits._
 import fs2.Stream
-import doobie._
-import doobie.implicits._
+
 import docspell.common.{IdRef, _}
 import docspell.store.Store
-import docspell.store.records._
-import docspell.store.impl._
 import docspell.store.impl.Implicits._
+import docspell.store.impl._
+import docspell.store.records._
+
+import bitpeace.FileMeta
+import doobie._
+import doobie.implicits._
 import org.log4s._
 
 object QItem {

modules/store/src/main/scala/docspell/store/queries/QJob.scala

@@ -2,14 +2,16 @@ package docspell.store.queries
 
 import cats.effect.Effect
 import cats.implicits._
+import fs2.Stream
+
 import docspell.common._
 import docspell.common.syntax.all._
 import docspell.store.Store
 import docspell.store.impl.Implicits._
 import docspell.store.records.{RJob, RJobGroupUse, RJobLog}
+
 import doobie._
 import doobie.implicits._
-import fs2.Stream
 import org.log4s._
 
 object QJob {

modules/store/src/main/scala/docspell/store/queries/QLogin.scala

@@ -5,6 +5,7 @@ import docspell.store.impl.Implicits._
 import docspell.store.records.RCollective.{Columns => CC}
 import docspell.store.records.RUser.{Columns => UC}
 import docspell.store.records.{RCollective, RUser}
+
 import doobie._
 import doobie.implicits._
 import org.log4s._

modules/store/src/main/scala/docspell/store/queries/QMails.scala

@@ -1,13 +1,14 @@
 package docspell.store.queries
 
 import cats.data.OptionT
-import doobie._
-import doobie.implicits._
 
 import docspell.common._
 import docspell.store.impl.Column
 import docspell.store.impl.Implicits._
-import docspell.store.records.{RItem, RSentMail, RSentMailItem, RUser}
+import docspell.store.records._
+
+import doobie._
+import doobie.implicits._
 
 object QMails {
 

modules/store/src/main/scala/docspell/store/queries/QOrganization.scala

@@ -1,16 +1,18 @@
 package docspell.store.queries
 
-import fs2._
 import cats.implicits._
-import doobie._
-import doobie.implicits._
+import fs2._
+
 import docspell.common._
-import docspell.store.{AddResult, Store}
 import docspell.store.impl.Column
 import docspell.store.impl.Implicits._
 import docspell.store.records.ROrganization.{Columns => OC}
 import docspell.store.records.RPerson.{Columns => PC}
 import docspell.store.records._
+import docspell.store.{AddResult, Store}
+
+import doobie._
+import doobie.implicits._
 
 object QOrganization {
 

modules/store/src/main/scala/docspell/store/queries/QPeriodicTask.scala

@@ -3,6 +3,7 @@ package docspell.store.queries
 import docspell.common._
 import docspell.store.impl.Implicits._
 import docspell.store.records._
+
 import doobie._
 import doobie.implicits._
 

modules/store/src/main/scala/docspell/store/queries/QUserTask.scala

@@ -1,10 +1,12 @@
 package docspell.store.queries
 
 import fs2._
+
 import docspell.common._
 import docspell.store.impl.Implicits._
 import docspell.store.records._
 import docspell.store.usertask.UserTask
+
 import doobie._
 
 object QUserTask {

modules/store/src/main/scala/docspell/store/queue/JobQueue.scala

@@ -1,12 +1,14 @@
 package docspell.store.queue
 
-import cats.implicits._
 import cats.effect.{Effect, Resource}
+import cats.implicits._
+
 import docspell.common._
 import docspell.common.syntax.all._
 import docspell.store.Store
 import docspell.store.queries.QJob
 import docspell.store.records.RJob
+
 import org.log4s._
 
 trait JobQueue[F[_]] {

modules/store/src/main/scala/docspell/store/queue/PeriodicTaskStore.scala

@@ -2,13 +2,15 @@ package docspell.store.queue
 
 import cats.effect._
 import cats.implicits._
-import org.log4s.getLogger
-import com.github.eikek.fs2calev._
+
 import docspell.common._
 import docspell.common.syntax.all._
-import docspell.store.{AddResult, Store}
-import docspell.store.records._
 import docspell.store.queries.QPeriodicTask
+import docspell.store.records._
+import docspell.store.{AddResult, Store}
+
+import com.github.eikek.fs2calev._
+import org.log4s.getLogger
 
 trait PeriodicTaskStore[F[_]] {
 

modules/store/src/main/scala/docspell/store/records/RAttachment.scala

@@ -1,12 +1,14 @@
 package docspell.store.records
 
-import bitpeace.FileMeta
 import cats.implicits._
+
+import docspell.common._
+import docspell.store.impl.Implicits._
+import docspell.store.impl._
+
+import bitpeace.FileMeta
 import doobie._
 import doobie.implicits._
-import docspell.common._
-import docspell.store.impl._
-import docspell.store.impl.Implicits._
 
 case class RAttachment(
     id: Ident,

modules/store/src/main/scala/docspell/store/records/RAttachmentArchive.scala

@@ -1,12 +1,14 @@
 package docspell.store.records
 
+import cats.data.NonEmptyList
+
+import docspell.common._
+import docspell.store.impl.Implicits._
+import docspell.store.impl._
+
 import bitpeace.FileMeta
 import doobie._
 import doobie.implicits._
-import docspell.common._
-import docspell.store.impl._
-import docspell.store.impl.Implicits._
-import cats.data.NonEmptyList
 
 /** The archive file of some attachment. The `id` is shared with the
   * attachment, to create a 0..1-1 relationship.

modules/store/src/main/scala/docspell/store/records/RAttachmentMeta.scala

@@ -1,11 +1,13 @@
 package docspell.store.records
 
 import cats.implicits._
+
+import docspell.common._
+import docspell.store.impl.Implicits._
+import docspell.store.impl._
+
 import doobie._
 import doobie.implicits._
-import docspell.common._
-import docspell.store.impl._
-import docspell.store.impl.Implicits._
 
 case class RAttachmentMeta(
     id: Ident, //same as RAttachment.id

modules/store/src/main/scala/docspell/store/records/RAttachmentSource.scala

@@ -1,11 +1,12 @@
 package docspell.store.records
 
+import docspell.common._
+import docspell.store.impl.Implicits._
+import docspell.store.impl._
+
 import bitpeace.FileMeta
 import doobie._
 import doobie.implicits._
-import docspell.common._
-import docspell.store.impl._
-import docspell.store.impl.Implicits._
 
 /** The origin file of an attachment. The `id` is shared with the
   * attachment, to create a 1-1 (or 0..1-1) relationship.

modules/store/src/main/scala/docspell/store/records/RCollective.scala

@@ -1,11 +1,13 @@
 package docspell.store.records
 
+import fs2.Stream
+
 import docspell.common._
 import docspell.store.impl.Column
 import docspell.store.impl.Implicits._
+
 import doobie._
 import doobie.implicits._
-import fs2.Stream
 
 case class RCollective(
     id: Ident,

modules/store/src/main/scala/docspell/store/records/RContact.scala

@@ -1,9 +1,11 @@
 package docspell.store.records
 
-import doobie._, doobie.implicits._
 import docspell.common._
-import docspell.store.impl._
 import docspell.store.impl.Implicits._
+import docspell.store.impl._
+
+import doobie._
+import doobie.implicits._
 
 case class RContact(
     contactId: Ident,

modules/store/src/main/scala/docspell/store/records/REquipment.scala

@@ -1,9 +1,11 @@
 package docspell.store.records
 
-import doobie._, doobie.implicits._
 import docspell.common._
-import docspell.store.impl._
 import docspell.store.impl.Implicits._
+import docspell.store.impl._
+
+import doobie._
+import doobie.implicits._
 
 case class REquipment(eid: Ident, cid: Ident, name: String, created: Timestamp) {}
 

modules/store/src/main/scala/docspell/store/records/RFileMeta.scala

@@ -1,13 +1,13 @@
 package docspell.store.records
 
+import docspell.common._
+import docspell.store.impl.Implicits._
+import docspell.store.impl._
+
 import bitpeace.FileMeta
 import doobie._
 import doobie.implicits._
 
-import docspell.common._
-import docspell.store.impl._
-import docspell.store.impl.Implicits._
-
 object RFileMeta {
 
   val table = fr"filemeta"

modules/store/src/main/scala/docspell/store/records/RFtsMigration.scala

@@ -1,12 +1,14 @@
 package docspell.store.records
 
-import cats.implicits._
 import cats.effect._
+import cats.implicits._
+
+import docspell.common._
+import docspell.store.impl.Implicits._
+import docspell.store.impl._
+
 import doobie._
 import doobie.implicits._
-import docspell.common._
-import docspell.store.impl._
-import docspell.store.impl.Implicits._
 
 final case class RFtsMigration(
     id: Ident,

modules/store/src/main/scala/docspell/store/records/RInvitation.scala

@@ -1,12 +1,14 @@
 package docspell.store.records
 
-import cats.implicits._
 import cats.effect.Sync
+import cats.implicits._
+
+import docspell.common._
+import docspell.store.impl.Implicits._
+import docspell.store.impl._
+
 import doobie._
 import doobie.implicits._
-import docspell.common._
-import docspell.store.impl._
-import docspell.store.impl.Implicits._
 
 case class RInvitation(id: Ident, created: Timestamp) {}
 

modules/store/src/main/scala/docspell/store/records/RItem.scala

@@ -3,11 +3,13 @@ package docspell.store.records
 import cats.data.NonEmptyList
 import cats.effect.Sync
 import cats.implicits._
+
+import docspell.common._
+import docspell.store.impl.Implicits._
+import docspell.store.impl._
+
 import doobie._
 import doobie.implicits._
-import docspell.common._
-import docspell.store.impl._
-import docspell.store.impl.Implicits._
 
 case class RItem(
     id: Ident,

modules/store/src/main/scala/docspell/store/records/RJob.scala

@@ -3,14 +3,15 @@ package docspell.store.records
 import cats.effect.Sync
 import cats.implicits._
 import fs2.Stream
-import doobie._
-import doobie.implicits._
-import io.circe.Encoder
 
 import docspell.common._
 import docspell.store.impl.Column
 import docspell.store.impl.Implicits._
 
+import doobie._
+import doobie.implicits._
+import io.circe.Encoder
+
 case class RJob(
     id: Ident,
     task: Ident,

modules/store/src/main/scala/docspell/store/records/RJobGroupUse.scala

@@ -1,12 +1,14 @@
 package docspell.store.records
 
 import cats.implicits._
-import doobie._
-import doobie.implicits._
+
 import docspell.common._
 import docspell.store.impl.Column
 import docspell.store.impl.Implicits._
 
+import doobie._
+import doobie.implicits._
+
 case class RJobGroupUse(groupId: Ident, workerId: Ident) {}
 
 object RJobGroupUse {

modules/store/src/main/scala/docspell/store/records/RJobLog.scala

@@ -1,11 +1,12 @@
 package docspell.store.records
 
-import doobie._
-import doobie.implicits._
 import docspell.common._
 import docspell.store.impl.Column
 import docspell.store.impl.Implicits._
 
+import doobie._
+import doobie.implicits._
+
 case class RJobLog(
     id: Ident,
     jobId: Ident,

modules/store/src/main/scala/docspell/store/records/RNode.scala

@@ -2,12 +2,14 @@ package docspell.store.records
 
 import cats.effect.Sync
 import cats.implicits._
-import doobie._
-import doobie.implicits._
+
 import docspell.common._
 import docspell.store.impl.Column
 import docspell.store.impl.Implicits._
 
+import doobie._
+import doobie.implicits._
+
 case class RNode(
     id: Ident,
     nodeType: NodeType,

modules/store/src/main/scala/docspell/store/records/ROrganization.scala

@@ -2,11 +2,13 @@ package docspell.store.records
 
 import cats.Eq
 import fs2.Stream
+
+import docspell.common.{IdRef, _}
+import docspell.store.impl.Implicits._
+import docspell.store.impl._
+
 import doobie._
 import doobie.implicits._
-import docspell.common.{IdRef, _}
-import docspell.store.impl._
-import docspell.store.impl.Implicits._
 
 case class ROrganization(
     oid: Ident,

modules/store/src/main/scala/docspell/store/records/RPeriodicTask.scala

@@ -2,12 +2,14 @@ package docspell.store.records
 
 import cats.effect._
 import cats.implicits._
-import doobie._
-import doobie.implicits._
-import com.github.eikek.calev.CalEvent
+
 import docspell.common._
 import docspell.store.impl.Column
 import docspell.store.impl.Implicits._
+
+import com.github.eikek.calev.CalEvent
+import doobie._
+import doobie.implicits._
 import io.circe.Encoder
 
 /** A periodic task is a special job description, that shares a few

modules/store/src/main/scala/docspell/store/records/RPerson.scala

@@ -1,12 +1,14 @@
 package docspell.store.records
 
-import fs2.Stream
 import cats.Eq
+import fs2.Stream
+
+import docspell.common.{IdRef, _}
+import docspell.store.impl.Implicits._
+import docspell.store.impl._
+
 import doobie._
 import doobie.implicits._
-import docspell.common.{IdRef, _}
-import docspell.store.impl._
-import docspell.store.impl.Implicits._
 
 case class RPerson(
     pid: Ident,

modules/store/src/main/scala/docspell/store/records/RSentMail.scala

@@ -1,16 +1,18 @@
 package docspell.store.records
 
-import fs2.Stream
+import cats.data.NonEmptyList
+import cats.data.OptionT
 import cats.effect._
 import cats.implicits._
-import cats.data.NonEmptyList
-import doobie._
-import doobie.implicits._
+import fs2.Stream
+
 import docspell.common._
 import docspell.store.impl.Column
 import docspell.store.impl.Implicits._
+
+import doobie._
+import doobie.implicits._
 import emil.MailAddress
-import cats.data.OptionT
 
 case class RSentMail(
     id: Ident,

modules/store/src/main/scala/docspell/store/records/RSentMailItem.scala

@@ -2,12 +2,14 @@ package docspell.store.records
 
 import cats.effect._
 import cats.implicits._
-import doobie._
-import doobie.implicits._
+
 import docspell.common._
 import docspell.store.impl.Column
 import docspell.store.impl.Implicits._
 
+import doobie._
+import doobie.implicits._
+
 case class RSentMailItem(
     id: Ident,
     itemId: Ident,

modules/store/src/main/scala/docspell/store/records/RSource.scala

@@ -1,10 +1,11 @@
 package docspell.store.records
 
+import docspell.common._
+import docspell.store.impl.Implicits._
+import docspell.store.impl._
+
 import doobie._
 import doobie.implicits._
-import docspell.common._
-import docspell.store.impl._
-import docspell.store.impl.Implicits._
 
 case class RSource(
     sid: Ident,

modules/store/src/main/scala/docspell/store/records/RTag.scala

@@ -1,9 +1,11 @@
 package docspell.store.records
 
-import doobie._, doobie.implicits._
 import docspell.common._
-import docspell.store.impl._
 import docspell.store.impl.Implicits._
+import docspell.store.impl._
+
+import doobie._
+import doobie.implicits._
 
 case class RTag(
     tagId: Ident,

modules/store/src/main/scala/docspell/store/records/RTagItem.scala

@@ -1,11 +1,13 @@
 package docspell.store.records
 
 import cats.implicits._
+
+import docspell.common._
+import docspell.store.impl.Implicits._
+import docspell.store.impl._
+
 import doobie._
 import doobie.implicits._
-import docspell.common._
-import docspell.store.impl._
-import docspell.store.impl.Implicits._
 
 case class RTagItem(tagItemId: Ident, itemId: Ident, tagId: Ident) {}
 

modules/store/src/main/scala/docspell/store/records/RUser.scala

@@ -1,9 +1,11 @@
 package docspell.store.records
 
-import doobie._, doobie.implicits._
 import docspell.common._
-import docspell.store.impl._
 import docspell.store.impl.Implicits._
+import docspell.store.impl._
+
+import doobie._
+import doobie.implicits._
 
 case class RUser(
     uid: Ident,

modules/store/src/main/scala/docspell/store/records/RUserEmail.scala

@@ -1,13 +1,15 @@
 package docspell.store.records
 
-import doobie._
-import doobie.implicits._
+import cats.data.OptionT
 import cats.effect._
 import cats.implicits._
-import cats.data.OptionT
+
 import docspell.common._
 import docspell.store.impl.Column
 import docspell.store.impl.Implicits._
+
+import doobie._
+import doobie.implicits._
 import emil.{MailAddress, MailConfig, SSLType}
 
 case class RUserEmail(

modules/store/src/main/scala/docspell/store/records/RUserImap.scala

@@ -1,13 +1,15 @@
 package docspell.store.records
 
-import doobie._
-import doobie.implicits._
+import cats.data.OptionT
 import cats.effect._
 import cats.implicits._
-import cats.data.OptionT
+
 import docspell.common._
 import docspell.store.impl.Column
 import docspell.store.impl.Implicits._
+
+import doobie._
+import doobie.implicits._
 import emil.{MailConfig, SSLType}
 
 case class RUserImap(

modules/store/src/main/scala/docspell/store/syntax/MimeTypes.scala

@@ -1,8 +1,9 @@
 package docspell.store.syntax
 
-import bitpeace.Mimetype
 import docspell.common._
 
+import bitpeace.Mimetype
+
 object MimeTypes {
 
   implicit final class BitpeaceMimeTypeOps(bmt: Mimetype) {

modules/store/src/main/scala/docspell/store/usertask/UserTask.scala

@@ -2,14 +2,15 @@ package docspell.store.usertask
 
 import cats.effect._
 import cats.implicits._
-import com.github.eikek.calev.CalEvent
-import io.circe.Decoder
-import io.circe.Encoder
 
 import docspell.common._
 import docspell.common.syntax.all._
 import docspell.store.records.RPeriodicTask
 
+import com.github.eikek.calev.CalEvent
+import io.circe.Decoder
+import io.circe.Encoder
+
 case class UserTask[A](
     id: Ident,
     name: Ident,

modules/store/src/main/scala/docspell/store/usertask/UserTaskStore.scala

@@ -1,13 +1,15 @@
 package docspell.store.usertask
 
-import fs2.Stream
-import cats.implicits._
-import cats.effect._
 import cats.data.OptionT
-import io.circe._
+import cats.effect._
+import cats.implicits._
+import fs2.Stream
+
 import docspell.common._
-import docspell.store.{AddResult, Store}
 import docspell.store.queries.QUserTask
+import docspell.store.{AddResult, Store}
+
+import io.circe._
 
 /** User tasks are `RPeriodicTask`s that can be managed by the user.
   * The user can change arguments, enable/disable it or run it just