From d63fd7ef92b67dec5ea72f26d73d56cec676bd82 Mon Sep 17 00:00:00 2001 From: Stewart Stewart Date: Mon, 19 Dec 2016 18:43:07 -0500 Subject: scalafmt --- src/main/scala/xyz/driver/core/database/package.scala | 1 - src/main/scala/xyz/driver/core/date.scala | 6 +----- src/main/scala/xyz/driver/core/json.scala | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) (limited to 'src/main') diff --git a/src/main/scala/xyz/driver/core/database/package.scala b/src/main/scala/xyz/driver/core/database/package.scala index 295e556..2041b85 100644 --- a/src/main/scala/xyz/driver/core/database/package.scala +++ b/src/main/scala/xyz/driver/core/database/package.scala @@ -6,7 +6,6 @@ import java.util.Calendar import date.{Date, javaDateToDate} import slick.dbio.{DBIOAction, NoStream} - package object database { type Schema = { def create: DBIOAction[Unit, NoStream, slick.dbio.Effect.Schema] diff --git a/src/main/scala/xyz/driver/core/date.scala b/src/main/scala/xyz/driver/core/date.scala index 476cd13..437729f 100644 --- a/src/main/scala/xyz/driver/core/date.scala +++ b/src/main/scala/xyz/driver/core/date.scala @@ -26,11 +26,7 @@ object date { private[core] def javaDateToDate(javaDate: java.util.Date): Date = { val cal = Calendar.getInstance() cal.setTime(javaDate) - Date( - cal.get(Calendar.YEAR), - date.tagMonth(cal.get(Calendar.MONTH)), - cal.get(Calendar.DAY_OF_MONTH)) + Date(cal.get(Calendar.YEAR), date.tagMonth(cal.get(Calendar.MONTH)), cal.get(Calendar.DAY_OF_MONTH)) } - } diff --git a/src/main/scala/xyz/driver/core/json.scala b/src/main/scala/xyz/driver/core/json.scala index fee7341..c51e855 100644 --- a/src/main/scala/xyz/driver/core/json.scala +++ b/src/main/scala/xyz/driver/core/json.scala @@ -71,7 +71,7 @@ object json { def write(month: Month) = JsNumber(month) def read(value: JsValue): Month = value match { case JsNumber(month) if 0 <= month && month <= 11 => date.tagMonth(month.toInt) - case _ => throw DeserializationException("Month is a 0-based number") + case _ => throw DeserializationException("Month is a 0-based number") } } -- cgit v1.2.3