diff options
author | vlad <vlad@driver.xyz> | 2017-06-13 16:15:07 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-06-13 16:15:07 -0700 |
commit | 91a4120b4253dc4a1e9552ec39fcb25c303a21e1 (patch) | |
tree | 9173797ed8e3d780f98ac8d0f85507eeb10c8016 /src/main/scala/xyz/driver/pdsuicommon/http | |
parent | cd1b635b2ae90d9ac2d8b1779183a1fbd8c5fd5c (diff) | |
download | rest-query-91a4120b4253dc4a1e9552ec39fcb25c303a21e1.tar.gz rest-query-91a4120b4253dc4a1e9552ec39fcb25c303a21e1.tar.bz2 rest-query-91a4120b4253dc4a1e9552ec39fcb25c303a21e1.zip |
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuicommon/http')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuicommon/http/AsyncHttpClientFetcher.scala | 27 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/pdsuicommon/http/AsyncHttpClientUploader.scala | 22 |
2 files changed, 26 insertions, 23 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/http/AsyncHttpClientFetcher.scala b/src/main/scala/xyz/driver/pdsuicommon/http/AsyncHttpClientFetcher.scala index 4b0d897..d693019 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/http/AsyncHttpClientFetcher.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/http/AsyncHttpClientFetcher.scala @@ -14,7 +14,7 @@ import scala.concurrent.duration.FiniteDuration import scala.concurrent.{ExecutionContext, Future, Promise} class AsyncHttpClientFetcher(settings: AsyncHttpClientFetcher.Settings) - extends HttpFetcher with Closeable with StrictLogging { + extends HttpFetcher with Closeable with StrictLogging { private val es: ExecutorService = { val threadFactory = MdcThreadFactory.from(Executors.defaultThreadFactory()) @@ -40,17 +40,19 @@ class AsyncHttpClientFetcher(settings: AsyncHttpClientFetcher.Settings) logger.info("{}, apply({})", fingerPrint, url) val promise = Promise[Response]() - httpClient.prepareGet(url.toString).execute(new AsyncCompletionHandler[Response] { - override def onCompleted(response: Response): Response = { - promise.success(response) - response - } + httpClient + .prepareGet(url.toString) + .execute(new AsyncCompletionHandler[Response] { + override def onCompleted(response: Response): Response = { + promise.success(response) + response + } - override def onThrowable(t: Throwable): Unit = { - promise.failure(t) - super.onThrowable(t) - } - }) + override def onThrowable(t: Throwable): Unit = { + promise.failure(t) + super.onThrowable(t) + } + }) // Promises have their own ExecutionContext // So, we have to hack it. @@ -84,7 +86,6 @@ class AsyncHttpClientFetcher(settings: AsyncHttpClientFetcher.Settings) object AsyncHttpClientFetcher { - case class Settings(connectTimeout: FiniteDuration, - readTimeout: FiniteDuration) + case class Settings(connectTimeout: FiniteDuration, readTimeout: FiniteDuration) } diff --git a/src/main/scala/xyz/driver/pdsuicommon/http/AsyncHttpClientUploader.scala b/src/main/scala/xyz/driver/pdsuicommon/http/AsyncHttpClientUploader.scala index 6ad404f..d7bc3d3 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/http/AsyncHttpClientUploader.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/http/AsyncHttpClientUploader.scala @@ -50,16 +50,18 @@ class AsyncHttpClientUploader(settings: Settings) extends Closeable with StrictL q.addHeader("Content-Type", contentType) - httpClient.prepareRequest(q).execute(new AsyncCompletionHandler[Unit] { - override def onCompleted(response: Response): Unit = { - promise.success(response) - } - - override def onThrowable(t: Throwable): Unit = { - promise.failure(t) - super.onThrowable(t) - } - }) + httpClient + .prepareRequest(q) + .execute(new AsyncCompletionHandler[Unit] { + override def onCompleted(response: Response): Unit = { + promise.success(response) + } + + override def onThrowable(t: Throwable): Unit = { + promise.failure(t) + super.onThrowable(t) + } + }) // see AsyncHttpClientFetcher val parentMdcContext = MDC.getCopyOfContextMap |