From 91a4120b4253dc4a1e9552ec39fcb25c303a21e1 Mon Sep 17 00:00:00 2001 From: vlad Date: Tue, 13 Jun 2017 16:15:07 -0700 Subject: Scalafmt --- .../xyz/driver/pdsuicommon/utils/Computation.scala | 19 ++++++++++--------- .../scala/xyz/driver/pdsuicommon/utils/MapOps.scala | 5 ++--- .../xyz/driver/pdsuicommon/utils/ServiceUtils.scala | 2 +- .../scala/xyz/driver/pdsuicommon/utils/Utils.scala | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuicommon/utils') diff --git a/src/main/scala/xyz/driver/pdsuicommon/utils/Computation.scala b/src/main/scala/xyz/driver/pdsuicommon/utils/Computation.scala index e609ab0..9e6f3bd 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/utils/Computation.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/utils/Computation.scala @@ -46,17 +46,16 @@ final case class Computation[+R, +T](future: Future[Either[R, T]]) { def flatMap[R2, T2](f: T => Computation[R2, T2])(implicit ec: ExecutionContext, ev: R <:< R2): Computation[R2, T2] = { Computation(future.flatMap { - case Left(x) => Future.successful(Left(x)) + case Left(x) => Future.successful(Left(x)) case Right(x) => f(x).future }) } - def processExceptions[R2](f: PartialFunction[Throwable, R2]) - (implicit ev1: R <:< R2, - ec: ExecutionContext): Computation[R2, T] = { + def processExceptions[R2](f: PartialFunction[Throwable, R2])(implicit ev1: R <:< R2, + ec: ExecutionContext): Computation[R2, T] = { val strategy = f.andThen(x => Left(x): Either[R2, T]) val castedFuture: Future[Either[R2, T]] = future.map { - case Left(x) => Left(x) + case Left(x) => Left(x) case Right(x) => Right(x) } Computation(castedFuture.recover(strategy)) @@ -80,16 +79,16 @@ final case class Computation[+R, +T](future: Future[Either[R, T]]) { def foreach[T2](f: T => T2)(implicit ec: ExecutionContext): Unit = future.foreach { case Right(x) => f(x) - case _ => + case _ => } def toFuture[R2](resultFormatter: T => R2)(implicit ec: ExecutionContext, ev: R <:< R2): Future[R2] = future.map { - case Left(x) => x + case Left(x) => x case Right(x) => resultFormatter(x) } def toFuture[R2](implicit ec: ExecutionContext, ev1: R <:< R2, ev2: T <:< R2): Future[R2] = future.map { - case Left(x) => x + case Left(x) => x case Right(x) => x } @@ -104,6 +103,8 @@ object Computation { def fail(exception: Throwable): Computation[Nothing, Nothing] = Computation(Future.failed(exception)) def fromFuture[T](input: Future[T])(implicit ec: ExecutionContext): Computation[Nothing, T] = Computation { - input.map { x => Right(x) } + input.map { x => + Right(x) + } } } diff --git a/src/main/scala/xyz/driver/pdsuicommon/utils/MapOps.scala b/src/main/scala/xyz/driver/pdsuicommon/utils/MapOps.scala index 79f73a4..ac9a162 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/utils/MapOps.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/utils/MapOps.scala @@ -3,9 +3,8 @@ package xyz.driver.pdsuicommon.utils final class MapOps[K, V](val self: Map[K, V]) extends AnyVal { def swap: Map[V, Set[K]] = { - self - .toList - .groupBy { case (_, v) => v } + self.toList + .groupBy { case (_, v) => v } .mapValues(_.map { case (k, _) => k }.toSet) } } diff --git a/src/main/scala/xyz/driver/pdsuicommon/utils/ServiceUtils.scala b/src/main/scala/xyz/driver/pdsuicommon/utils/ServiceUtils.scala index 979c483..cf53e6b 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/utils/ServiceUtils.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/utils/ServiceUtils.scala @@ -16,7 +16,7 @@ object ServiceUtils extends PhiLogging { def findEqFilter(filter: SearchFilterExpr, dimension: Dimension): Option[SearchFilterExpr] = { filter.find { case Atom.Binary(dimension, Eq, _) => true - case _ => false + case _ => false } } diff --git a/src/main/scala/xyz/driver/pdsuicommon/utils/Utils.scala b/src/main/scala/xyz/driver/pdsuicommon/utils/Utils.scala index ad605e9..02c9e28 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/utils/Utils.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/utils/Utils.scala @@ -15,7 +15,7 @@ object Utils { klass.getSimpleName } catch { case _: InternalError => - val fullName = klass.getName.stripSuffix("$") + val fullName = klass.getName.stripSuffix("$") val fullClassName = fullName.substring(fullName.lastIndexOf(".") + 1) fullClassName.substring(fullClassName.lastIndexOf("$") + 1) } -- cgit v1.2.3