From e1bbc2edf5ef4d2ca5ff99da1709db4ee5a87b33 Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Sat, 10 Apr 2021 16:31:58 +0200
Subject: [PATCH] Apply autoformat
---
build.sbt | 8 ++++---
.../StanfordTextClassifierSuite.scala | 18 ++++++++------
.../contact/ContactAnnotateSpec.scala | 1 +
.../docspell/analysis/date/DateFindSpec.scala | 8 ++++---
.../analysis/nlp/BaseCRFAnnotatorSuite.scala | 5 ++--
.../nlp/StanfordNerAnnotatorSuite.scala | 6 +++--
.../test/scala/docspell/common/GlobTest.scala | 3 ++-
.../docspell/common/LenientUriTest.scala | 1 +
.../common/MetaProposalListTest.scala | 4 +++-
.../docspell/convert/ConversionTest.scala | 6 +++--
.../scala/docspell/convert/FileChecks.scala | 1 +
.../convert/extern/ExternConvTest.scala | 4 +++-
.../extract/ocr/TextExtractionSuite.scala | 2 ++
.../docspell/extract/odf/OdfExtractTest.scala | 2 ++
.../extract/pdfbox/PdfboxExtractTest.scala | 2 ++
.../extract/pdfbox/PdfboxPreviewTest.scala | 9 ++++---
.../docspell/extract/poi/PoiExtractTest.scala | 2 ++
.../docspell/extract/rtf/RtfExtractTest.scala | 1 +
.../scala/docspell/files/ImageSizeTest.scala | 9 +++----
.../test/scala/docspell/files/Playing.scala | 7 +++---
.../test/scala/docspell/files/TestFiles.scala | 4 ++--
.../test/scala/docspell/files/ZipTest.scala | 7 ++++--
.../docspell/joex/analysis/NerFileTest.scala | 6 +++--
.../joex/scheduler/CountingSchemeSpec.scala | 1 +
.../docspell/query/FulltextExtractTest.scala | 4 +++-
.../query/internal/AttrParserTest.scala | 1 +
.../query/internal/BasicParserTest.scala | 4 +++-
.../query/internal/DateParserTest.scala | 6 +++--
.../query/internal/ExprParserTest.scala | 6 +++--
.../query/internal/ItemQueryParserTest.scala | 5 ++--
.../query/internal/MacroParserTest.scala | 4 ++--
.../query/internal/OperatorParserTest.scala | 3 ++-
.../query/internal/SimpleExprParserTest.scala | 11 +++++----
.../docspell/query/internal/ValueHelper.scala | 3 ++-
.../scala/docspell/store/StoreFixture.scala | 6 +++--
.../generator/ItemQueryGeneratorTest.scala | 7 +++---
.../docspell/store/qb/QueryBuilderTest.scala | 5 ++--
.../store/qb/impl/ConditionBuilderTest.scala | 5 ++--
.../docspell/store/qb/impl/DSLTest.scala | 5 ++--
.../store/qb/impl/SelectBuilderTest.scala | 5 ++--
.../store/qb/model/CourseRecord.scala | 1 +
.../store/qb/model/PersonRecord.scala | 3 ++-
project/Dependencies.scala | 8 +++----
project/ZolaPlugin.scala | 4 ++--
project/plugins.sbt | 24 +++++++++----------
45 files changed, 151 insertions(+), 86 deletions(-)
diff --git a/build.sbt b/build.sbt
index 4188df7a..2e43f5c9 100644
--- a/build.sbt
+++ b/build.sbt
@@ -92,11 +92,11 @@ def webjarSettings(queryJS: Project) = Seq(
}.taskValue,
Compile / resourceGenerators += Def.task {
val logger = streams.value.log
- val out = (queryJS/Compile/fullOptJS).value
+ val out = (queryJS / Compile / fullOptJS).value
logger.info(s"Produced query js file: ${out.data}")
copyWebjarResources(
Seq(out.data),
- (Compile/resourceManaged).value,
+ (Compile / resourceManaged).value,
name.value,
version.value,
logger
@@ -218,7 +218,9 @@ val openapiScalaSettings = Seq(
field.copy(typeDef = TypeDef("OrgUse", Imports("docspell.common.OrgUse")))
case "equipmentuse" =>
field =>
- field.copy(typeDef = TypeDef("EquipmentUse", Imports("docspell.common.EquipmentUse")))
+ field.copy(typeDef =
+ TypeDef("EquipmentUse", Imports("docspell.common.EquipmentUse"))
+ )
}))
)
diff --git a/modules/analysis/src/test/scala/docspell/analysis/classifier/StanfordTextClassifierSuite.scala b/modules/analysis/src/test/scala/docspell/analysis/classifier/StanfordTextClassifierSuite.scala
index 1fcf5e81..2e483b2a 100644
--- a/modules/analysis/src/test/scala/docspell/analysis/classifier/StanfordTextClassifierSuite.scala
+++ b/modules/analysis/src/test/scala/docspell/analysis/classifier/StanfordTextClassifierSuite.scala
@@ -1,14 +1,18 @@
package docspell.analysis.classifier
-import munit._
-import cats.effect._
-import scala.concurrent.ExecutionContext
import java.nio.file.Paths
-import cats.data.NonEmptyList
-import docspell.common._
-import fs2.Stream
+
+import scala.concurrent.ExecutionContext
+
import cats.data.Kleisli
-import TextClassifier.Data
+import cats.data.NonEmptyList
+import cats.effect._
+import fs2.Stream
+
+import docspell.analysis.classifier.TextClassifier.Data
+import docspell.common._
+
+import munit._
class StanfordTextClassifierSuite extends FunSuite {
val logger = Logger.log4s[IO](org.log4s.getLogger)
diff --git a/modules/analysis/src/test/scala/docspell/analysis/contact/ContactAnnotateSpec.scala b/modules/analysis/src/test/scala/docspell/analysis/contact/ContactAnnotateSpec.scala
index 106dad9e..f9f5d9e4 100644
--- a/modules/analysis/src/test/scala/docspell/analysis/contact/ContactAnnotateSpec.scala
+++ b/modules/analysis/src/test/scala/docspell/analysis/contact/ContactAnnotateSpec.scala
@@ -1,6 +1,7 @@
package docspell.analysis.contact
import docspell.common.{NerLabel, NerTag}
+
import munit._
class ContactAnnotateSpec extends FunSuite {
diff --git a/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala b/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala
index 3711434f..6d014868 100644
--- a/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala
+++ b/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala
@@ -1,10 +1,12 @@
package docspell.analysis.date
-import docspell.files.TestFiles
-import munit._
-import docspell.common._
import java.time._
+import docspell.common._
+import docspell.files.TestFiles
+
+import munit._
+
class DateFindSpec extends FunSuite {
test("find simple dates") {
diff --git a/modules/analysis/src/test/scala/docspell/analysis/nlp/BaseCRFAnnotatorSuite.scala b/modules/analysis/src/test/scala/docspell/analysis/nlp/BaseCRFAnnotatorSuite.scala
index 340359e1..e760532f 100644
--- a/modules/analysis/src/test/scala/docspell/analysis/nlp/BaseCRFAnnotatorSuite.scala
+++ b/modules/analysis/src/test/scala/docspell/analysis/nlp/BaseCRFAnnotatorSuite.scala
@@ -2,9 +2,10 @@ package docspell.analysis.nlp
import docspell.analysis.Env
import docspell.common.Language.NLPLanguage
-import munit._
-import docspell.files.TestFiles
import docspell.common._
+import docspell.files.TestFiles
+
+import munit._
class BaseCRFAnnotatorSuite extends FunSuite {
diff --git a/modules/analysis/src/test/scala/docspell/analysis/nlp/StanfordNerAnnotatorSuite.scala b/modules/analysis/src/test/scala/docspell/analysis/nlp/StanfordNerAnnotatorSuite.scala
index 46bcb841..4938c45b 100644
--- a/modules/analysis/src/test/scala/docspell/analysis/nlp/StanfordNerAnnotatorSuite.scala
+++ b/modules/analysis/src/test/scala/docspell/analysis/nlp/StanfordNerAnnotatorSuite.scala
@@ -3,12 +3,14 @@ package docspell.analysis.nlp
import java.nio.file.Paths
import cats.effect.IO
+
import docspell.analysis.Env
-import munit._
-import docspell.files.TestFiles
import docspell.common._
import docspell.common.syntax.FileSyntax._
+import docspell.files.TestFiles
+
import edu.stanford.nlp.pipeline.StanfordCoreNLP
+import munit._
class StanfordNerAnnotatorSuite extends FunSuite {
lazy val germanClassifier =
diff --git a/modules/common/src/test/scala/docspell/common/GlobTest.scala b/modules/common/src/test/scala/docspell/common/GlobTest.scala
index be20b9ba..90408ceb 100644
--- a/modules/common/src/test/scala/docspell/common/GlobTest.scala
+++ b/modules/common/src/test/scala/docspell/common/GlobTest.scala
@@ -1,7 +1,8 @@
package docspell.common
+import docspell.common.Glob._
+
import munit._
-import Glob._
class GlobTest extends FunSuite {
diff --git a/modules/common/src/test/scala/docspell/common/LenientUriTest.scala b/modules/common/src/test/scala/docspell/common/LenientUriTest.scala
index 1d814791..5e3e0c97 100644
--- a/modules/common/src/test/scala/docspell/common/LenientUriTest.scala
+++ b/modules/common/src/test/scala/docspell/common/LenientUriTest.scala
@@ -1,6 +1,7 @@
package docspell.common
import cats.implicits._
+
import munit._
class LenientUriTest extends FunSuite {
diff --git a/modules/common/src/test/scala/docspell/common/MetaProposalListTest.scala b/modules/common/src/test/scala/docspell/common/MetaProposalListTest.scala
index fd705510..fdee5937 100644
--- a/modules/common/src/test/scala/docspell/common/MetaProposalListTest.scala
+++ b/modules/common/src/test/scala/docspell/common/MetaProposalListTest.scala
@@ -1,9 +1,11 @@
package docspell.common
-import munit._
import cats.data.NonEmptyList
+
import docspell.common.MetaProposal.Candidate
+import munit._
+
class MetaProposalListTest extends FunSuite {
test("flatten retains order of candidates") {
diff --git a/modules/convert/src/test/scala/docspell/convert/ConversionTest.scala b/modules/convert/src/test/scala/docspell/convert/ConversionTest.scala
index f0ce80a4..8528d25f 100644
--- a/modules/convert/src/test/scala/docspell/convert/ConversionTest.scala
+++ b/modules/convert/src/test/scala/docspell/convert/ConversionTest.scala
@@ -3,16 +3,18 @@ package docspell.convert
import java.nio.file.Paths
import cats.data.Kleisli
-import cats.implicits._
import cats.effect.IO
+import cats.implicits._
import fs2.Stream
+
import docspell.common._
import docspell.convert.ConversionResult.Handler
+import docspell.convert.extern.OcrMyPdfConfig
import docspell.convert.extern.{TesseractConfig, UnoconvConfig, WkHtmlPdfConfig}
import docspell.convert.flexmark.MarkdownConfig
import docspell.files.{ExampleFiles, TestFiles}
+
import munit._
-import docspell.convert.extern.OcrMyPdfConfig
class ConversionTest extends FunSuite with FileChecks {
val blocker = TestFiles.blocker
diff --git a/modules/convert/src/test/scala/docspell/convert/FileChecks.scala b/modules/convert/src/test/scala/docspell/convert/FileChecks.scala
index 0f6f17d8..fe340b6c 100644
--- a/modules/convert/src/test/scala/docspell/convert/FileChecks.scala
+++ b/modules/convert/src/test/scala/docspell/convert/FileChecks.scala
@@ -6,6 +6,7 @@ import java.nio.file.{Files, Path}
import cats.data.Kleisli
import cats.effect.IO
import fs2.{Pipe, Stream}
+
import docspell.common.MimeType
import docspell.convert.ConversionResult.Handler
import docspell.files.TikaMimetype
diff --git a/modules/convert/src/test/scala/docspell/convert/extern/ExternConvTest.scala b/modules/convert/src/test/scala/docspell/convert/extern/ExternConvTest.scala
index 87cb3d33..305fc2c1 100644
--- a/modules/convert/src/test/scala/docspell/convert/extern/ExternConvTest.scala
+++ b/modules/convert/src/test/scala/docspell/convert/extern/ExternConvTest.scala
@@ -1,13 +1,15 @@
package docspell.convert.extern
+import java.nio.charset.StandardCharsets
import java.nio.file.{Path, Paths}
import cats.effect._
+
import docspell.common._
import docspell.convert._
import docspell.files.{ExampleFiles, TestFiles}
+
import munit._
-import java.nio.charset.StandardCharsets
class ExternConvTest extends FunSuite with FileChecks {
val blocker = TestFiles.blocker
diff --git a/modules/extract/src/test/scala/docspell/extract/ocr/TextExtractionSuite.scala b/modules/extract/src/test/scala/docspell/extract/ocr/TextExtractionSuite.scala
index c880ad6c..c074a02d 100644
--- a/modules/extract/src/test/scala/docspell/extract/ocr/TextExtractionSuite.scala
+++ b/modules/extract/src/test/scala/docspell/extract/ocr/TextExtractionSuite.scala
@@ -1,8 +1,10 @@
package docspell.extract.ocr
import cats.effect.IO
+
import docspell.common.Logger
import docspell.files.TestFiles
+
import munit._
class TextExtractionSuite extends FunSuite {
diff --git a/modules/extract/src/test/scala/docspell/extract/odf/OdfExtractTest.scala b/modules/extract/src/test/scala/docspell/extract/odf/OdfExtractTest.scala
index ea1d8a49..7d3a172f 100644
--- a/modules/extract/src/test/scala/docspell/extract/odf/OdfExtractTest.scala
+++ b/modules/extract/src/test/scala/docspell/extract/odf/OdfExtractTest.scala
@@ -1,7 +1,9 @@
package docspell.extract.odf
import cats.effect._
+
import docspell.files.{ExampleFiles, TestFiles}
+
import munit._
class OdfExtractTest extends FunSuite {
diff --git a/modules/extract/src/test/scala/docspell/extract/pdfbox/PdfboxExtractTest.scala b/modules/extract/src/test/scala/docspell/extract/pdfbox/PdfboxExtractTest.scala
index d39ef1c2..fa37ec4a 100644
--- a/modules/extract/src/test/scala/docspell/extract/pdfbox/PdfboxExtractTest.scala
+++ b/modules/extract/src/test/scala/docspell/extract/pdfbox/PdfboxExtractTest.scala
@@ -1,7 +1,9 @@
package docspell.extract.pdfbox
import cats.effect._
+
import docspell.files.{ExampleFiles, TestFiles}
+
import munit._
class PdfboxExtractTest extends FunSuite {
diff --git a/modules/extract/src/test/scala/docspell/extract/pdfbox/PdfboxPreviewTest.scala b/modules/extract/src/test/scala/docspell/extract/pdfbox/PdfboxPreviewTest.scala
index f4a1fd9b..d1594de6 100644
--- a/modules/extract/src/test/scala/docspell/extract/pdfbox/PdfboxPreviewTest.scala
+++ b/modules/extract/src/test/scala/docspell/extract/pdfbox/PdfboxPreviewTest.scala
@@ -1,11 +1,14 @@
package docspell.extract.pdfbox
-import cats.effect._
-import docspell.files.{ExampleFiles, TestFiles}
-import munit._
import java.nio.file.Path
+
+import cats.effect._
import fs2.Stream
+import docspell.files.{ExampleFiles, TestFiles}
+
+import munit._
+
class PdfboxPreviewTest extends FunSuite {
val blocker = TestFiles.blocker
implicit val CS = TestFiles.CS
diff --git a/modules/extract/src/test/scala/docspell/extract/poi/PoiExtractTest.scala b/modules/extract/src/test/scala/docspell/extract/poi/PoiExtractTest.scala
index d89d2c84..336f54d4 100644
--- a/modules/extract/src/test/scala/docspell/extract/poi/PoiExtractTest.scala
+++ b/modules/extract/src/test/scala/docspell/extract/poi/PoiExtractTest.scala
@@ -1,8 +1,10 @@
package docspell.extract.poi
import cats.effect._
+
import docspell.common.MimeTypeHint
import docspell.files.{ExampleFiles, TestFiles}
+
import munit._
class PoiExtractTest extends FunSuite {
diff --git a/modules/extract/src/test/scala/docspell/extract/rtf/RtfExtractTest.scala b/modules/extract/src/test/scala/docspell/extract/rtf/RtfExtractTest.scala
index 6736c0cd..9f513ba4 100644
--- a/modules/extract/src/test/scala/docspell/extract/rtf/RtfExtractTest.scala
+++ b/modules/extract/src/test/scala/docspell/extract/rtf/RtfExtractTest.scala
@@ -1,6 +1,7 @@
package docspell.extract.rtf
import docspell.files.ExampleFiles
+
import munit._
class RtfExtractTest extends FunSuite {
diff --git a/modules/files/src/test/scala/docspell/files/ImageSizeTest.scala b/modules/files/src/test/scala/docspell/files/ImageSizeTest.scala
index 8cbc02c9..e82b0ce2 100644
--- a/modules/files/src/test/scala/docspell/files/ImageSizeTest.scala
+++ b/modules/files/src/test/scala/docspell/files/ImageSizeTest.scala
@@ -1,12 +1,13 @@
package docspell.files
-import cats.implicits._
-import cats.effect.{Blocker, IO}
-import munit._
-
import scala.concurrent.ExecutionContext
import scala.util.Using
+import cats.effect.{Blocker, IO}
+import cats.implicits._
+
+import munit._
+
class ImageSizeTest extends FunSuite {
val blocker = Blocker.liftExecutionContext(ExecutionContext.global)
implicit val CS = IO.contextShift(ExecutionContext.global)
diff --git a/modules/files/src/test/scala/docspell/files/Playing.scala b/modules/files/src/test/scala/docspell/files/Playing.scala
index 0f4f2423..ecddf526 100644
--- a/modules/files/src/test/scala/docspell/files/Playing.scala
+++ b/modules/files/src/test/scala/docspell/files/Playing.scala
@@ -1,10 +1,11 @@
package docspell.files
-import cats.effect.{Blocker, ExitCode, IO, IOApp}
-import docspell.common.MimeTypeHint
-
import scala.concurrent.ExecutionContext
+import cats.effect._
+
+import docspell.common.MimeTypeHint
+
object Playing extends IOApp {
val blocker = Blocker.liftExecutionContext(ExecutionContext.global)
diff --git a/modules/files/src/test/scala/docspell/files/TestFiles.scala b/modules/files/src/test/scala/docspell/files/TestFiles.scala
index b415de1c..283734cf 100644
--- a/modules/files/src/test/scala/docspell/files/TestFiles.scala
+++ b/modules/files/src/test/scala/docspell/files/TestFiles.scala
@@ -1,10 +1,10 @@
package docspell.files
+import scala.concurrent.ExecutionContext
+
import cats.effect.{Blocker, IO}
import fs2.Stream
-import scala.concurrent.ExecutionContext
-
object TestFiles {
val blocker = Blocker.liftExecutionContext(ExecutionContext.global)
implicit val CS = IO.contextShift(ExecutionContext.global)
diff --git a/modules/files/src/test/scala/docspell/files/ZipTest.scala b/modules/files/src/test/scala/docspell/files/ZipTest.scala
index 51dbb50a..8ca1e991 100644
--- a/modules/files/src/test/scala/docspell/files/ZipTest.scala
+++ b/modules/files/src/test/scala/docspell/files/ZipTest.scala
@@ -1,11 +1,14 @@
package docspell.files
-import munit._
+import scala.concurrent.ExecutionContext
+
import cats.effect._
import cats.implicits._
-import scala.concurrent.ExecutionContext
+
import docspell.common.Glob
+import munit._
+
class ZipTest extends FunSuite {
val blocker = Blocker.liftExecutionContext(ExecutionContext.global)
diff --git a/modules/joex/src/test/scala/docspell/joex/analysis/NerFileTest.scala b/modules/joex/src/test/scala/docspell/joex/analysis/NerFileTest.scala
index fa8412a4..b5c83f5f 100644
--- a/modules/joex/src/test/scala/docspell/joex/analysis/NerFileTest.scala
+++ b/modules/joex/src/test/scala/docspell/joex/analysis/NerFileTest.scala
@@ -1,9 +1,11 @@
package docspell.joex.analysis
-import munit._
-import NerFile.Pattern
import java.{util => ju}
+import docspell.joex.analysis.NerFile.Pattern
+
+import munit._
+
class NerFileTest extends FunSuite {
test("create valid case insensitive patterns") {
diff --git a/modules/joex/src/test/scala/docspell/joex/scheduler/CountingSchemeSpec.scala b/modules/joex/src/test/scala/docspell/joex/scheduler/CountingSchemeSpec.scala
index 56a5352d..fca5bff5 100644
--- a/modules/joex/src/test/scala/docspell/joex/scheduler/CountingSchemeSpec.scala
+++ b/modules/joex/src/test/scala/docspell/joex/scheduler/CountingSchemeSpec.scala
@@ -1,6 +1,7 @@
package docspell.joex.scheduler
import docspell.common.Priority
+
import munit._
class CountingSchemeSpec extends FunSuite {
diff --git a/modules/query/shared/src/test/scala/docspell/query/FulltextExtractTest.scala b/modules/query/shared/src/test/scala/docspell/query/FulltextExtractTest.scala
index 755ea121..b34ab89c 100644
--- a/modules/query/shared/src/test/scala/docspell/query/FulltextExtractTest.scala
+++ b/modules/query/shared/src/test/scala/docspell/query/FulltextExtractTest.scala
@@ -1,9 +1,11 @@
package docspell.query
import cats.implicits._
-import munit._
+
import docspell.query.FulltextExtract.Result
+import munit._
+
class FulltextExtractTest extends FunSuite {
def findFts(q: String): Result = {
diff --git a/modules/query/shared/src/test/scala/docspell/query/internal/AttrParserTest.scala b/modules/query/shared/src/test/scala/docspell/query/internal/AttrParserTest.scala
index 34c2270f..9330fc3d 100644
--- a/modules/query/shared/src/test/scala/docspell/query/internal/AttrParserTest.scala
+++ b/modules/query/shared/src/test/scala/docspell/query/internal/AttrParserTest.scala
@@ -2,6 +2,7 @@ package docspell.query.internal
import docspell.query.ItemQuery.Attr
import docspell.query.internal.AttrParser
+
import munit._
class AttrParserTest extends FunSuite {
diff --git a/modules/query/shared/src/test/scala/docspell/query/internal/BasicParserTest.scala b/modules/query/shared/src/test/scala/docspell/query/internal/BasicParserTest.scala
index e397ce9b..fe185454 100644
--- a/modules/query/shared/src/test/scala/docspell/query/internal/BasicParserTest.scala
+++ b/modules/query/shared/src/test/scala/docspell/query/internal/BasicParserTest.scala
@@ -1,9 +1,11 @@
package docspell.query.internal
-import munit._
import cats.data.{NonEmptyList => Nel}
+
import docspell.query.internal.BasicParser
+import munit._
+
class BasicParserTest extends FunSuite {
test("single string values") {
val p = BasicParser.singleString
diff --git a/modules/query/shared/src/test/scala/docspell/query/internal/DateParserTest.scala b/modules/query/shared/src/test/scala/docspell/query/internal/DateParserTest.scala
index ec836ced..3bd1cbca 100644
--- a/modules/query/shared/src/test/scala/docspell/query/internal/DateParserTest.scala
+++ b/modules/query/shared/src/test/scala/docspell/query/internal/DateParserTest.scala
@@ -1,9 +1,11 @@
package docspell.query.internal
-import munit._
-import docspell.query.Date
import java.time.Period
+import docspell.query.Date
+
+import munit._
+
class DateParserTest extends FunSuite with ValueHelper {
test("local date string") {
diff --git a/modules/query/shared/src/test/scala/docspell/query/internal/ExprParserTest.scala b/modules/query/shared/src/test/scala/docspell/query/internal/ExprParserTest.scala
index 07e14e9b..276ea00d 100644
--- a/modules/query/shared/src/test/scala/docspell/query/internal/ExprParserTest.scala
+++ b/modules/query/shared/src/test/scala/docspell/query/internal/ExprParserTest.scala
@@ -1,9 +1,11 @@
package docspell.query.internal
-import docspell.query.ItemQuery._
-import munit._
import cats.data.{NonEmptyList => Nel}
+import docspell.query.ItemQuery._
+
+import munit._
+
class ExprParserTest extends FunSuite with ValueHelper {
test("simple expr") {
diff --git a/modules/query/shared/src/test/scala/docspell/query/internal/ItemQueryParserTest.scala b/modules/query/shared/src/test/scala/docspell/query/internal/ItemQueryParserTest.scala
index 52e35fc4..1e4b0c3a 100644
--- a/modules/query/shared/src/test/scala/docspell/query/internal/ItemQueryParserTest.scala
+++ b/modules/query/shared/src/test/scala/docspell/query/internal/ItemQueryParserTest.scala
@@ -2,9 +2,10 @@ package docspell.query.internal
import cats.implicits._
-import munit._
-import docspell.query.ItemQueryParser
import docspell.query.ItemQuery
+import docspell.query.ItemQueryParser
+
+import munit._
class ItemQueryParserTest extends FunSuite {
diff --git a/modules/query/shared/src/test/scala/docspell/query/internal/MacroParserTest.scala b/modules/query/shared/src/test/scala/docspell/query/internal/MacroParserTest.scala
index 15855916..8f587fe6 100644
--- a/modules/query/shared/src/test/scala/docspell/query/internal/MacroParserTest.scala
+++ b/modules/query/shared/src/test/scala/docspell/query/internal/MacroParserTest.scala
@@ -1,9 +1,9 @@
package docspell.query.internal
-import munit._
-//import cats.parse.{Parser => P}
import docspell.query.ItemQuery.Expr
+import munit._
+
class MacroParserTest extends FunSuite {
test("recognize names shortcut") {
diff --git a/modules/query/shared/src/test/scala/docspell/query/internal/OperatorParserTest.scala b/modules/query/shared/src/test/scala/docspell/query/internal/OperatorParserTest.scala
index 1a5a8af0..a60aa228 100644
--- a/modules/query/shared/src/test/scala/docspell/query/internal/OperatorParserTest.scala
+++ b/modules/query/shared/src/test/scala/docspell/query/internal/OperatorParserTest.scala
@@ -1,9 +1,10 @@
package docspell.query.internal
-import munit._
import docspell.query.ItemQuery.{Operator, TagOperator}
import docspell.query.internal.OperatorParser
+import munit._
+
class OperatorParserTest extends FunSuite {
test("operator values") {
val p = OperatorParser.op
diff --git a/modules/query/shared/src/test/scala/docspell/query/internal/SimpleExprParserTest.scala b/modules/query/shared/src/test/scala/docspell/query/internal/SimpleExprParserTest.scala
index 35660dfa..58d4fe5b 100644
--- a/modules/query/shared/src/test/scala/docspell/query/internal/SimpleExprParserTest.scala
+++ b/modules/query/shared/src/test/scala/docspell/query/internal/SimpleExprParserTest.scala
@@ -1,11 +1,14 @@
package docspell.query.internal
-import cats.data.{NonEmptyList => Nel}
-import docspell.query.ItemQuery._
-import munit._
-import docspell.query.Date
import java.time.Period
+import cats.data.{NonEmptyList => Nel}
+
+import docspell.query.Date
+import docspell.query.ItemQuery._
+
+import munit._
+
class SimpleExprParserTest extends FunSuite with ValueHelper {
test("string expr") {
diff --git a/modules/query/shared/src/test/scala/docspell/query/internal/ValueHelper.scala b/modules/query/shared/src/test/scala/docspell/query/internal/ValueHelper.scala
index f2729f18..34f22f6d 100644
--- a/modules/query/shared/src/test/scala/docspell/query/internal/ValueHelper.scala
+++ b/modules/query/shared/src/test/scala/docspell/query/internal/ValueHelper.scala
@@ -1,8 +1,9 @@
package docspell.query.internal
+import java.time.Period
+
import docspell.query.Date
import docspell.query.ItemQuery._
-import java.time.Period
trait ValueHelper {
diff --git a/modules/store/src/test/scala/docspell/store/StoreFixture.scala b/modules/store/src/test/scala/docspell/store/StoreFixture.scala
index 35b5ae68..acd59963 100644
--- a/modules/store/src/test/scala/docspell/store/StoreFixture.scala
+++ b/modules/store/src/test/scala/docspell/store/StoreFixture.scala
@@ -1,13 +1,15 @@
package docspell.store
+import scala.concurrent.ExecutionContext
+
import cats.effect._
+
import docspell.common.LenientUri
import docspell.store.impl.StoreImpl
+
import doobie._
import org.h2.jdbcx.JdbcConnectionPool
-import scala.concurrent.ExecutionContext
-
trait StoreFixture {
def withStore(db: String)(code: Store[IO] => IO[Unit]): Unit = {
//StoreFixture.store(StoreFixture.memoryDB(db)).use(code).unsafeRunSync()
diff --git a/modules/store/src/test/scala/docspell/store/generator/ItemQueryGeneratorTest.scala b/modules/store/src/test/scala/docspell/store/generator/ItemQueryGeneratorTest.scala
index 74612153..2182cf56 100644
--- a/modules/store/src/test/scala/docspell/store/generator/ItemQueryGeneratorTest.scala
+++ b/modules/store/src/test/scala/docspell/store/generator/ItemQueryGeneratorTest.scala
@@ -2,13 +2,14 @@ package docspell.store.generator
import java.time.LocalDate
-import docspell.store.records._
-import munit._
import docspell.common._
import docspell.query.ItemQueryParser
-import docspell.store.queries.AttachCountTable
import docspell.store.qb.DSL._
import docspell.store.qb.generator.{ItemQueryGenerator, Tables}
+import docspell.store.queries.AttachCountTable
+import docspell.store.records._
+
+import munit._
class ItemQueryGeneratorTest extends FunSuite {
import docspell.store.impl.DoobieMeta._
diff --git a/modules/store/src/test/scala/docspell/store/qb/QueryBuilderTest.scala b/modules/store/src/test/scala/docspell/store/qb/QueryBuilderTest.scala
index f7d8b990..c355a7cb 100644
--- a/modules/store/src/test/scala/docspell/store/qb/QueryBuilderTest.scala
+++ b/modules/store/src/test/scala/docspell/store/qb/QueryBuilderTest.scala
@@ -1,8 +1,9 @@
package docspell.store.qb
-import munit._
-import docspell.store.qb.model._
import docspell.store.qb.DSL._
+import docspell.store.qb.model._
+
+import munit._
class QueryBuilderTest extends FunSuite {
diff --git a/modules/store/src/test/scala/docspell/store/qb/impl/ConditionBuilderTest.scala b/modules/store/src/test/scala/docspell/store/qb/impl/ConditionBuilderTest.scala
index 0d8bc32f..ebab052c 100644
--- a/modules/store/src/test/scala/docspell/store/qb/impl/ConditionBuilderTest.scala
+++ b/modules/store/src/test/scala/docspell/store/qb/impl/ConditionBuilderTest.scala
@@ -1,10 +1,11 @@
package docspell.store.qb.impl
-import munit._
-import docspell.store.qb._
import docspell.store.qb.DSL._
+import docspell.store.qb._
import docspell.store.qb.model.{CourseRecord, PersonRecord}
+import munit._
+
class ConditionBuilderTest extends FunSuite {
val c = CourseRecord.as("c")
diff --git a/modules/store/src/test/scala/docspell/store/qb/impl/DSLTest.scala b/modules/store/src/test/scala/docspell/store/qb/impl/DSLTest.scala
index 8a8872d1..e5b0b5be 100644
--- a/modules/store/src/test/scala/docspell/store/qb/impl/DSLTest.scala
+++ b/modules/store/src/test/scala/docspell/store/qb/impl/DSLTest.scala
@@ -1,10 +1,11 @@
package docspell.store.qb.impl
-import munit._
-import docspell.store.qb._
import docspell.store.qb.DSL._
+import docspell.store.qb._
import docspell.store.qb.model.{CourseRecord, PersonRecord}
+import munit._
+
class DSLTest extends FunSuite {
val course = CourseRecord.as("c")
diff --git a/modules/store/src/test/scala/docspell/store/qb/impl/SelectBuilderTest.scala b/modules/store/src/test/scala/docspell/store/qb/impl/SelectBuilderTest.scala
index 976cf4de..f8b07595 100644
--- a/modules/store/src/test/scala/docspell/store/qb/impl/SelectBuilderTest.scala
+++ b/modules/store/src/test/scala/docspell/store/qb/impl/SelectBuilderTest.scala
@@ -1,9 +1,10 @@
package docspell.store.qb.impl
-import munit._
+import docspell.store.qb.DSL._
import docspell.store.qb._
import docspell.store.qb.model._
-import docspell.store.qb.DSL._
+
+import munit._
class SelectBuilderTest extends FunSuite {
diff --git a/modules/store/src/test/scala/docspell/store/qb/model/CourseRecord.scala b/modules/store/src/test/scala/docspell/store/qb/model/CourseRecord.scala
index 6b53fdfb..31ee4859 100644
--- a/modules/store/src/test/scala/docspell/store/qb/model/CourseRecord.scala
+++ b/modules/store/src/test/scala/docspell/store/qb/model/CourseRecord.scala
@@ -1,6 +1,7 @@
package docspell.store.qb.model
import cats.data.NonEmptyList
+
import docspell.store.qb._
case class CourseRecord(
diff --git a/modules/store/src/test/scala/docspell/store/qb/model/PersonRecord.scala b/modules/store/src/test/scala/docspell/store/qb/model/PersonRecord.scala
index 5ea5b653..2080541b 100644
--- a/modules/store/src/test/scala/docspell/store/qb/model/PersonRecord.scala
+++ b/modules/store/src/test/scala/docspell/store/qb/model/PersonRecord.scala
@@ -1,8 +1,9 @@
package docspell.store.qb.model
import cats.data.NonEmptyList
-import docspell.store.qb._
+
import docspell.common._
+import docspell.store.qb._
case class PersonRecord(id: Long, name: String, created: Timestamp)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 447aa81e..c1862b94 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -272,7 +272,7 @@ object Dependencies {
).map(_ % Test)
val munit = Seq(
- "org.scalameta" %% "munit" % MUnitVersion,
+ "org.scalameta" %% "munit" % MUnitVersion,
"org.scalameta" %% "munit-scalacheck" % MUnitVersion
)
@@ -280,9 +280,9 @@ object Dependencies {
val betterMonadicFor = "com.olegpy" %% "better-monadic-for" % BetterMonadicForVersion
val webjars = Seq(
- "org.webjars" % "swagger-ui" % SwaggerUIVersion,
- "org.webjars" % "viewerjs" % ViewerJSVersion,
- "org.webjars" % "clipboard.js" % ClipboardJsVersion
+ "org.webjars" % "swagger-ui" % SwaggerUIVersion,
+ "org.webjars" % "viewerjs" % ViewerJSVersion,
+ "org.webjars" % "clipboard.js" % ClipboardJsVersion
)
val icu4j = Seq(
diff --git a/project/ZolaPlugin.scala b/project/ZolaPlugin.scala
index b2a559b5..fab7c076 100644
--- a/project/ZolaPlugin.scala
+++ b/project/ZolaPlugin.scala
@@ -35,7 +35,7 @@ object ZolaPlugin extends AutoPlugin {
zolaBuild := {
val logger = streams.value.log
logger.info("Building web site using zola ...")
- (Compile/resources).value
+ (Compile / resources).value
buildSite(zolaCommand.value, zolaRootDir.value, zolaOutputDir.value, None, logger)
logger.info("Website built")
},
@@ -43,7 +43,7 @@ object ZolaPlugin extends AutoPlugin {
val logger = streams.value.log
val baseurl = zolaTestBaseUrl.value
logger.info("Building web site (test) using zola ...")
- (Compile/resources).value
+ (Compile / resources).value
buildSite(
zolaCommand.value,
zolaRootDir.value,
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 20d5d4f8..fa86567b 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,13 +1,13 @@
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.27")
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
-addSbtPlugin("com.github.eikek" % "sbt-openapi-schema" % "0.7.1")
-addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15")
-addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
-addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
-addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1")
-addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.27")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
+addSbtPlugin("com.github.eikek" % "sbt-openapi-schema" % "0.7.1")
+addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
+addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
+addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1")
+addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")