TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-05 22:55:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename package to avoid name clashes

Browse Source
This commit is contained in:
Eike Kettner 2020-05-25 16:21:56 +02:00
parent b4da523347
commit 4b0eb650f2
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/common/src/main/scala/docspell/common/pureconfig/Implicits.scala → modules/common/src/main/scala/docspell/common/config/Implicits.scala
View File

@ -1,8 +1,8 @@
package docspell.common.pureconfig package docspell.common.config
import docspell.common._ import docspell.common._
import _root_.pureconfig._ import pureconfig._
import _root_.pureconfig.error.{CannotConvert, FailureReason} import pureconfig.error.{CannotConvert, FailureReason}
import scodec.bits.ByteVector import scodec.bits.ByteVector
import com.github.eikek.calev.CalEvent import com.github.eikek.calev.CalEvent

6
modules/joex/src/main/scala/docspell/joex/ConfigFile.scala
View File

@ -1,8 +1,8 @@
package docspell.joex package docspell.joex
import docspell.common.pureconfig.Implicits._ import docspell.common.config.Implicits._
import _root_.pureconfig._ import pureconfig._
import _root_.pureconfig.generic.auto._ import pureconfig.generic.auto._
import docspell.joex.scheduler.CountingScheme import docspell.joex.scheduler.CountingScheme
object ConfigFile { object ConfigFile {

6
modules/restserver/src/main/scala/docspell/restserver/ConfigFile.scala
View File

@ -1,9 +1,9 @@
package docspell.restserver package docspell.restserver
import docspell.common.pureconfig.Implicits._ import docspell.common.config.Implicits._
import docspell.backend.signup.{Config => SignupConfig} import docspell.backend.signup.{Config => SignupConfig}
import _root_.pureconfig._ import pureconfig._
import _root_.pureconfig.generic.auto._ import pureconfig.generic.auto._
object ConfigFile { object ConfigFile {
import Implicits._ import Implicits._

4
modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala
View File

@ -1,7 +1,7 @@
package docspell.restserver.webapp package docspell.restserver.webapp
import _root_.io.circe._ import io.circe._
import _root_.io.circe.generic.semiauto._ import io.circe.generic.semiauto._
import docspell.common.LenientUri import docspell.common.LenientUri
import docspell.restserver.{BuildInfo, Config} import docspell.restserver.{BuildInfo, Config}
import docspell.backend.signup.{Config => SignupConfig} import docspell.backend.signup.{Config => SignupConfig}

6
modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala
View File

@ -1,6 +1,6 @@
package docspell.restserver.webapp package docspell.restserver.webapp
import fs2._ import fs2.{Stream, text}
import cats.effect._ import cats.effect._
import cats.implicits._ import cats.implicits._
import org.http4s._ import org.http4s._
@ -8,7 +8,7 @@ import org.http4s.headers._
import org.http4s.HttpRoutes import org.http4s.HttpRoutes
import org.http4s.dsl.Http4sDsl import org.http4s.dsl.Http4sDsl
import org.log4s._ import org.log4s._
import _root_.io.circe.syntax._ import io.circe.syntax._
import yamusca.imports._ import yamusca.imports._
import yamusca.implicits._ import yamusca.implicits._
import java.net.URL import java.net.URL
@ -69,7 +69,7 @@ object TemplateRoutes {
): F[String] = ): F[String] =
Stream Stream
.bracket(Sync[F].delay(url.openStream))(in => Sync[F].delay(in.close())) .bracket(Sync[F].delay(url.openStream))(in => Sync[F].delay(in.close()))
.flatMap(in => io.readInputStream(in.pure[F], 64 * 1024, blocker, false)) .flatMap(in => fs2.io.readInputStream(in.pure[F], 64 * 1024, blocker, false))
.through(text.utf8Decode) .through(text.utf8Decode)
.compile .compile
.fold("")(_ + _) .fold("")(_ + _)

4
modules/store/src/main/scala/docspell/store/usertask/UserTaskStore.scala
View File

@ -1,10 +1,10 @@
package docspell.store.usertask package docspell.store.usertask
import fs2._ import fs2.Stream
import cats.implicits._ import cats.implicits._
import cats.effect._ import cats.effect._
import cats.data.OptionT import cats.data.OptionT
import _root_.io.circe._ import io.circe._
import docspell.common._ import docspell.common._
import docspell.store.{AddResult, Store} import docspell.store.{AddResult, Store}
import docspell.store.queries.QUserTask import docspell.store.queries.QUserTask