Merge pull request #673 from matwojcik/cats-rename

Move sttp.tapir.cats -> sttp.tapir.integ.cats to resolve cats conflict after importing sttp._
softwaremill · Jul 21, 2020 · 411024a · 411024a
2 parents 3264b4a + d9e80eb
commit 411024a
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 21 deletions.
diff --git a/doc/endpoint/integrations.md b/doc/endpoint/integrations.md
@@ -2,15 +2,16 @@
 
 ## Cats datatypes integration
 
-The `tapir-cats` module contains schema, validator and codec instances for some [cats](https://typelevel.org/cats/)
-datatypes:
+The `tapir-cats` module contains additional instances for some [cats](https://typelevel.org/cats/)
+datatypes as well as additional syntax:
 
 ```scala
 "com.softwaremill.sttp.tapir" %% "tapir-cats" % "0.16.5"
 ```
 
-See the `sttp.tapir.codec.cats.TapirCodecCats` trait or `import sttp.tapir.codec.cats._` to bring the implicit values 
-into scope.
+- `import sttp.tapir.integ.cats.codec._` - brings schema, validator and codec instances
+- `import sttp.tapir.integ.cats.syntax._` - brings additional syntax for `tapir` types
+
 
 ## Refined integration
 

diff --git a/integrations/cats/src/main/scala/sttp/tapir/cats/syntax.scala b/integrations/cats/src/main/scala/sttp/tapir/cats/syntax.scala
diff --git a/integrations/cats/src/main/scala/sttp/tapir/codec/cats/package.scala b/integrations/cats/src/main/scala/sttp/tapir/codec/cats/package.scala
diff --git a/...p/tapir/monad/cats/MonadErrorSyntax.scala → ...p/tapir/integ/cats/MonadErrorSyntax.scala b/...p/tapir/monad/cats/MonadErrorSyntax.scala → ...p/tapir/integ/cats/MonadErrorSyntax.scala
@@ -1,4 +1,4 @@
-package sttp.tapir.monad.cats
+package sttp.tapir.integ.cats
 
 import cats.~>
 import sttp.tapir.monad.MonadError
@@ -21,3 +21,5 @@ trait MonadErrorSyntax {
     }
   }
 }
+
+object MonadErrorSyntax extends MonadErrorSyntax
diff --git a/...ttp/tapir/cats/ServerEndpointSyntax.scala → ...pir/integ/cats/ServerEndpointSyntax.scala b/...ttp/tapir/cats/ServerEndpointSyntax.scala → ...pir/integ/cats/ServerEndpointSyntax.scala
@@ -1,12 +1,12 @@
-package sttp.tapir.cats
+package sttp.tapir.integ.cats
 
 import cats.~>
 import sttp.tapir.server.ServerEndpoint
 
 trait ServerEndpointSyntax {
   implicit class ServerEndpointImapK[I, E, O, S, F[_]](endpoint: ServerEndpoint[I, E, O, S, F]) {
 
-    import sttp.tapir.monad.cats.syntax._
+    import MonadErrorSyntax._
 
     def imapK[G[_]](fk: F ~> G)(gK: G ~> F): ServerEndpoint[I, E, O, S, G] =
       endpoint.copy(logic = monadError => i => fk(endpoint.logic(monadError.imapK(gK)(fk))(i)))

diff --git a/...ttp/tapir/codec/cats/TapirCodecCats.scala → ...ttp/tapir/integ/cats/TapirCodecCats.scala b/...ttp/tapir/codec/cats/TapirCodecCats.scala → ...ttp/tapir/integ/cats/TapirCodecCats.scala
@@ -1,7 +1,6 @@
-package sttp.tapir.codec.cats
+package sttp.tapir.integ.cats
 
 import cats.data.{NonEmptyChain, NonEmptyList, NonEmptySet}
-import sttp.tapir.{Schema, SchemaType}
 import sttp.tapir._
 
 import scala.collection.immutable.SortedSet

diff --git a/integrations/cats/src/main/scala/sttp/tapir/integ/cats/codec.scala b/integrations/cats/src/main/scala/sttp/tapir/integ/cats/codec.scala
@@ -0,0 +1,3 @@
+package sttp.tapir.integ.cats
+
+object codec extends TapirCodecCats
diff --git a/integrations/cats/src/main/scala/sttp/tapir/integ/cats/syntax.scala b/integrations/cats/src/main/scala/sttp/tapir/integ/cats/syntax.scala
@@ -0,0 +1,5 @@
+package sttp.tapir.integ.cats
+
+object syntax extends ServerEndpointSyntax with MonadErrorSyntax
+
+
diff --git a/integrations/cats/src/main/scala/sttp/tapir/monad/cats/syntax.scala b/integrations/cats/src/main/scala/sttp/tapir/monad/cats/syntax.scala
diff --git a/...tapir/codec/cats/TapirCodecCatsTest.scala → ...tapir/integ/cats/TapirCodecCatsTest.scala b/...tapir/codec/cats/TapirCodecCatsTest.scala → ...tapir/integ/cats/TapirCodecCatsTest.scala
@@ -1,4 +1,4 @@
-package sttp.tapir.codec.cats
+package sttp.tapir.integ.cats
 
 import cats.data.{NonEmptyChain, NonEmptyList, NonEmptySet}
 import org.scalacheck.{Arbitrary, Gen}
@@ -8,6 +8,7 @@ import org.scalacheck.Arbitrary.arbString
 import sttp.tapir.SchemaType.{SArray, SString}
 import sttp.tapir.{Codec, CodecFormat, DecodeResult, Schema, Validator}
 import sttp.tapir.internal._
+import codec._
 
 import scala.collection.immutable.SortedSet
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package sttp.tapir.integ.cats

		object codec extends TapirCodecCats
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,5 @@
		package sttp.tapir.integ.cats

		object syntax extends ServerEndpointSyntax with MonadErrorSyntax