Rename subprojects to be more consistent

7 files changed, 34 insertions, 39 deletions

diff --git a/tests/src/test/scala/com/softwaremill/sttp/BasicTests.scala b/tests/src/test/scala/com/softwaremill/sttp/BasicTests.scala
index 1594ef3..2275c5e 100644
--- a/tests/src/test/scala/com/softwaremill/sttp/BasicTests.scala
+++ b/tests/src/test/scala/com/softwaremill/sttp/BasicTests.scala
@@ -14,16 +14,13 @@ import akka.http.scaladsl.server.Route
 import akka.http.scaladsl.server.directives.Credentials
 import akka.util.ByteString
 import better.files._
-import com.softwaremill.sttp.akkahttp.AkkaHttpSttpHandler
-import com.softwaremill.sttp.asynchttpclient.cats.CatsAsyncHttpClientHandler
-import com.softwaremill.sttp.asynchttpclient.future.FutureAsyncHttpClientHandler
-import com.softwaremill.sttp.asynchttpclient.monix.MonixAsyncHttpClientHandler
-import com.softwaremill.sttp.asynchttpclient.scalaz.ScalazAsyncHttpClientHandler
-import com.softwaremill.sttp.okhttp.monix.OkHttpMonixClientHandler
-import com.softwaremill.sttp.okhttp.{
-  OkHttpFutureClientHandler,
-  OkHttpSyncClientHandler
-}
+import com.softwaremill.sttp.akkahttp.AkkaHttpHandler
+import com.softwaremill.sttp.asynchttpclient.cats.AsyncHttpClientCatsHandler
+import com.softwaremill.sttp.asynchttpclient.future.AsyncHttpClientFutureHandler
+import com.softwaremill.sttp.asynchttpclient.monix.AsyncHttpClientMonixHandler
+import com.softwaremill.sttp.asynchttpclient.scalaz.AsyncHttpClientScalazHandler
+import com.softwaremill.sttp.okhttp.monix.OkHttpMonixHandler
+import com.softwaremill.sttp.okhttp.{OkHttpFutureHandler, OkHttpSyncHandler}
 import com.typesafe.scalalogging.StrictLogging
 import org.scalatest.concurrent.{IntegrationPatience, ScalaFutures}
 import org.scalatest.{path => _, _}
@@ -158,24 +155,22 @@ class BasicTests
 
   var closeHandlers: List[() => Unit] = Nil
 
-  runTests("HttpURLConnection")(HttpURLConnectionSttpHandler,
-                                ForceWrappedValue.id)
-  runTests("Akka HTTP")(AkkaHttpSttpHandler.usingActorSystem(actorSystem),
+  runTests("HttpURLConnection")(HttpURLConnectionHandler, ForceWrappedValue.id)
+  runTests("Akka HTTP")(AkkaHttpHandler.usingActorSystem(actorSystem),
                         ForceWrappedValue.future)
-  runTests("Async Http Client - Future")(FutureAsyncHttpClientHandler(),
+  runTests("Async Http Client - Future")(AsyncHttpClientFutureHandler(),
                                          ForceWrappedValue.future)
-  runTests("Async Http Client - Scalaz")(ScalazAsyncHttpClientHandler(),
+  runTests("Async Http Client - Scalaz")(AsyncHttpClientScalazHandler(),
                                          ForceWrappedValue.scalazTask)
-  runTests("Async Http Client - Monix")(MonixAsyncHttpClientHandler(),
+  runTests("Async Http Client - Monix")(AsyncHttpClientMonixHandler(),
                                         ForceWrappedValue.monixTask)
   runTests("Async Http Client - Cats Effect")(
-    CatsAsyncHttpClientHandler[cats.effect.IO](),
+    AsyncHttpClientCatsHandler[cats.effect.IO](),
     ForceWrappedValue.catsIo)
-  runTests("OkHttpSyncClientHandler")(OkHttpSyncClientHandler(),
-                                      ForceWrappedValue.id)
-  runTests("OkHttpAsyncClientHandler - Future")(OkHttpFutureClientHandler(),
+  runTests("OkHttpSyncClientHandler")(OkHttpSyncHandler(), ForceWrappedValue.id)
+  runTests("OkHttpAsyncClientHandler - Future")(OkHttpFutureHandler(),
                                                 ForceWrappedValue.future)
-  runTests("OkHttpAsyncClientHandler - Monix")(OkHttpMonixClientHandler(),
+  runTests("OkHttpAsyncClientHandler - Monix")(OkHttpMonixHandler(),
                                                ForceWrappedValue.monixTask)
 
   def runTests[R[_]](name: String)(
diff --git a/tests/src/test/scala/com/softwaremill/sttp/IllTypedTests.scala b/tests/src/test/scala/com/softwaremill/sttp/IllTypedTests.scala
index 6137ed2..4e03fc2 100644
--- a/tests/src/test/scala/com/softwaremill/sttp/IllTypedTests.scala
+++ b/tests/src/test/scala/com/softwaremill/sttp/IllTypedTests.scala
@@ -12,7 +12,7 @@ class IllTypedTests extends FlatSpec with Matchers {
         import com.softwaremill.sttp._
         import akka.stream.scaladsl.Source
         import akka.util.ByteString
-        implicit val sttpHandler = HttpURLConnectionSttpHandler
+        implicit val sttpHandler = HttpURLConnectionHandler
         sttp.get(uri"http://example.com").response(asStream[Source[ByteString, Any]]).send()
         """)
     }
@@ -25,7 +25,7 @@ class IllTypedTests extends FlatSpec with Matchers {
     val thrown = intercept[ToolBoxError] {
       EvalScala("""
         import com.softwaremill.sttp._
-        implicit val sttpHandler = HttpURLConnectionSttpHandler
+        implicit val sttpHandler = HttpURLConnectionHandler
         sttp.send()
         """)
     }
diff --git a/tests/src/test/scala/com/softwaremill/sttp/StreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/StreamingTests.scala
index d3c7b89..bb198b8 100644
--- a/tests/src/test/scala/com/softwaremill/sttp/StreamingTests.scala
+++ b/tests/src/test/scala/com/softwaremill/sttp/StreamingTests.scala
@@ -33,10 +33,10 @@ class StreamingTests
 
   var closeHandlers: List[() => Unit] = Nil
 
-  runTests("Akka Http", new AkkaStreamingTests(actorSystem))
-  runTests("Monix Async Http Client", new MonixAHCStreamingTests)
-  runTests("Monix OkHttp", new MonixOKHStreamingTests)
-  runTests("fs2 Async Http Client", new Fs2StreamingTests)
+  runTests("Akka Http", new AkkaHttpStreamingTests(actorSystem))
+  runTests("Monix Async Http Client", new AsyncHttpClientMonixStreamingTests)
+  runTests("Monix OkHttp", new OkHttpMonixStreamingTests)
+  runTests("fs2 Async Http Client", new AsyncHttpClientFs2StreamingTests)
 
   def runTests[R[_], S](
       name: String,
diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaStreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaHttpStreamingTests.scala
index 53fe63e..25a8d6e 100644
--- a/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaStreamingTests.scala
+++ b/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaHttpStreamingTests.scala
@@ -5,17 +5,17 @@ import akka.actor.ActorSystem
 import akka.stream.Materializer
 import akka.stream.scaladsl.Source
 import akka.util.ByteString
+import com.softwaremill.sttp.akkahttp.AkkaHttpHandler
 import com.softwaremill.sttp.{ForceWrappedValue, SttpHandler}
-import com.softwaremill.sttp.akkahttp.AkkaHttpSttpHandler
 
 import scala.concurrent.Future
 
-class AkkaStreamingTests(actorSystem: ActorSystem)(
+class AkkaHttpStreamingTests(actorSystem: ActorSystem)(
     implicit materializer: Materializer)
     extends TestStreamingHandler[Future, Source[ByteString, Any]] {
 
   override implicit val handler: SttpHandler[Future, Source[ByteString, Any]] =
-    AkkaHttpSttpHandler.usingActorSystem(actorSystem)
+    AkkaHttpHandler.usingActorSystem(actorSystem)
 
   override implicit val forceResponse: ForceWrappedValue[Future] =
     ForceWrappedValue.future
diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/Fs2StreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientFs2StreamingTests.scala
index b9d249b..b55d104 100644
--- a/tests/src/test/scala/com/softwaremill/sttp/streaming/Fs2StreamingTests.scala
+++ b/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientFs2StreamingTests.scala
@@ -4,15 +4,15 @@ import java.nio.ByteBuffer
 
 import cats.effect._
 import cats.implicits._
-import com.softwaremill.sttp.asynchttpclient.fs2.Fs2AsyncHttpClientHandler
+import com.softwaremill.sttp.asynchttpclient.fs2.AsyncHttpClientFs2Handler
 import com.softwaremill.sttp.{ForceWrappedValue, SttpHandler}
 import fs2._
 
-class Fs2StreamingTests
+class AsyncHttpClientFs2StreamingTests
     extends TestStreamingHandler[IO, Stream[IO, ByteBuffer]] {
 
   override implicit val handler: SttpHandler[IO, Stream[IO, ByteBuffer]] =
-    Fs2AsyncHttpClientHandler[IO]()
+    AsyncHttpClientFs2Handler[IO]()
 
   override implicit val forceResponse: ForceWrappedValue[IO] =
     ForceWrappedValue.catsIo
diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/MonixAHCStreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientMonixStreamingTests.scala
index 4a4ff96..a76aa26 100644
--- a/tests/src/test/scala/com/softwaremill/sttp/streaming/MonixAHCStreamingTests.scala
+++ b/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientMonixStreamingTests.scala
@@ -3,15 +3,15 @@ package com.softwaremill.sttp.streaming
 import java.nio.ByteBuffer
 
 import com.softwaremill.sttp.SttpHandler
-import com.softwaremill.sttp.asynchttpclient.monix.MonixAsyncHttpClientHandler
+import com.softwaremill.sttp.asynchttpclient.monix.AsyncHttpClientMonixHandler
 import monix.eval.Task
 import monix.reactive.Observable
 
-class MonixAHCStreamingTests extends MonixBaseHandler {
+class AsyncHttpClientMonixStreamingTests extends MonixBaseHandler {
 
   import monix.execution.Scheduler.Implicits.global
 
   override implicit val handler: SttpHandler[Task, Observable[ByteBuffer]] =
-    MonixAsyncHttpClientHandler()
+    AsyncHttpClientMonixHandler()
 
 }
diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/MonixOKHStreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/OkHttpMonixStreamingTests.scala
index 04666be..2ea1322 100644
--- a/tests/src/test/scala/com/softwaremill/sttp/streaming/MonixOKHStreamingTests.scala
+++ b/tests/src/test/scala/com/softwaremill/sttp/streaming/OkHttpMonixStreamingTests.scala
@@ -3,15 +3,15 @@ package com.softwaremill.sttp.streaming
 import java.nio.ByteBuffer
 
 import com.softwaremill.sttp.SttpHandler
-import com.softwaremill.sttp.okhttp.monix.OkHttpMonixClientHandler
+import com.softwaremill.sttp.okhttp.monix.OkHttpMonixHandler
 import monix.eval.Task
 import monix.reactive.Observable
 
-class MonixOKHStreamingTests extends MonixBaseHandler {
+class OkHttpMonixStreamingTests extends MonixBaseHandler {
 
   import monix.execution.Scheduler.Implicits.global
 
   override implicit val handler: SttpHandler[Task, Observable[ByteBuffer]] =
-    OkHttpMonixClientHandler()
+    OkHttpMonixHandler()
 
 }