From 5980017ece9be1ebf30775e5babf81e0e2f1fcd9 Mon Sep 17 00:00:00 2001 From: Sam Guymer Date: Thu, 17 May 2018 20:07:04 +1000 Subject: Code review updates --- .../com/softwaremill/sttp/impl/cats/AsyncMonadAsyncError.scala | 2 +- .../src/test/scala/com/softwaremill/sttp/impl/cats/package.scala | 2 +- .../com/softwaremill/sttp/impl/monix/TaskMonadAsyncError.scala | 4 ++-- .../softwaremill/sttp/impl/monix/MonixTestStreamingBackend.scala | 6 +++--- .../src/test/scala/com/softwaremill/sttp/impl/monix/package.scala | 2 +- .../src/test/scala/com/softwaremill/sttp/impl/scalaz/package.scala | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'implementations') diff --git a/implementations/cats/src/main/scala/com/softwaremill/sttp/impl/cats/AsyncMonadAsyncError.scala b/implementations/cats/src/main/scala/com/softwaremill/sttp/impl/cats/AsyncMonadAsyncError.scala index 02f9643..902422e 100644 --- a/implementations/cats/src/main/scala/com/softwaremill/sttp/impl/cats/AsyncMonadAsyncError.scala +++ b/implementations/cats/src/main/scala/com/softwaremill/sttp/impl/cats/AsyncMonadAsyncError.scala @@ -1,6 +1,6 @@ package com.softwaremill.sttp.impl.cats -import _root_.cats.effect.{Async, Effect} +import cats.effect.{Async, Effect} import com.softwaremill.sttp.MonadAsyncError import scala.language.higherKinds diff --git a/implementations/cats/src/test/scala/com/softwaremill/sttp/impl/cats/package.scala b/implementations/cats/src/test/scala/com/softwaremill/sttp/impl/cats/package.scala index 65be9f2..abffc90 100644 --- a/implementations/cats/src/test/scala/com/softwaremill/sttp/impl/cats/package.scala +++ b/implementations/cats/src/test/scala/com/softwaremill/sttp/impl/cats/package.scala @@ -7,7 +7,7 @@ import scala.concurrent.Future package object cats { - val convertToFuture: ConvertToFuture[IO] = new ConvertToFuture[IO] { + val convertCatsIOToFuture: ConvertToFuture[IO] = new ConvertToFuture[IO] { override def toFuture[T](value: IO[T]): Future[T] = value.unsafeToFuture() } } diff --git a/implementations/monix/src/main/scala/com/softwaremill/sttp/impl/monix/TaskMonadAsyncError.scala b/implementations/monix/src/main/scala/com/softwaremill/sttp/impl/monix/TaskMonadAsyncError.scala index 1806100..75992d4 100644 --- a/implementations/monix/src/main/scala/com/softwaremill/sttp/impl/monix/TaskMonadAsyncError.scala +++ b/implementations/monix/src/main/scala/com/softwaremill/sttp/impl/monix/TaskMonadAsyncError.scala @@ -1,8 +1,8 @@ package com.softwaremill.sttp.impl.monix import com.softwaremill.sttp.MonadAsyncError -import _root_.monix.eval.Task -import _root_.monix.execution.Cancelable +import monix.eval.Task +import monix.execution.Cancelable import scala.util.{Failure, Success} diff --git a/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/MonixTestStreamingBackend.scala b/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/MonixTestStreamingBackend.scala index c6e44da..3f84ec3 100644 --- a/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/MonixTestStreamingBackend.scala +++ b/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/MonixTestStreamingBackend.scala @@ -2,13 +2,13 @@ package com.softwaremill.sttp.impl.monix import java.nio.ByteBuffer -import _root_.monix.eval.Task -import _root_.monix.reactive.Observable import com.softwaremill.sttp.testing.streaming.{ConvertToFuture, TestStreamingBackend} +import monix.eval.Task +import monix.reactive.Observable trait MonixTestStreamingBackend extends TestStreamingBackend[Task, Observable[ByteBuffer]] { - override implicit def convertToFuture: ConvertToFuture[Task] = com.softwaremill.sttp.impl.monix.convertToFuture + override implicit def convertToFuture: ConvertToFuture[Task] = convertMonixTaskToFuture override def bodyProducer(body: String): Observable[ByteBuffer] = Observable.fromIterable(body.getBytes("utf-8").map(b => ByteBuffer.wrap(Array(b)))) diff --git a/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/package.scala b/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/package.scala index 25cf7e1..f77aa93 100644 --- a/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/package.scala +++ b/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/package.scala @@ -7,7 +7,7 @@ import com.softwaremill.sttp.testing.streaming.ConvertToFuture package object monix { - val convertToFuture: ConvertToFuture[Task] = new ConvertToFuture[Task] { + val convertMonixTaskToFuture: ConvertToFuture[Task] = new ConvertToFuture[Task] { import _root_.monix.execution.Scheduler.Implicits.global override def toFuture[T](value: Task[T]): Future[T] = value.runAsync diff --git a/implementations/scalaz/src/test/scala/com/softwaremill/sttp/impl/scalaz/package.scala b/implementations/scalaz/src/test/scala/com/softwaremill/sttp/impl/scalaz/package.scala index 72dbf31..8ac6446 100644 --- a/implementations/scalaz/src/test/scala/com/softwaremill/sttp/impl/scalaz/package.scala +++ b/implementations/scalaz/src/test/scala/com/softwaremill/sttp/impl/scalaz/package.scala @@ -9,7 +9,7 @@ import scala.util.{Failure, Success} package object scalaz { - val convertToFuture: ConvertToFuture[Task] = new ConvertToFuture[Task] { + val convertScalazTaskToFuture: ConvertToFuture[Task] = new ConvertToFuture[Task] { // from https://github.com/Verizon/delorean override def toFuture[T](value: Task[T]): Future[T] = { val p = Promise[T]() -- cgit v1.2.3