Use sqlDateToDate instead of Date.fromJavaDate

2 files changed, 2 insertions, 8 deletions

diff --git a/src/main/scala/xyz/driver/core/database/SlickGetResultSupport.scala b/src/main/scala/xyz/driver/core/database/SlickGetResultSupport.scala
index 345d00e..8293371 100644
--- a/src/main/scala/xyz/driver/core/database/SlickGetResultSupport.scala
+++ b/src/main/scala/xyz/driver/core/database/SlickGetResultSupport.scala
@@ -22,9 +22,9 @@ trait SlickGetResultSupport {
     GetResult(_.nextTimestampOption().map(t => Time(t.getTime)))
 
   implicit val GetDate: GetResult[Date] =
-    GetResult(r => Date.fromJavaDate(r.nextDate()))
+    GetResult(r => sqlDateToDate(r.nextDate()))
   implicit val GetDateOption: GetResult[Option[Date]] =
-    GetResult(_.nextDateOption().map(Date.fromJavaDate))
+    GetResult(_.nextDateOption().map(sqlDateToDate))
 }
 
 object SlickGetResultSupport extends SlickGetResultSupport
diff --git a/src/main/scala/xyz/driver/core/date.scala b/src/main/scala/xyz/driver/core/date.scala
index 1b0ce77..d6f64e4 100644
--- a/src/main/scala/xyz/driver/core/date.scala
+++ b/src/main/scala/xyz/driver/core/date.scala
@@ -86,11 +86,5 @@ object date {
         case _                                         => None
       }
     }
-
-    def fromJavaDate(date: java.util.Date): Date = {
-      val cal = Calendar.getInstance
-      cal.setTime(date)
-      Date(cal.get(Calendar.YEAR), Month(cal.get(Calendar.MONTH)), cal.get(Calendar.DAY_OF_MONTH))
-    }
   }
 }