diff --git a/modules/common/src/main/scala/docspell/common/DocspellSystem.scala b/modules/common/src/main/scala/docspell/common/DocspellSystem.scala index 796dbafa..21247829 100644 --- a/modules/common/src/main/scala/docspell/common/DocspellSystem.scala +++ b/modules/common/src/main/scala/docspell/common/DocspellSystem.scala @@ -2,7 +2,7 @@ package docspell.common object DocspellSystem { - val taskGroup = Ident.unsafe("docspell-system") + val taskGroup = Ident.unsafe("docspell-system") val migrationTaskTracker = Ident.unsafe("full-text-index-tracker") } diff --git a/modules/common/src/main/scala/docspell/common/Ident.scala b/modules/common/src/main/scala/docspell/common/Ident.scala index 08c008f6..3d752053 100644 --- a/modules/common/src/main/scala/docspell/common/Ident.scala +++ b/modules/common/src/main/scala/docspell/common/Ident.scala @@ -16,7 +16,7 @@ case class Ident(id: String) { def nonEmpty: Boolean = !isEmpty - def / (next: Ident): Ident = + def /(next: Ident): Ident = new Ident(id + "." + next.id) } diff --git a/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrUpdate.scala b/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrUpdate.scala index a2ed4146..647ecfdf 100644 --- a/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrUpdate.scala +++ b/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrUpdate.scala @@ -35,7 +35,6 @@ object SolrUpdate { .withQueryParam("overwrite", "true") .withQueryParam("wt", "json") - def add(tds: List[TextData]): F[Unit] = { val req = Method.POST(tds.asJson, url) client.expect[String](req).map(r => logger.debug(s"Req: $req Response: $r")) @@ -59,16 +58,16 @@ object SolrUpdate { td.name.isDefined || td.notes.isDefined } } - } + } - case class Delete(query: String) - object Delete { - implicit val jsonEncoder: Encoder[Delete] = - new Encoder[Delete] { - def apply(d: Delete): Json = - Json.obj( - ("delete", Json.obj("query" -> d.query.asJson)) - ) - } - } + case class Delete(query: String) + object Delete { + implicit val jsonEncoder: Encoder[Delete] = + new Encoder[Delete] { + def apply(d: Delete): Json = + Json.obj( + ("delete", Json.obj("query" -> d.query.asJson)) + ) + } + } } diff --git a/modules/joex/src/main/scala/docspell/joex/fts/MigrationTask.scala b/modules/joex/src/main/scala/docspell/joex/fts/MigrationTask.scala index bcde0b42..f7d1b980 100644 --- a/modules/joex/src/main/scala/docspell/joex/fts/MigrationTask.scala +++ b/modules/joex/src/main/scala/docspell/joex/fts/MigrationTask.scala @@ -9,7 +9,7 @@ import docspell.ftsclient._ import docspell.store.records.RJob object MigrationTask { - val taskName = Ident.unsafe("full-text-index") + val taskName = Ident.unsafe("full-text-index") def apply[F[_]: ConcurrentEffect]( cfg: Config.FullTextSearch, diff --git a/modules/joex/src/main/scala/docspell/joex/process/ItemHandler.scala b/modules/joex/src/main/scala/docspell/joex/process/ItemHandler.scala index 49dd1448..5b7e9552 100644 --- a/modules/joex/src/main/scala/docspell/joex/process/ItemHandler.scala +++ b/modules/joex/src/main/scala/docspell/joex/process/ItemHandler.scala @@ -17,7 +17,8 @@ object ItemHandler { ) def newItem[F[_]: ConcurrentEffect: ContextShift]( - cfg: Config, fts: FtsClient[F] + cfg: Config, + fts: FtsClient[F] ): Task[F, ProcessItemArgs, Unit] = CreateItem[F] .flatMap(itemStateTask(ItemState.Processing)) @@ -37,7 +38,8 @@ object ItemHandler { Task(_.isLastRetry) def safeProcess[F[_]: ConcurrentEffect: ContextShift]( - cfg: Config, fts: FtsClient[F] + cfg: Config, + fts: FtsClient[F] )(data: ItemData): Task[F, ProcessItemArgs, ItemData] = isLastRetry[F].flatMap { case true => diff --git a/modules/joex/src/main/scala/docspell/joex/process/ProcessItem.scala b/modules/joex/src/main/scala/docspell/joex/process/ProcessItem.scala index a2e42fa8..de5de412 100644 --- a/modules/joex/src/main/scala/docspell/joex/process/ProcessItem.scala +++ b/modules/joex/src/main/scala/docspell/joex/process/ProcessItem.scala @@ -10,7 +10,8 @@ import docspell.ftsclient.FtsClient object ProcessItem { def apply[F[_]: ConcurrentEffect: ContextShift]( - cfg: Config, fts: FtsClient[F] + cfg: Config, + fts: FtsClient[F] )(item: ItemData): Task[F, ProcessItemArgs, ItemData] = ExtractArchive(item) .flatMap(Task.setProgress(20))