diff options
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuicommon')
8 files changed, 26 insertions, 21 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/concurrent/SafeBridgeUploadQueue.scala b/src/main/scala/xyz/driver/pdsuicommon/concurrent/SafeBridgeUploadQueue.scala index bab29d5..0bc8220 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/concurrent/SafeBridgeUploadQueue.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/concurrent/SafeBridgeUploadQueue.scala @@ -11,8 +11,7 @@ object SafeBridgeUploadQueue { trait Tag extends Product with Serializable - case class SafeTask[T <: Tag](tag: T, - private[SafeBridgeUploadQueue] val queueItem: BridgeUploadQueue.Item) + case class SafeTask[T <: Tag](tag: T, private[SafeBridgeUploadQueue] val queueItem: BridgeUploadQueue.Item) object SafeTask { implicit def toPhiString[T <: Tag](x: SafeTask[T]): PhiString = { @@ -27,20 +26,20 @@ object SafeBridgeUploadQueue { } -class SafeBridgeUploadQueue[T <: Tag](kind: String, - origQueue: BridgeUploadQueue) - (implicit - tagMarshaller: Marshaller[T, String], - dependencyResolver: DependencyResolver[T], - executionContext: ExecutionContext) { +class SafeBridgeUploadQueue[T <: Tag](kind: String, origQueue: BridgeUploadQueue)( + implicit tagMarshaller: Marshaller[T, String], + dependencyResolver: DependencyResolver[T], + executionContext: ExecutionContext) { type Task = SafeTask[T] - def add(tag: T): Future[BridgeUploadQueue.Item] = origQueue.add(BridgeUploadQueue.Item( - kind = kind, - tag = tagMarshaller.write(tag), - dependency = dependencyResolver.getDependency(tag) - )) + def add(tag: T): Future[BridgeUploadQueue.Item] = + origQueue.add( + BridgeUploadQueue.Item( + kind = kind, + tag = tagMarshaller.write(tag), + dependency = dependencyResolver.getDependency(tag) + )) def tryRetry(task: Task): Future[Option[Task]] = wrap(origQueue.tryRetry(task.queueItem)) diff --git a/src/main/scala/xyz/driver/pdsuicommon/db/FakeDbIo.scala b/src/main/scala/xyz/driver/pdsuicommon/db/FakeDbIo.scala index e5a628c..ac42a34 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/db/FakeDbIo.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/db/FakeDbIo.scala @@ -3,7 +3,7 @@ package xyz.driver.pdsuicommon.db import scala.concurrent.Future object FakeDbIo extends DbIo { - override def runAsync[T](f: => T): Future[T] = Future.successful(f) + override def runAsync[T](f: => T): Future[T] = Future.successful(f) override def runAsyncTx[T](f: => T): Future[T] = Future.successful(f) - override def runSyncTx[T](f: => T): Unit = f + override def runSyncTx[T](f: => T): Unit = f } diff --git a/src/main/scala/xyz/driver/pdsuicommon/db/MySqlContext.scala b/src/main/scala/xyz/driver/pdsuicommon/db/MySqlContext.scala index 768d1e3..f804e87 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/db/MySqlContext.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/db/MySqlContext.scala @@ -45,8 +45,7 @@ object MySqlContext extends PhiLogging { } class MySqlContext(dataSource: DataSource with Closeable, settings: Settings) - extends MysqlJdbcContext[MysqlEscape](dataSource) - with TransactionalContext + extends MysqlJdbcContext[MysqlEscape](dataSource) with TransactionalContext with EntityExtractorDerivation[Literal] { private val tpe = Executors.newFixedThreadPool(settings.threadPoolSize) diff --git a/src/main/scala/xyz/driver/pdsuicommon/json/Serialization.scala b/src/main/scala/xyz/driver/pdsuicommon/json/Serialization.scala index 223c66e..9800903 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/json/Serialization.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/json/Serialization.scala @@ -5,6 +5,7 @@ import java.net.URI import play.api.libs.functional.syntax._ import play.api.libs.json._ import xyz.driver.pdsuicommon.domain._ +import xyz.driver.pdsuidomain.entities.CaseId object Serialization { @@ -44,4 +45,8 @@ object Serialization { private val passwordHashJsonWrites: Writes[PasswordHash] = Writes( passwordHash => JsString(passwordHash.value.toString)) implicit val passwordHashJsonFormat: Format[PasswordHash] = Format(passwordHashJsonReads, passwordHashJsonWrites) + + private val caseIdJsonReads: Reads[CaseId] = Reads.StringReads.map(CaseId(_)) + private val caseIdJsonWrites: Writes[CaseId] = Writes(caseId => JsString(caseId.id)) + implicit val caseIdJsonFormat: Format[CaseId] = Format(caseIdJsonReads, caseIdJsonWrites) } diff --git a/src/main/scala/xyz/driver/pdsuicommon/utils/CharOps.scala b/src/main/scala/xyz/driver/pdsuicommon/utils/CharOps.scala index 42bf92d..cee9c73 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/utils/CharOps.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/utils/CharOps.scala @@ -20,7 +20,7 @@ private object CharOps { "\u3000\u2004\u3000\u3000\u2028\n\u2007\u3000" private val Multiplier: Int = 1682554634 - private val Shift: Int = Integer.numberOfLeadingZeros(Table.length - 1) + private val Shift: Int = Integer.numberOfLeadingZeros(Table.length - 1) def matches(c: Char): Boolean = Table.charAt((Multiplier * c) >>> Shift) == c } diff --git a/src/main/scala/xyz/driver/pdsuicommon/utils/StringOps.scala b/src/main/scala/xyz/driver/pdsuicommon/utils/StringOps.scala index b38721e..eaac761 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/utils/StringOps.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/utils/StringOps.scala @@ -11,7 +11,7 @@ final class StringOps(val self: String) extends AnyVal { "" } else { val start = self.indexWhere(shouldKeep) - val end = self.lastIndexWhere(shouldKeep) + val end = self.lastIndexWhere(shouldKeep) if (start >= 0 && end >= 0) { self.substring(start, end + 1) diff --git a/src/main/scala/xyz/driver/pdsuicommon/utils/WriteableImplicits.scala b/src/main/scala/xyz/driver/pdsuicommon/utils/WriteableImplicits.scala index 2c66a23..6c04dfa 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/utils/WriteableImplicits.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/utils/WriteableImplicits.scala @@ -8,7 +8,9 @@ trait WriteableImplicits { // Write JSON by default at now implicit def defaultWriteable[T](implicit inner: Writes[T]) = Writeable[T]( - { x: T => Writeable.writeableOf_JsValue.transform(Json.toJson(x)) }, + { x: T => + Writeable.writeableOf_JsValue.transform(Json.toJson(x)) + }, Option(ContentTypes.JSON) ) diff --git a/src/main/scala/xyz/driver/pdsuicommon/utils/WritesUtils.scala b/src/main/scala/xyz/driver/pdsuicommon/utils/WritesUtils.scala index fa05e96..3476a1e 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/utils/WritesUtils.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/utils/WritesUtils.scala @@ -14,7 +14,7 @@ object WritesUtils { w.transform { input: JsValue => input match { case JsObject(map) => JsObject(map.filter(Function.tupled(p))) - case x => x + case x => x } } } |