diff --git a/modules/redis-client/src/main/scala/io/renku/queue/client/QueueClient.scala b/modules/redis-client/src/main/scala/io/renku/queue/client/QueueClient.scala index a63d32f9..27a9077a 100644 --- a/modules/redis-client/src/main/scala/io/renku/queue/client/QueueClient.scala +++ b/modules/redis-client/src/main/scala/io/renku/queue/client/QueueClient.scala @@ -22,7 +22,6 @@ import cats.effect.{Async, Resource} import fs2.Stream import io.renku.redis.client.{RedisQueueClient, RedisUrl} import scodec.bits.ByteVector -import scribe.Scribe trait QueueClient[F[_]] { @@ -44,5 +43,5 @@ trait QueueClient[F[_]] { } object QueueClient: - def apply[F[_]: Async: Scribe](redisUrl: RedisUrl): Resource[F, QueueClient[F]] = + def apply[F[_]: Async](redisUrl: RedisUrl): Resource[F, QueueClient[F]] = RedisQueueClient[F](redisUrl) diff --git a/modules/redis-client/src/main/scala/io/renku/redis/client/RedisQueueClient.scala b/modules/redis-client/src/main/scala/io/renku/redis/client/RedisQueueClient.scala index b0558a27..460f8edf 100644 --- a/modules/redis-client/src/main/scala/io/renku/redis/client/RedisQueueClient.scala +++ b/modules/redis-client/src/main/scala/io/renku/redis/client/RedisQueueClient.scala @@ -33,7 +33,8 @@ import scodec.bits.ByteVector import scribe.Scribe object RedisQueueClient: - def apply[F[_]: Async: Scribe](redisUrl: RedisUrl): Resource[F, QueueClient[F]] = + def apply[F[_]: Async](redisUrl: RedisUrl): Resource[F, QueueClient[F]] = + given Scribe[F] = scribe.cats[F] given Log[F] = RedisLogger[F] RedisClient[F].from(redisUrl.toString).map(new RedisQueueClient[F](_)) diff --git a/modules/search-provision/src/main/scala/io/renku/search/provision/SearchProvisioner.scala b/modules/search-provision/src/main/scala/io/renku/search/provision/SearchProvisioner.scala index 7359c063..1989917a 100644 --- a/modules/search-provision/src/main/scala/io/renku/search/provision/SearchProvisioner.scala +++ b/modules/search-provision/src/main/scala/io/renku/search/provision/SearchProvisioner.scala @@ -36,7 +36,7 @@ trait SearchProvisioner[F[_]]: def provisionSolr: F[Unit] object SearchProvisioner: - def apply[F[_]: Async: Network: Scribe]( + def apply[F[_]: Async: Network]( queueName: QueueName, redisUrl: RedisUrl, solrConfig: SolrConfig @@ -45,12 +45,14 @@ object SearchProvisioner: .flatMap(qc => SearchSolrClient[F](solrConfig).tupleLeft(qc)) .map { case (qc, sc) => new SearchProvisionerImpl[F](queueName, qc, sc) } -private class SearchProvisionerImpl[F[_]: Async: Scribe]( +private class SearchProvisionerImpl[F[_]: Async]( queueName: QueueName, queueClient: QueueClient[F], solrClient: SearchSolrClient[F] ) extends SearchProvisioner[F]: + private given Scribe[F] = scribe.cats[F] + override def provisionSolr: F[Unit] = queueClient .acquireEventsStream(queueName, chunkSize = 1, maybeOffset = None)