From 87aceccc72a6790d5fc2f842b27c7d9af36cfe95 Mon Sep 17 00:00:00 2001
From: vlad <vlad@drivergrp.com>
Date: Mon, 18 Jul 2016 17:23:03 -0400
Subject: Wart remover brought to core

---
 src/main/scala/com/drivergrp/core/app.scala      | 9 +++++----
 src/main/scala/com/drivergrp/core/core.scala     | 2 +-
 src/main/scala/com/drivergrp/core/messages.scala | 2 +-
 src/main/scala/com/drivergrp/core/rest.scala     | 2 +-
 src/main/scala/com/drivergrp/core/time.scala     | 9 ++++-----
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/main/scala')

diff --git a/src/main/scala/com/drivergrp/core/app.scala b/src/main/scala/com/drivergrp/core/app.scala
index 06d8e02..cae3c6b 100644
--- a/src/main/scala/com/drivergrp/core/app.scala
+++ b/src/main/scala/com/drivergrp/core/app.scala
@@ -44,9 +44,10 @@ object app {
 
     def stop() = {
       http.shutdownAllConnectionPools().onComplete { _ =>
-        actorSystem.terminate()
-        Await.result(actorSystem.whenTerminated, 30.seconds)
-        Console.print(s"${this.getClass.getName} App is stopped")
+        val _ = actorSystem.terminate()
+        val terminated = Await.result(actorSystem.whenTerminated, 30.seconds)
+        val addressTerminated = if(terminated.addressTerminated) "is" else "is not"
+        Console.print(s"${this.getClass.getName} App $addressTerminated stopped ")
       }
     }
 
@@ -66,7 +67,7 @@ object app {
         ))
       }
 
-      http.bindAndHandle(
+      val _ = http.bindAndHandle(
         route2HandlerFlow(logRequestResult("log")(
           modules.map(_.route).foldLeft(versionRoute ~ swaggerRoutes) { _ ~ _ })),
         interface, port)(materializer)
diff --git a/src/main/scala/com/drivergrp/core/core.scala b/src/main/scala/com/drivergrp/core/core.scala
index 51459a7..bd6b698 100644
--- a/src/main/scala/com/drivergrp/core/core.scala
+++ b/src/main/scala/com/drivergrp/core/core.scala
@@ -20,7 +20,7 @@ package object core {
   }
 
 
-  trait Tagged[+V, +Tag]
+  private[core] trait Tagged[+V, +Tag]
   type @@[+V, +Tag] = V with Tagged[V, Tag]
 
   type Id[+Tag] = Long @@ Tag
diff --git a/src/main/scala/com/drivergrp/core/messages.scala b/src/main/scala/com/drivergrp/core/messages.scala
index bcc20d7..894a6ea 100644
--- a/src/main/scala/com/drivergrp/core/messages.scala
+++ b/src/main/scala/com/drivergrp/core/messages.scala
@@ -20,7 +20,7 @@ object messages {
     }
   }
 
-  case class Messages(map: Map[String, String], locale: Locale, log: Logger) {
+  final case class Messages(map: Map[String, String], locale: Locale, log: Logger) {
 
     /**
       * Returns message for the key
diff --git a/src/main/scala/com/drivergrp/core/rest.scala b/src/main/scala/com/drivergrp/core/rest.scala
index 4e8ea3e..0f730ba 100644
--- a/src/main/scala/com/drivergrp/core/rest.scala
+++ b/src/main/scala/com/drivergrp/core/rest.scala
@@ -156,7 +156,7 @@ object rest {
         config.getString("swagger.apiInfo.license"),
         config.getString("swagger.apiInfo.licenseUrl")
       )),
-      vendorExtensions = Map())
+      vendorExtensions = Map.empty[String, AnyRef])
 
     def swaggerUI = get {
       pathPrefix("") {
diff --git a/src/main/scala/com/drivergrp/core/time.scala b/src/main/scala/com/drivergrp/core/time.scala
index 2502a70..074e99d 100644
--- a/src/main/scala/com/drivergrp/core/time.scala
+++ b/src/main/scala/com/drivergrp/core/time.scala
@@ -21,7 +21,7 @@ object time {
   val Weeks = Week
 
 
-  case class Time(millis: Long) extends AnyVal {
+  final case class Time(millis: Long) extends AnyVal {
 
     def isBefore(anotherTime: Time): Boolean = millis < anotherTime.millis
 
@@ -30,17 +30,16 @@ object time {
     def advanceBy(duration: Duration): Time = Time(millis + duration.length)
   }
 
-  case class TimeRange(start: Time, end: Time)
+  final case class TimeRange(start: Time, end: Time)
 
   implicit def timeOrdering: Ordering[Time] = Ordering.by(_.millis)
 
 
   def startOfMonth(time: Time) = {
-    make(new GregorianCalendar()) { cal =>
+    Time(make(new GregorianCalendar()) { cal =>
       cal.setTime(new Date(time.millis))
       cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH))
-      Time(cal.getTime.getTime)
-    }
+    }.getTime.getTime)
   }
 
   def textualDate(time: Time): String =
-- 
cgit v1.2.3