Externalized StandaloneAhcWSClient in WsApiHttpClient

Author: viktor-podzigun

play-ws/src/main/scala/scommons/api/http/ws/WsApiHttpClient.scala

@@ -2,31 +2,20 @@ package scommons.api.http.ws
 
 import java.util.concurrent.TimeoutException
 
-import akka.actor.ActorSystem
-import akka.stream.{ActorMaterializer, Materializer}
 import akka.util.ByteString
 import play.api.libs.ws.DefaultBodyWritables._
+import play.api.libs.ws._
 import play.api.libs.ws.ahc.StandaloneAhcWSClient
-import play.api.libs.ws.{BodyWritable, InMemoryBody, StandaloneWSRequest, StandaloneWSResponse}
 import scommons.api.http.ApiHttpData._
 import scommons.api.http.{ApiHttpClient, ApiHttpData, ApiHttpResponse}
 
 import scala.concurrent.duration._
 import scala.concurrent.{ExecutionContext, Future}
 
-class WsApiHttpClient(baseUrl: String,
+class WsApiHttpClient(ws: StandaloneAhcWSClient,
+                      baseUrl: String,
                       defaultTimeout: FiniteDuration = 30.seconds)
-                     (implicit system: ActorSystem)
-  extends ApiHttpClient(baseUrl, defaultTimeout)(system.dispatcher) {
-
-  private implicit val ec: ExecutionContext = system.dispatcher
-  private implicit val materializer: Materializer = ActorMaterializer()
-
-  private[ws] val ws = StandaloneAhcWSClient()
-
-  system.registerOnTermination {
-    ws.close()
-  }
+                     (implicit ec: ExecutionContext) extends ApiHttpClient(baseUrl, defaultTimeout) {
 
   protected[ws] def execute(method: String,
                             targetUrl: String,

play-ws/src/test/scala/scommons/api/http/ws/WsApiHttpClientSpec.scala

@@ -17,7 +17,7 @@ import play.api.libs.ws.{EmptyBody, InMemoryBody, StandaloneWSRequest, Standalon
 import scommons.api.http.ApiHttpData.{StringData, UrlEncodedFormData}
 import scommons.api.http.{ApiHttpData, ApiHttpResponse}
 
-import scala.concurrent.Future
+import scala.concurrent.{ExecutionContext, Future}
 import scala.concurrent.duration._
 
 class WsApiHttpClientSpec extends FlatSpec
@@ -33,14 +33,14 @@ class WsApiHttpClientSpec extends FlatSpec
   )
 
   private implicit val system: ActorSystem = ActorSystem(getClass.getSimpleName)
+  private implicit val ec: ExecutionContext = system.dispatcher
   private implicit val materializer: ActorMaterializer = ActorMaterializer()
 
   private val baseUrl = "http://test.api.client"
   private val response = mock[StandaloneWSResponse]
+  private val wsClient = StandaloneAhcWSClient()
 
-  private class TestWsClient extends WsApiHttpClient(baseUrl) {
-
-    override private[ws] val ws = spy(StandaloneAhcWSClient())
+  private class TestWsClient extends WsApiHttpClient(wsClient, baseUrl) {
 
     override private[ws] def execute(req: StandaloneWSRequest): Future[StandaloneWSResponse] = {
       Future.successful(response)
@@ -62,11 +62,8 @@ class WsApiHttpClientSpec extends FlatSpec
   }
 
   override protected def afterAll(): Unit = {
-    reset(client.ws)
-
+    wsClient.close()
     system.terminate().futureValue
-
-    verify(client.ws).close()
   }
 
   it should "execute request without body" in {