Merge pull request #276 from profunktor/simpler-package-naming

Simpler package naming
profunktor · May 8, 2020 · 466437b · 466437b
2 parents 948fd0a + fdc9006
commit 466437b
Show file tree

Hide file tree

Showing 60 changed files with 148 additions and 153 deletions.
diff --git a/modules/core/src/main/scala/dev/profunktor/redis4cats/codecs/Codecs.scala b/modules/core/src/main/scala/dev/profunktor/redis4cats/codecs/Codecs.scala
@@ -16,12 +16,11 @@
 
 package dev.profunktor.redis4cats.codecs
 
-import dev.profunktor.redis4cats.domain.RedisCodec
-import java.nio.ByteBuffer
-
 import dev.profunktor.redis4cats.codecs.splits.SplitEpi
+import dev.profunktor.redis4cats.data.RedisCodec
 import io.lettuce.core.codec.{ RedisCodec => JRedisCodec, ToByteBufEncoder }
 import io.netty.buffer.ByteBuf
+import java.nio.ByteBuffer
 
 object Codecs {
 

diff --git a/modules/core/src/main/scala/dev/profunktor/redis4cats/connection/RedisClient.scala b/modules/core/src/main/scala/dev/profunktor/redis4cats/connection/RedisClient.scala
@@ -17,8 +17,7 @@
 package dev.profunktor.redis4cats.connection
 
 import cats.effect._
-import cats.syntax.apply._
-import cats.syntax.functor._
+import cats.implicits._
 import dev.profunktor.redis4cats.effect.{ JRFuture, Log }
 import dev.profunktor.redis4cats.effect.JRFuture._
 import io.lettuce.core.{ RedisClient => JRedisClient, RedisURI => JRedisURI }

diff --git a/modules/core/src/main/scala/dev/profunktor/redis4cats/connection/RedisClusterClient.scala b/modules/core/src/main/scala/dev/profunktor/redis4cats/connection/RedisClusterClient.scala
@@ -19,7 +19,7 @@ package dev.profunktor.redis4cats.connection
 import cats.effect._
 import cats.implicits._
 import dev.profunktor.redis4cats.JavaConversions._
-import dev.profunktor.redis4cats.domain.NodeId
+import dev.profunktor.redis4cats.data.NodeId
 import dev.profunktor.redis4cats.effect.{ JRFuture, Log }
 import dev.profunktor.redis4cats.effect.JRFuture._
 import io.lettuce.core.cluster.{ SlotHash, RedisClusterClient => JClusterClient }

diff --git a/modules/core/src/main/scala/dev/profunktor/redis4cats/connection/RedisConnection.scala b/modules/core/src/main/scala/dev/profunktor/redis4cats/connection/RedisConnection.scala
@@ -18,7 +18,7 @@ package dev.profunktor.redis4cats.connection
 
 import cats.effect._
 import cats.syntax.all._
-import dev.profunktor.redis4cats.domain.NodeId
+import dev.profunktor.redis4cats.data.NodeId
 import dev.profunktor.redis4cats.effect.JRFuture
 import io.lettuce.core.api.StatefulRedisConnection
 import io.lettuce.core.api.async.RedisAsyncCommands

diff --git a/modules/core/src/main/scala/dev/profunktor/redis4cats/connection/RedisMasterReplica.scala b/modules/core/src/main/scala/dev/profunktor/redis4cats/connection/RedisMasterReplica.scala
@@ -19,7 +19,7 @@ package dev.profunktor.redis4cats.connection
 import cats.effect._
 import cats.syntax.all._
 import dev.profunktor.redis4cats.JavaConversions._
-import dev.profunktor.redis4cats.domain._
+import dev.profunktor.redis4cats.data._
 import dev.profunktor.redis4cats.effect.{ JRFuture, Log }
 import dev.profunktor.redis4cats.effect.JRFuture._
 import io.lettuce.core.masterreplica.{ MasterReplica, StatefulRedisMasterReplicaConnection }

diff --git a/...la/dev/profunktor/redis4cats/domain.scala → ...cala/dev/profunktor/redis4cats/data.scala b/...la/dev/profunktor/redis4cats/domain.scala → ...cala/dev/profunktor/redis4cats/data.scala
@@ -21,7 +21,7 @@ import io.lettuce.core.codec.{ RedisCodec => JRedisCodec, StringCodec, ToByteBuf
 import io.lettuce.core.{ KeyScanCursor => JKeyScanCursor }
 import dev.profunktor.redis4cats.JavaConversions._
 
-object domain {
+object data {
 
   final case class RedisChannel[K](underlying: K) extends AnyVal
 

diff --git a/modules/effects/src/main/scala/dev/profunktor/redis4cats/algebra/keys.scala b/modules/effects/src/main/scala/dev/profunktor/redis4cats/algebra/keys.scala
@@ -16,7 +16,7 @@
 
 package dev.profunktor.redis4cats.algebra
 
-import dev.profunktor.redis4cats.domain.KeyScanCursor
+import dev.profunktor.redis4cats.data.KeyScanCursor
 
 import scala.concurrent.duration.FiniteDuration
 

diff --git a/...profunktor/redis4cats/algebra/redis.scala → .../dev/profunktor/redis4cats/commands.scala b/...profunktor/redis4cats/algebra/redis.scala → .../dev/profunktor/redis4cats/commands.scala
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package dev.profunktor.redis4cats.algebra
+package dev.profunktor.redis4cats
 
+import algebra._
 import cats.effect.{ Concurrent, ContextShift }
 
 trait RedisCommands[F[_], K, V]

diff --git a/modules/effects/src/main/scala/dev/profunktor/redis4cats/pipeline.scala b/modules/effects/src/main/scala/dev/profunktor/redis4cats/pipeline.scala
@@ -19,7 +19,6 @@ package dev.profunktor.redis4cats
 import cats.effect._
 import cats.effect.implicits._
 import cats.implicits._
-import dev.profunktor.redis4cats.algebra._
 import dev.profunktor.redis4cats.effect.Log
 
 object pipeline {

diff --git a/...unktor/redis4cats/interpreter/Redis.scala → ...ala/dev/profunktor/redis4cats/redis.scala b/...unktor/redis4cats/interpreter/Redis.scala → ...ala/dev/profunktor/redis4cats/redis.scala
@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-package dev.profunktor.redis4cats.interpreter
+package dev.profunktor.redis4cats
 
 import java.time.Instant
 
 import cats.effect._
 import cats.implicits._
-import dev.profunktor.redis4cats.algebra._
 import dev.profunktor.redis4cats.connection._
-import dev.profunktor.redis4cats.domain._
+import dev.profunktor.redis4cats.data._
 import dev.profunktor.redis4cats.effect.{ JRFuture, Log, RedisBlocker }
 import dev.profunktor.redis4cats.effect.JRFuture._
 import dev.profunktor.redis4cats.effects._

diff --git a/modules/effects/src/main/scala/dev/profunktor/redis4cats/transactions.scala b/modules/effects/src/main/scala/dev/profunktor/redis4cats/transactions.scala
@@ -20,7 +20,6 @@ import cats.effect._
 import cats.effect.concurrent._
 import cats.effect.implicits._
 import cats.implicits._
-import dev.profunktor.redis4cats.algebra._
 import dev.profunktor.redis4cats.effect.Log
 import dev.profunktor.redis4cats.hlist._
 import scala.concurrent.duration._

diff --git a/modules/examples/src/main/scala/dev/profunktor/redis4cats/Demo.scala b/modules/examples/src/main/scala/dev/profunktor/redis4cats/Demo.scala
@@ -19,7 +19,7 @@ package dev.profunktor.redis4cats
 import cats.effect.IO
 import dev.profunktor.redis4cats.codecs.Codecs
 import dev.profunktor.redis4cats.codecs.splits._
-import dev.profunktor.redis4cats.domain.RedisCodec
+import dev.profunktor.redis4cats.data.RedisCodec
 
 object Demo {
 

diff --git a/modules/examples/src/main/scala/dev/profunktor/redis4cats/PubSubDemo.scala b/modules/examples/src/main/scala/dev/profunktor/redis4cats/PubSubDemo.scala
@@ -18,9 +18,9 @@ package dev.profunktor.redis4cats
 
 import cats.effect.IO
 import dev.profunktor.redis4cats.connection._
-import dev.profunktor.redis4cats.domain.RedisChannel
+import dev.profunktor.redis4cats.data.RedisChannel
 import dev.profunktor.redis4cats.effect.Log
-import dev.profunktor.redis4cats.interpreter.pubsub.PubSub
+import dev.profunktor.redis4cats.pubsub.PubSub
 import fs2.{ Pipe, Stream }
 
 import scala.concurrent.duration._

diff --git a/modules/examples/src/main/scala/dev/profunktor/redis4cats/PublisherDemo.scala b/modules/examples/src/main/scala/dev/profunktor/redis4cats/PublisherDemo.scala
@@ -18,9 +18,9 @@ package dev.profunktor.redis4cats
 
 import cats.effect.IO
 import dev.profunktor.redis4cats.connection._
-import dev.profunktor.redis4cats.domain.RedisChannel
+import dev.profunktor.redis4cats.data.RedisChannel
 import dev.profunktor.redis4cats.effect.Log
-import dev.profunktor.redis4cats.interpreter.pubsub.PubSub
+import dev.profunktor.redis4cats.pubsub.PubSub
 import fs2.Stream
 
 import scala.concurrent.duration._

diff --git a/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisClusterStringsDemo.scala b/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisClusterStringsDemo.scala
@@ -20,7 +20,6 @@ import cats.effect.{ IO, Resource }
 import dev.profunktor.redis4cats.algebra.StringCommands
 import dev.profunktor.redis4cats.connection._
 import dev.profunktor.redis4cats.effect.Log
-import dev.profunktor.redis4cats.interpreter.Redis
 
 object RedisClusterStringsDemo extends LoggerIOApp {
 

diff --git a/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisClusterTransactionsDemo.scala b/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisClusterTransactionsDemo.scala
@@ -18,11 +18,8 @@ package dev.profunktor.redis4cats
 
 import cats.effect.{ IO, Resource }
 import cats.implicits._
-import dev.profunktor.redis4cats.algebra.RedisCommands
 import dev.profunktor.redis4cats.connection._
-import dev.profunktor.redis4cats.connection.RedisClusterClient
 import dev.profunktor.redis4cats.effect.Log
-import dev.profunktor.redis4cats.interpreter.Redis
 import dev.profunktor.redis4cats.transactions._
 
 object RedisClusterTransactionsDemo extends LoggerIOApp {

diff --git a/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisGeoDemo.scala b/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisGeoDemo.scala
@@ -21,7 +21,6 @@ import dev.profunktor.redis4cats.algebra.GeoCommands
 import dev.profunktor.redis4cats.connection._
 import dev.profunktor.redis4cats.effect.Log
 import dev.profunktor.redis4cats.effects._
-import dev.profunktor.redis4cats.interpreter.Redis
 import io.lettuce.core.GeoArgs
 
 object RedisGeoDemo extends LoggerIOApp {

diff --git a/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisHashesDemo.scala b/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisHashesDemo.scala
@@ -20,7 +20,6 @@ import cats.effect.{ IO, Resource }
 import dev.profunktor.redis4cats.algebra.HashCommands
 import dev.profunktor.redis4cats.connection._
 import dev.profunktor.redis4cats.effect.Log
-import dev.profunktor.redis4cats.interpreter.Redis
 
 object RedisHashesDemo extends LoggerIOApp {
 

diff --git a/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisKeysDemo.scala b/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisKeysDemo.scala
@@ -20,7 +20,6 @@ import cats.effect.{ IO, Resource }
 import dev.profunktor.redis4cats.algebra.{ KeyCommands, StringCommands }
 import dev.profunktor.redis4cats.connection._
 import dev.profunktor.redis4cats.effect.Log
-import dev.profunktor.redis4cats.interpreter.Redis
 
 object RedisKeysDemo extends LoggerIOApp {
 

diff --git a/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisListsDemo.scala b/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisListsDemo.scala
@@ -20,7 +20,6 @@ import cats.effect.{ IO, Resource }
 import dev.profunktor.redis4cats.algebra.ListCommands
 import dev.profunktor.redis4cats.connection._
 import dev.profunktor.redis4cats.effect.Log
-import dev.profunktor.redis4cats.interpreter.Redis
 
 object RedisListsDemo extends LoggerIOApp {
 

diff --git a/...les/examples/src/main/scala/dev/profunktor/redis4cats/RedisMasterReplicaStringsDemo.scala b/...les/examples/src/main/scala/dev/profunktor/redis4cats/RedisMasterReplicaStringsDemo.scala
@@ -17,11 +17,9 @@
 package dev.profunktor.redis4cats
 
 import cats.effect.{ IO, Resource }
-import dev.profunktor.redis4cats.algebra.RedisCommands
 import dev.profunktor.redis4cats.connection._
-import dev.profunktor.redis4cats.domain.ReadFrom
+import dev.profunktor.redis4cats.data.ReadFrom
 import dev.profunktor.redis4cats.effect.Log
-import dev.profunktor.redis4cats.interpreter.Redis
 
 object RedisMasterReplicaStringsDemo extends LoggerIOApp {
 

diff --git a/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisPipelineDemo.scala b/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisPipelineDemo.scala
@@ -18,10 +18,8 @@ package dev.profunktor.redis4cats
 
 import cats.effect._
 import cats.implicits._
-import dev.profunktor.redis4cats.algebra.RedisCommands
 import dev.profunktor.redis4cats.connection._
 import dev.profunktor.redis4cats.effect.Log
-import dev.profunktor.redis4cats.interpreter.Redis
 import dev.profunktor.redis4cats.pipeline._
 import scala.concurrent.duration._
 

diff --git a/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisScriptsDemo.scala b/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisScriptsDemo.scala
@@ -21,7 +21,6 @@ import dev.profunktor.redis4cats.algebra.ScriptCommands
 import dev.profunktor.redis4cats.connection._
 import dev.profunktor.redis4cats.effect.Log
 import dev.profunktor.redis4cats.effects.ScriptOutputType
-import dev.profunktor.redis4cats.interpreter.Redis
 
 object RedisScriptsDemo extends LoggerIOApp {
 

diff --git a/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisSetsDemo.scala b/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisSetsDemo.scala
@@ -20,7 +20,6 @@ import cats.effect.{ IO, Resource }
 import dev.profunktor.redis4cats.algebra.SetCommands
 import dev.profunktor.redis4cats.connection._
 import dev.profunktor.redis4cats.effect.Log
-import dev.profunktor.redis4cats.interpreter.Redis
 
 object RedisSetsDemo extends LoggerIOApp {
 

diff --git a/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisSortedSetsDemo.scala b/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisSortedSetsDemo.scala
@@ -21,7 +21,6 @@ import dev.profunktor.redis4cats.algebra.SortedSetCommands
 import dev.profunktor.redis4cats.connection._
 import dev.profunktor.redis4cats.effect.Log
 import dev.profunktor.redis4cats.effects.{ Score, ScoreWithValue, ZRange }
-import dev.profunktor.redis4cats.interpreter.Redis
 
 object RedisSortedSetsDemo extends LoggerIOApp {
 

diff --git a/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisStringsDemo.scala b/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisStringsDemo.scala
@@ -20,7 +20,6 @@ import cats.effect.{ IO, Resource }
 import dev.profunktor.redis4cats.algebra.StringCommands
 import dev.profunktor.redis4cats.connection._
 import dev.profunktor.redis4cats.effect.Log
-import dev.profunktor.redis4cats.interpreter.Redis
 
 object RedisStringsDemo extends LoggerIOApp {
 

diff --git a/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisTransactionsDemo.scala b/modules/examples/src/main/scala/dev/profunktor/redis4cats/RedisTransactionsDemo.scala
@@ -18,11 +18,9 @@ package dev.profunktor.redis4cats
 
 import cats.effect._
 import cats.implicits._
-import dev.profunktor.redis4cats.algebra.RedisCommands
 import dev.profunktor.redis4cats.connection._
 import dev.profunktor.redis4cats.effect.Log
 import dev.profunktor.redis4cats.hlist._
-import dev.profunktor.redis4cats.interpreter.Redis
 import dev.profunktor.redis4cats.transactions._
 import java.util.concurrent.TimeoutException
 

diff --git a/modules/examples/src/main/scala/dev/profunktor/redis4cats/StreamingDemo.scala b/modules/examples/src/main/scala/dev/profunktor/redis4cats/StreamingDemo.scala
@@ -20,8 +20,8 @@ import cats.effect.IO
 import cats.syntax.parallel._
 import dev.profunktor.redis4cats.connection._
 import dev.profunktor.redis4cats.effect.Log
-import dev.profunktor.redis4cats.interpreter.streams.RedisStream
-import dev.profunktor.redis4cats.streams.StreamingMessage
+import dev.profunktor.redis4cats.streams.RedisStream
+import dev.profunktor.redis4cats.streams.data.StreamingMessage
 import fs2.Stream
 
 import scala.concurrent.duration._

diff --git a/...terpreter/pubsub/LivePubSubCommands.scala → ...edis4cats/pubsub/LivePubSubCommands.scala b/...terpreter/pubsub/LivePubSubCommands.scala → ...edis4cats/pubsub/LivePubSubCommands.scala
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package dev.profunktor.redis4cats.interpreter.pubsub
+package dev.profunktor.redis4cats
+package pubsub
 
 import cats.effect._
 import cats.effect.concurrent.Ref
 import cats.syntax.all._
-import dev.profunktor.redis4cats.algebra.{ PubSubCommands, PubSubStats, SubscribeCommands }
-import dev.profunktor.redis4cats.domain.RedisChannel
-import dev.profunktor.redis4cats.interpreter.pubsub.internals.{ PubSubInternals, PubSubState }
-import dev.profunktor.redis4cats.streams.Subscription
+import dev.profunktor.redis4cats.data.RedisChannel
+import dev.profunktor.redis4cats.pubsub.data.Subscription
+import dev.profunktor.redis4cats.pubsub.internals.{ PubSubInternals, PubSubState }
 import dev.profunktor.redis4cats.effect.{ JRFuture, Log }
 import fs2.Stream
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection

diff --git a/.../interpreter/pubsub/LivePubSubStats.scala → ...r/redis4cats/pubsub/LivePubSubStats.scala b/.../interpreter/pubsub/LivePubSubStats.scala → ...r/redis4cats/pubsub/LivePubSubStats.scala
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package dev.profunktor.redis4cats.interpreter.pubsub
+package dev.profunktor.redis4cats
+package pubsub
 
 import cats.effect._
 import cats.syntax.all._
-import dev.profunktor.redis4cats.algebra.PubSubStats
-import dev.profunktor.redis4cats.domain._
-import dev.profunktor.redis4cats.streams.Subscription
+import dev.profunktor.redis4cats.data._
 import dev.profunktor.redis4cats.effect.JRFuture
+import dev.profunktor.redis4cats.pubsub.data.Subscription
 import fs2.Stream
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection
 

diff --git a/...edis4cats/interpreter/pubsub/PubSub.scala → ...profunktor/redis4cats/pubsub/PubSub.scala b/...edis4cats/interpreter/pubsub/PubSub.scala → ...profunktor/redis4cats/pubsub/PubSub.scala
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package dev.profunktor.redis4cats.interpreter.pubsub
+package dev.profunktor.redis4cats
+package pubsub
 
 import cats.effect._
 import cats.effect.concurrent.Ref
 import cats.syntax.all._
-import dev.profunktor.redis4cats.algebra.{ PubSubCommands, PublishCommands, SubscribeCommands }
-import dev.profunktor.redis4cats.domain._
+import dev.profunktor.redis4cats.data._
 import dev.profunktor.redis4cats.connection.RedisClient
 import dev.profunktor.redis4cats.effect.{ JRFuture, Log }
 import dev.profunktor.redis4cats.effect.JRFuture._

diff --git a/...s4cats/interpreter/pubsub/Publisher.scala → ...funktor/redis4cats/pubsub/Publisher.scala b/...s4cats/interpreter/pubsub/Publisher.scala → ...funktor/redis4cats/pubsub/Publisher.scala
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package dev.profunktor.redis4cats.interpreter.pubsub
+package dev.profunktor.redis4cats
+package pubsub
 
 import cats.effect._
 import cats.syntax.functor._
-import dev.profunktor.redis4cats.algebra.{ PubSubStats, PublishCommands }
-import dev.profunktor.redis4cats.domain.RedisChannel
-import dev.profunktor.redis4cats.streams.Subscription
+import dev.profunktor.redis4cats.data.RedisChannel
 import dev.profunktor.redis4cats.effect.JRFuture
+import dev.profunktor.redis4cats.pubsub.data.Subscription
 import fs2.Stream
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection
 

diff --git a/...4cats/interpreter/pubsub/Subscriber.scala → ...unktor/redis4cats/pubsub/Subscriber.scala b/...4cats/interpreter/pubsub/Subscriber.scala → ...unktor/redis4cats/pubsub/Subscriber.scala
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package dev.profunktor.redis4cats.interpreter.pubsub
+package dev.profunktor.redis4cats
+package pubsub
 
 import cats.effect._
 import cats.effect.concurrent.Ref
 import cats.effect.implicits._
 import cats.syntax.all._
-import dev.profunktor.redis4cats.algebra.SubscribeCommands
-import dev.profunktor.redis4cats.interpreter.pubsub.internals.{ PubSubInternals, PubSubState }
-import dev.profunktor.redis4cats.domain.RedisChannel
+import dev.profunktor.redis4cats.pubsub.internals.{ PubSubInternals, PubSubState }
+import dev.profunktor.redis4cats.data.RedisChannel
 import dev.profunktor.redis4cats.effect.{ JRFuture, Log }
 import fs2.Stream
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection