Merge remote-tracking branch 'origin/master' into fp-recover-asResultSet-tp

Author: Fran Pérez

build.sbt

@@ -5,8 +5,8 @@ pgpPublicRing := file(s"$gpgFolder/pubring.gpg")
 pgpSecretRing := file(s"$gpgFolder/secring.gpg")
 
 lazy val commonDependencies: Seq[ModuleID] = Seq(
-  %%("frees-async"),
-  %%("frees-async-guava"),
+  %%("frees-async", "0.4.2"),
+  %%("frees-async-guava", "0.4.2"),
   %%("shapeless"),
   %%("classy-core"),
   %%("classy-config-typesafe"),

core/src/main/scala/config/decoders.scala core/src/main/scala/config/Decoders.scalacore/src/main/scala/config/decoders.scala renamed to core/src/main/scala/config/Decoders.scala

@@ -18,16 +18,15 @@ package freestyle.cassandra
 
 import cats.{~>, MonadError}
 import com.datastax.driver.core.{Cluster, Session}
-import com.google.common.util.concurrent.{AsyncFunction, Futures, ListenableFuture}
 import freestyle.async.AsyncContext
-import freestyle.asyncGuava.implicits._
+import freestyle.async.{Implicits => AsyncImplicits}
+import freestyle.asyncGuava.AsyncGuavaImplicits
 import freestyle.cassandra.api._
 import freestyle.cassandra.handlers._
-import java.util.concurrent.{Executor => JavaExecutor}
 
 import scala.concurrent.ExecutionContext
 
-object implicits {
+trait CassandraImplicits extends AsyncImplicits with AsyncGuavaImplicits {
 
   implicit def clusterAPIInterpreter[M[_]](
       implicit cluster: Cluster,
@@ -50,18 +49,6 @@ object implicits {
   implicit def resultSetAPIHandler[M[_]](
       implicit ME: MonadError[M, Throwable]): ResultSetAPIHandler[M] =
     new ResultSetAPIHandler[M]
-
-  implicit def listenableVoidToListenableUnit(future: ListenableFuture[Void])(
-      implicit E: ExecutionContext): ListenableFuture[Unit] =
-    Futures.transformAsync(
-      future,
-      new AsyncFunction[Void, Unit] {
-        override def apply(input: Void): ListenableFuture[Unit] =
-          Futures.immediateFuture((): Unit)
-      },
-      new JavaExecutor {
-        override def execute(command: Runnable): Unit = E.execute(command)
-      }
-    )
-
 }
+
+object implicits extends CassandraImplicits

core/src/main/scala/implicits.scala

@@ -17,7 +17,6 @@
 package freestyle.cassandra
 package query.interpolator
 
-import cats.MonadError
 import cats.data.Validated.{Invalid, Valid}
 import contextual.Interpolator
 import freestyle.cassandra.query.model.{SerializableValue, SerializableValueBy}

core/src/main/scala/query/interpolator/CQLInterpolator.scala

@@ -25,7 +25,6 @@ import freestyle.cassandra.codecs.ByteBufferCodec
 import freestyle.cassandra.query._
 import shapeless._
 import shapeless.labelled.{FieldBuilder, FieldType}
-import shapeless.{::, HList, Witness}
 
 trait FromReader[A] {
   def apply[M[_]](reader: ByteBufferReader)(implicit ME: MonadError[M, Throwable]): M[A]

core/src/main/scala/query/mapper/ByteBufferToField.scala

@@ -19,6 +19,7 @@ package freestyle.cassandra
 import cats.~>
 import com.google.common.util.concurrent.ListenableFuture
 import freestyle.cassandra.TestUtils._
+import freestyle.cassandra.implicits._
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.{Matchers, OneInstancePerTest, WordSpec}
 
@@ -31,9 +32,6 @@ class ListenableFuture2AsyncMSpec
     with OneInstancePerTest
     with MockFactory {
 
-  import freestyle.async.implicits._
-  import freestyle.asyncGuava.implicits._
-
   val handler: ListenableFuture ~> Future = listenableFuture2Async[Future]
 
   "ListenableFuture2AsyncM" should {

core/src/test/scala/ListenableFuture2AsyncMSpec.scala

@@ -19,12 +19,11 @@ package handlers
 
 import com.datastax.driver.core._
 import com.google.common.util.concurrent.ListenableFuture
-import freestyle.cassandra.api.ClusterAPIOps
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.{Matchers, OneInstancePerTest, WordSpec}
 
 import scala.concurrent.ExecutionContext.Implicits.global
-import scala.concurrent.{Await, Future}
+import scala.concurrent.Future
 
 class ClusterAPIHandlerSpec
     extends WordSpec
@@ -39,8 +38,6 @@ class ClusterAPIHandlerSpec
   val metadataTest: Metadata       = MetadataTest()
 
   import cats.instances.future._
-  import freestyle.async.implicits._
-  import freestyle.asyncGuava.implicits._
   import freestyle.cassandra.implicits._
   import TestUtils._
   val handler: ClusterAPIHandler[Future] = new ClusterAPIHandler[Future]

core/src/test/scala/handlers/ClusterAPIHandlerSpec.scala

@@ -18,7 +18,6 @@ package freestyle.cassandra
 package handlers
 
 import com.datastax.driver.core._
-import freestyle.asyncGuava.implicits._
 import freestyle.cassandra.TestUtils.MatchersUtil
 import freestyle.cassandra.config.ConfigArbitraries._
 import freestyle.cassandra.query.QueryArbitraries._
@@ -45,7 +44,6 @@ class SessionAPIHandlerSpec
   val rsMock: ResultSet             = stub[ResultSet]
 
   import cats.instances.future._
-  import freestyle.async.implicits._
   import freestyle.cassandra.implicits._
   import TestUtils._
   val handler: SessionAPIHandler[Future] = new SessionAPIHandler[Future]