Merge pull request #23 from delimobil/dev

0.1.0
delimobil · Oct 10, 2021 · 6660692 · 6660692
2 parents 136008a + c48e278
commit 6660692
Show file tree

Hide file tree

Showing 31 changed files with 50 additions and 49 deletions.
diff --git a/.java-version b/.java-version
@@ -0,0 +1 @@
+1.8
diff --git a/README.MD b/README.MD
@@ -1,7 +1,7 @@
 cabbit
 =============
 
-[![Latest version](https://img.shields.io/badge/cabbit-0.0.17-orange.svg)](https://github.com/delimobil/cabbit)
+[![Latest version](https://img.shields.io/badge/cabbit-0.1.0-orange.svg)](https://github.com/delimobil/cabbit)
 
 A [cabbit] is a fictional hybrid between a cat and a rabbit.
 
@@ -25,12 +25,12 @@ Thus, you can choose from these artifacts:
 
 For ce3 versions add this instruction to your build.sbt:
 ```sbt
-libraryDependencies += "ru.delimobil" %% "cabbit" % "0.0.17"
+libraryDependencies += "ru.delimobil" %% "cabbit" % "0.1.0"
 ```
 For ce2 versions replace `cabbit` with `cabbit_ce2`.
 To use circe encoders add this artifact to your build.sbt:
 ```sbt
-libraryDependencies += "ru.delimobil" %% "cabbit-circe" % "0.0.17"
+libraryDependencies += "ru.delimobil" %% "cabbit-circe" % "0.1.0"
 ```
 
 ## Teaser

diff --git a/build.sbt b/build.sbt
@@ -28,13 +28,13 @@ val publishSettings = Seq(
 )
 
 val commonSettings = Seq(
-  version := "0.0.17",
+  version := "0.1.0",
   scalacOptions ++= {
     CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((3, _)) =>
         Seq("-source:3.0-migration")
       case Some((2,13)) =>
-        Seq("-deprecation", "-Xfatal-warnings", "-target:jvm-1.8")
+        Seq("-deprecation", "-Xfatal-warnings")
       case _ =>
         Seq("-target:jvm-1.8")
     }

diff --git a/ce3/src/main/scala/ru/delimobil/cabbit/ConnectionFactoryProvider.scala b/ce3/src/main/scala/ru/delimobil/cabbit/ConnectionFactoryProvider.scala
@@ -3,7 +3,7 @@ package ru.delimobil.cabbit
 import cats.effect.kernel.Async
 import com.rabbitmq.client.{ConnectionFactory => JConnectionFactory}
 import javax.net.ssl.SSLContext
-import ru.delimobil.cabbit.algebra.ConnectionFactory
+import ru.delimobil.cabbit.api.ConnectionFactory
 import ru.delimobil.cabbit.client.RabbitClientConnectionFactory
 import ru.delimobil.cabbit.model.CabbitConfig
 

diff --git a/...ru/delimobil/cabbit/algebra/Channel.scala → ...ala/ru/delimobil/cabbit/api/Channel.scala b/...ru/delimobil/cabbit/algebra/Channel.scala → ...ala/ru/delimobil/cabbit/api/Channel.scala
@@ -1,3 +1,3 @@
-package ru.delimobil.cabbit.algebra
+package ru.delimobil.cabbit.api
 
 trait Channel[F[_]] extends ChannelDeclaration[F] with ChannelPublisher[F] with ChannelConsumer[F]
diff --git a/...obil/cabbit/algebra/ChannelConsumer.scala → ...elimobil/cabbit/api/ChannelConsumer.scala b/...obil/cabbit/algebra/ChannelConsumer.scala → ...elimobil/cabbit/api/ChannelConsumer.scala
@@ -1,4 +1,4 @@
-package ru.delimobil.cabbit.algebra
+package ru.delimobil.cabbit.api
 
 import fs2.Stream
 

diff --git a/...delimobil/cabbit/algebra/Connection.scala → .../ru/delimobil/cabbit/api/Connection.scala b/...delimobil/cabbit/algebra/Connection.scala → .../ru/delimobil/cabbit/api/Connection.scala
@@ -1,4 +1,4 @@
-package ru.delimobil.cabbit.algebra
+package ru.delimobil.cabbit.api
 
 import cats.effect.Resource
 

diff --git a/...il/cabbit/algebra/ConnectionFactory.scala → ...imobil/cabbit/api/ConnectionFactory.scala b/...il/cabbit/algebra/ConnectionFactory.scala → ...imobil/cabbit/api/ConnectionFactory.scala
@@ -1,4 +1,4 @@
-package ru.delimobil.cabbit.algebra
+package ru.delimobil.cabbit.api
 
 import cats.effect.Resource
 import com.rabbitmq.client

diff --git a/ce3/src/main/scala/ru/delimobil/cabbit/client/RabbitClientChannel.scala b/ce3/src/main/scala/ru/delimobil/cabbit/client/RabbitClientChannel.scala
@@ -2,8 +2,8 @@ package ru.delimobil.cabbit.client
 
 import cats.FlatMap
 import fs2.Stream
-import ru.delimobil.cabbit.algebra.Channel
-import ru.delimobil.cabbit.algebra.ChannelOnPool
+import ru.delimobil.cabbit.api.Channel
+import ru.delimobil.cabbit.api.ChannelOnPool
 import ru.delimobil.cabbit.client.poly.RabbitClientConsumerProvider
 
 private[client] final class RabbitClientChannel[F[_]: FlatMap](

diff --git a/ce3/src/main/scala/ru/delimobil/cabbit/client/RabbitClientConnection.scala b/ce3/src/main/scala/ru/delimobil/cabbit/client/RabbitClientConnection.scala
@@ -4,11 +4,11 @@ import cats.effect.Resource
 import cats.effect.kernel.Async
 import com.rabbitmq.client
 import fs2.Stream
-import ru.delimobil.cabbit.algebra.Channel
-import ru.delimobil.cabbit.algebra.ChannelConsumer
-import ru.delimobil.cabbit.algebra.ChannelDeclaration
-import ru.delimobil.cabbit.algebra.ChannelPublisher
-import ru.delimobil.cabbit.algebra.Connection
+import ru.delimobil.cabbit.api.Channel
+import ru.delimobil.cabbit.api.ChannelConsumer
+import ru.delimobil.cabbit.api.ChannelDeclaration
+import ru.delimobil.cabbit.api.ChannelPublisher
+import ru.delimobil.cabbit.api.Connection
 import ru.delimobil.cabbit.ce.impl._
 import ru.delimobil.cabbit.client.poly.RabbitClientConsumerProvider
 

diff --git a/ce3/src/main/scala/ru/delimobil/cabbit/client/RabbitClientConnectionFactory.scala b/ce3/src/main/scala/ru/delimobil/cabbit/client/RabbitClientConnectionFactory.scala
@@ -6,8 +6,8 @@ import cats.effect.kernel.Sync
 import cats.syntax.functor._
 import com.rabbitmq.client
 import ru.delimobil.cabbit.CollectionConverters._
-import ru.delimobil.cabbit.algebra.Connection
-import ru.delimobil.cabbit.algebra.ConnectionFactory
+import ru.delimobil.cabbit.api.Connection
+import ru.delimobil.cabbit.api.ConnectionFactory
 import ru.delimobil.cabbit.client.consumer.ChannelDeferredConsumerProvider
 
 private[cabbit] final class RabbitClientConnectionFactory[F[_]: Async](

diff --git a/...limobil/cabbit/algebra/ChannelAcker.scala → ...u/delimobil/cabbit/api/ChannelAcker.scala b/...limobil/cabbit/algebra/ChannelAcker.scala → ...u/delimobil/cabbit/api/ChannelAcker.scala
@@ -1,4 +1,4 @@
-package ru.delimobil.cabbit.algebra
+package ru.delimobil.cabbit.api
 
 import ru.delimobil.cabbit.model.DeliveryTag
 

diff --git a/...l/cabbit/algebra/ChannelDeclaration.scala → ...mobil/cabbit/api/ChannelDeclaration.scala b/...l/cabbit/algebra/ChannelDeclaration.scala → ...mobil/cabbit/api/ChannelDeclaration.scala
@@ -1,4 +1,4 @@
-package ru.delimobil.cabbit.algebra
+package ru.delimobil.cabbit.api
 
 import com.rabbitmq.client.AMQP.Exchange
 import com.rabbitmq.client.AMQP.Queue

diff --git a/...imobil/cabbit/algebra/ChannelOnPool.scala → .../delimobil/cabbit/api/ChannelOnPool.scala b/...imobil/cabbit/algebra/ChannelOnPool.scala → .../delimobil/cabbit/api/ChannelOnPool.scala
@@ -1,4 +1,4 @@
-package ru.delimobil.cabbit.algebra
+package ru.delimobil.cabbit.api
 
 import com.rabbitmq.client
 

diff --git a/...bil/cabbit/algebra/ChannelPublisher.scala → ...limobil/cabbit/api/ChannelPublisher.scala b/...bil/cabbit/algebra/ChannelPublisher.scala → ...limobil/cabbit/api/ChannelPublisher.scala
@@ -1,7 +1,7 @@
-package ru.delimobil.cabbit.algebra
+package ru.delimobil.cabbit.api
 
 import com.rabbitmq.client.AMQP.BasicProperties
-import ru.delimobil.cabbit.algebra.ChannelPublisher.MandatoryArgument
+import ru.delimobil.cabbit.api.ChannelPublisher.MandatoryArgument
 import ru.delimobil.cabbit.encoder.BodyEncoder
 import ru.delimobil.cabbit.model.ExchangeName
 import ru.delimobil.cabbit.model.QueueName

diff --git a/...bil/cabbit/algebra/ShutdownNotifier.scala → ...limobil/cabbit/api/ShutdownNotifier.scala b/...bil/cabbit/algebra/ShutdownNotifier.scala → ...limobil/cabbit/api/ShutdownNotifier.scala
@@ -1,4 +1,4 @@
-package ru.delimobil.cabbit.algebra
+package ru.delimobil.cabbit.api
 
 trait ShutdownNotifier[F[_]] {
   def isOpen: F[Boolean]

diff --git a/...cabbit/algebra/poly/ChannelConsumer.scala → ...bil/cabbit/api/poly/ChannelConsumer.scala b/...cabbit/algebra/poly/ChannelConsumer.scala → ...bil/cabbit/api/poly/ChannelConsumer.scala
@@ -1,7 +1,7 @@
-package ru.delimobil.cabbit.algebra.poly
+package ru.delimobil.cabbit.api.poly
 
 import com.rabbitmq.client
-import ru.delimobil.cabbit.algebra.ChannelAcker
+import ru.delimobil.cabbit.api.ChannelAcker
 import ru.delimobil.cabbit.model.ConsumerTag
 import ru.delimobil.cabbit.model.QueueName
 

diff --git a/core/src/main/scala/ru/delimobil/cabbit/client/RabbitClientChannelOnPool.scala b/core/src/main/scala/ru/delimobil/cabbit/client/RabbitClientChannelOnPool.scala
@@ -3,7 +3,7 @@ package ru.delimobil.cabbit.client
 import cats.Functor
 import cats.syntax.functor._
 import com.rabbitmq.client
-import ru.delimobil.cabbit.algebra.ChannelOnPool
+import ru.delimobil.cabbit.api.ChannelOnPool
 import ru.delimobil.cabbit.ce.api.Blocker
 import ru.delimobil.cabbit.ce.api.Semaphore
 import ru.delimobil.cabbit.ce.api.SemaphoreMake

diff --git a/core/src/main/scala/ru/delimobil/cabbit/client/RabbitClientConnectionAction.scala b/core/src/main/scala/ru/delimobil/cabbit/client/RabbitClientConnectionAction.scala
@@ -4,7 +4,7 @@ import cats.Monad
 import cats.syntax.flatMap._
 import cats.syntax.functor._
 import com.rabbitmq.client
-import ru.delimobil.cabbit.algebra.ChannelOnPool
+import ru.delimobil.cabbit.api.ChannelOnPool
 import ru.delimobil.cabbit.ce.api.Blocker
 import ru.delimobil.cabbit.ce.api.SemaphoreMake
 

diff --git a/core/src/main/scala/ru/delimobil/cabbit/client/poly/RabbitClientChannel.scala b/core/src/main/scala/ru/delimobil/cabbit/client/poly/RabbitClientChannel.scala
@@ -10,9 +10,9 @@ import com.rabbitmq.client.AMQP.Exchange
 import com.rabbitmq.client.AMQP.Queue
 import com.rabbitmq.client.Method
 import ru.delimobil.cabbit.CollectionConverters._
-import ru.delimobil.cabbit.algebra.ChannelPublisher.MandatoryArgument
-import ru.delimobil.cabbit.algebra._
-import ru.delimobil.cabbit.algebra.poly.ChannelConsumer
+import ru.delimobil.cabbit.api.ChannelPublisher.MandatoryArgument
+import ru.delimobil.cabbit.api._
+import ru.delimobil.cabbit.api.poly.ChannelConsumer
 import ru.delimobil.cabbit.encoder.BodyEncoder
 import ru.delimobil.cabbit.model.ConsumerTag
 import ru.delimobil.cabbit.model.DeliveryTag

diff --git a/src/main/scala/ru/delimobil/cabbit/ConnectionFactoryProvider.scala b/src/main/scala/ru/delimobil/cabbit/ConnectionFactoryProvider.scala
@@ -5,7 +5,7 @@ import cats.effect.ConcurrentEffect
 import cats.effect.ContextShift
 import com.rabbitmq.client.{ConnectionFactory => JConnectionFactory}
 import javax.net.ssl.SSLContext
-import ru.delimobil.cabbit.algebra.ConnectionFactory
+import ru.delimobil.cabbit.api.ConnectionFactory
 import ru.delimobil.cabbit.client.RabbitClientConnectionFactory
 import ru.delimobil.cabbit.model.CabbitConfig
 

diff --git a/...ru/delimobil/cabbit/algebra/Channel.scala → ...ala/ru/delimobil/cabbit/api/Channel.scala b/...ru/delimobil/cabbit/algebra/Channel.scala → ...ala/ru/delimobil/cabbit/api/Channel.scala
@@ -1,3 +1,3 @@
-package ru.delimobil.cabbit.algebra
+package ru.delimobil.cabbit.api
 
 trait Channel[F[_]] extends ChannelDeclaration[F] with ChannelPublisher[F] with ChannelConsumer[F]
diff --git a/...obil/cabbit/algebra/ChannelConsumer.scala → ...elimobil/cabbit/api/ChannelConsumer.scala b/...obil/cabbit/algebra/ChannelConsumer.scala → ...elimobil/cabbit/api/ChannelConsumer.scala
@@ -1,4 +1,4 @@
-package ru.delimobil.cabbit.algebra
+package ru.delimobil.cabbit.api
 
 import fs2.Stream
 

diff --git a/...delimobil/cabbit/algebra/Connection.scala → .../ru/delimobil/cabbit/api/Connection.scala b/...delimobil/cabbit/algebra/Connection.scala → .../ru/delimobil/cabbit/api/Connection.scala
@@ -1,4 +1,4 @@
-package ru.delimobil.cabbit.algebra
+package ru.delimobil.cabbit.api
 
 import cats.effect.Resource
 

diff --git a/...il/cabbit/algebra/ConnectionFactory.scala → ...imobil/cabbit/api/ConnectionFactory.scala b/...il/cabbit/algebra/ConnectionFactory.scala → ...imobil/cabbit/api/ConnectionFactory.scala
@@ -1,4 +1,4 @@
-package ru.delimobil.cabbit.algebra
+package ru.delimobil.cabbit.api
 
 import cats.effect.Resource
 import com.rabbitmq.client

diff --git a/src/main/scala/ru/delimobil/cabbit/client/RabbitClientChannel.scala b/src/main/scala/ru/delimobil/cabbit/client/RabbitClientChannel.scala
@@ -2,8 +2,8 @@ package ru.delimobil.cabbit.client
 
 import cats.FlatMap
 import fs2.Stream
-import ru.delimobil.cabbit.algebra.Channel
-import ru.delimobil.cabbit.algebra.ChannelOnPool
+import ru.delimobil.cabbit.api.Channel
+import ru.delimobil.cabbit.api.ChannelOnPool
 import ru.delimobil.cabbit.client.poly.RabbitClientConsumerProvider
 
 private[client] final class RabbitClientChannel[F[_]: FlatMap](

diff --git a/src/main/scala/ru/delimobil/cabbit/client/RabbitClientConnection.scala b/src/main/scala/ru/delimobil/cabbit/client/RabbitClientConnection.scala
@@ -6,11 +6,11 @@ import cats.effect.Resource
 import cats.effect.{Blocker => BlockerCE2}
 import com.rabbitmq.client
 import fs2.Stream
-import ru.delimobil.cabbit.algebra.Channel
-import ru.delimobil.cabbit.algebra.ChannelConsumer
-import ru.delimobil.cabbit.algebra.ChannelDeclaration
-import ru.delimobil.cabbit.algebra.ChannelPublisher
-import ru.delimobil.cabbit.algebra.Connection
+import ru.delimobil.cabbit.api.Channel
+import ru.delimobil.cabbit.api.ChannelConsumer
+import ru.delimobil.cabbit.api.ChannelDeclaration
+import ru.delimobil.cabbit.api.ChannelPublisher
+import ru.delimobil.cabbit.api.Connection
 import ru.delimobil.cabbit.ce.impl._
 import ru.delimobil.cabbit.client.poly.RabbitClientConsumerProvider
 

diff --git a/src/main/scala/ru/delimobil/cabbit/client/RabbitClientConnectionFactory.scala b/src/main/scala/ru/delimobil/cabbit/client/RabbitClientConnectionFactory.scala
@@ -7,8 +7,8 @@ import cats.effect.Resource
 import cats.syntax.functor._
 import com.rabbitmq.client
 import fs2.Stream
-import ru.delimobil.cabbit.algebra.Connection
-import ru.delimobil.cabbit.algebra.ConnectionFactory
+import ru.delimobil.cabbit.api.Connection
+import ru.delimobil.cabbit.api.ConnectionFactory
 import ru.delimobil.cabbit.client.consumer.QueueDeferredConsumerProvider
 import ru.delimobil.cabbit.client.poly.RabbitClientConsumerProvider
 

diff --git a/src/test/scala/ru/delimobil/cabbit/CabbitSuite.scala b/src/test/scala/ru/delimobil/cabbit/CabbitSuite.scala
@@ -22,7 +22,7 @@ import fs2.Stream
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.funsuite.AnyFunSuite
 import ru.delimobil.cabbit.CollectionConverters._
-import ru.delimobil.cabbit.algebra._
+import ru.delimobil.cabbit.api._
 import ru.delimobil.cabbit.model.ContentEncoding._
 import ru.delimobil.cabbit.model.ExchangeName
 import ru.delimobil.cabbit.model.QueueName

diff --git a/src/test/scala/ru/delimobil/cabbit/RabbitContainer.scala b/src/test/scala/ru/delimobil/cabbit/RabbitContainer.scala
@@ -8,7 +8,7 @@ import cats.effect.Resource
 import cats.effect.Sync
 import cats.syntax.functor._
 import com.dimafeng.testcontainers.RabbitMQContainer
-import ru.delimobil.cabbit.algebra.Connection
+import ru.delimobil.cabbit.api.Connection
 import ru.delimobil.cabbit.model.CabbitConfig.Host
 import ru.delimobil.cabbit.model.CabbitConfig.Port
 import ru.delimobil.cabbit.model.CabbitConfig

diff --git a/src/test/scala/ru/delimobil/cabbit/RabbitUtils.scala b/src/test/scala/ru/delimobil/cabbit/RabbitUtils.scala
@@ -17,7 +17,7 @@ import com.rabbitmq.client.AMQP.Queue
 import com.rabbitmq.client.BuiltinExchangeType
 import com.rabbitmq.client.Delivery
 import fs2.Stream
-import ru.delimobil.cabbit.algebra._
+import ru.delimobil.cabbit.api._
 import ru.delimobil.cabbit.model.ConsumerTag
 import ru.delimobil.cabbit.model.ContentEncoding.decodeUtf8
 import ru.delimobil.cabbit.model.ExchangeName