Update PDS UI common code to be up to datev0.1.5

4 files changed, 38 insertions, 36 deletions

diff --git a/src/main/scala/xyz/driver/pdsuicommon/concurrent/BridgeUploadQueueRepositoryAdapter.scala b/src/main/scala/xyz/driver/pdsuicommon/concurrent/BridgeUploadQueueRepositoryAdapter.scala
index a98d2cd..528be59 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/concurrent/BridgeUploadQueueRepositoryAdapter.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/concurrent/BridgeUploadQueueRepositoryAdapter.scala
@@ -12,6 +12,7 @@ import xyz.driver.pdsuicommon.logging._
 
 import scala.concurrent.duration.{Duration, FiniteDuration}
 import scala.concurrent.{ExecutionContext, Future}
+import scala.util.Try
 
 object BridgeUploadQueueRepositoryAdapter {
 
@@ -39,7 +40,8 @@ object BridgeUploadQueueRepositoryAdapter {
       }
 
       private def intervalFor(attempt: Int): Duration = {
-        startInterval * Math.pow(intervalFactor, attempt.toDouble)
+        Try(startInterval * Math.pow(intervalFactor, attempt.toDouble))
+          .getOrElse(maxInterval)
       }
     }
 
diff --git a/src/main/scala/xyz/driver/pdsuicommon/db/SqlContext.scala b/src/main/scala/xyz/driver/pdsuicommon/db/SqlContext.scala
index 860629b..c929eae 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/db/SqlContext.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/db/SqlContext.scala
@@ -67,23 +67,23 @@ class SqlContext(dataSource: DataSource with Closeable, settings: Settings)
     * @see https://github.com/getquill/quill/issues/535
     */
   implicit override def optionDecoder[T](implicit d: Decoder[T]): Decoder[Option[T]] =
-  decoder(
-    sqlType = d.sqlType,
-    row => index => {
-      try {
-        val res = d(index - 1, row)
-        if (row.wasNull) {
-          None
-        }
-        else {
-          Some(res)
-        }
-      } catch {
-        case _: NullPointerException => None
-        case _: IncorrectIdException => None
+    decoder(
+      sqlType = d.sqlType,
+      row =>
+        index => {
+          try {
+            val res = d(index - 1, row)
+            if (row.wasNull) {
+              None
+            } else {
+              Some(res)
+            }
+          } catch {
+            case _: NullPointerException => None
+            case _: IncorrectIdException => None
+          }
       }
-    }
-  )
+    )
 
   final implicit class LocalDateTimeDbOps(val left: LocalDateTime) {
 
diff --git a/src/main/scala/xyz/driver/pdsuicommon/http/AsyncHttpClientFetcher.scala b/src/main/scala/xyz/driver/pdsuicommon/http/AsyncHttpClientFetcher.scala
index 3f99d2a..d836b9d 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/http/AsyncHttpClientFetcher.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/http/AsyncHttpClientFetcher.scala
@@ -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
-      }
-
-      override def onThrowable(t: Throwable): Unit = {
-        promise.failure(t)
-        super.onThrowable(t)
-      }
-    })
+    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)
+        }
+      })
 
     // Promises have their own ExecutionContext
     // So, we have to hack it.
diff --git a/src/main/scala/xyz/driver/pdsuicommon/logging/Implicits.scala b/src/main/scala/xyz/driver/pdsuicommon/logging/Implicits.scala
index e1660e2..109d52a 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/logging/Implicits.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/logging/Implicits.scala
@@ -35,21 +35,19 @@ trait Implicits {
 
   implicit def uuidToPhiString(x: UUID): PhiString = Unsafe(x.toString)
 
-  implicit def tuple2ToPhiString[T1, T2](x: (T1, T2))
-                                        (implicit inner1: T1 => PhiString,
-                                         inner2: T2 => PhiString): PhiString = x match {
+  implicit def tuple2ToPhiString[T1, T2](x: (T1, T2))(implicit inner1: T1 => PhiString,
+                                                      inner2: T2 => PhiString): PhiString = x match {
     case (a, b) => phi"($a, $b)"
   }
 
-  implicit def tuple3ToPhiString[T1, T2, T3](x: (T1, T2, T3))
-                                            (implicit inner1: T1 => PhiString,
-                                             inner2: T2 => PhiString,
-                                             inner3: T3 => PhiString): PhiString = x match {
+  implicit def tuple3ToPhiString[T1, T2, T3](x: (T1, T2, T3))(implicit inner1: T1 => PhiString,
+                                                              inner2: T2 => PhiString,
+                                                              inner3: T3 => PhiString): PhiString = x match {
     case (a, b, c) => phi"($a, $b, $c)"
   }
 
   implicit def optionToPhiString[T](opt: Option[T])(implicit inner: T => PhiString): PhiString = opt match {
-    case None => phi"None"
+    case None    => phi"None"
     case Some(x) => phi"Some($x)"
   }