From c5f1be05d99059421fdd203f21fd80378ba80b41 Mon Sep 17 00:00:00 2001
From: vlad <vlad@drivergrp.com>
Date: Sat, 16 Jul 2016 23:05:16 -0400
Subject: Bug fixes for config reading, rest and messages

---
 src/main/scala/com/drivergrp/core/config.scala   | 7 ++++++-
 src/main/scala/com/drivergrp/core/messages.scala | 2 +-
 src/main/scala/com/drivergrp/core/rest.scala     | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/com/drivergrp/core/config.scala b/src/main/scala/com/drivergrp/core/config.scala
index bc17d6b..ac4c609 100644
--- a/src/main/scala/com/drivergrp/core/config.scala
+++ b/src/main/scala/com/drivergrp/core/config.scala
@@ -13,7 +13,12 @@ object config {
     scala.sys.props.get("application.config") match {
 
       case Some(filename) =>
-        ConfigFactory.parseFile(new File(filename)).withFallback(configDefaults)
+        val configFile = new File(filename)
+        if(configFile.exists()) {
+          ConfigFactory.parseFile(configFile).withFallback(configDefaults)
+        } else {
+          throw new IllegalStateException(s"No config found at $filename")
+        }
 
       case None => configDefaults
     }
diff --git a/src/main/scala/com/drivergrp/core/messages.scala b/src/main/scala/com/drivergrp/core/messages.scala
index 105d1e3..bcc20d7 100644
--- a/src/main/scala/com/drivergrp/core/messages.scala
+++ b/src/main/scala/com/drivergrp/core/messages.scala
@@ -50,7 +50,7 @@ object messages {
 
       def format(formatString: String, params: Seq[Any]) =
         params.zipWithIndex.foldLeft(formatString) {
-          case (res, (value, index)) => res.replaceAll(s"{$index}", value.toString)
+          case (res, (value, index)) => res.replace(s"{$index}", value.toString)
         }
 
       val template = apply(key)
diff --git a/src/main/scala/com/drivergrp/core/rest.scala b/src/main/scala/com/drivergrp/core/rest.scala
index d8f6e4f..421f5d1 100644
--- a/src/main/scala/com/drivergrp/core/rest.scala
+++ b/src/main/scala/com/drivergrp/core/rest.scala
@@ -76,7 +76,7 @@ object rest {
         catch { case _: IllegalArgumentException ⇒ None }
       }
 
-    def IdFormat[T] = new RootJsonFormat[Id[T]] {
+    implicit def idFormat[T] = new RootJsonFormat[Id[T]] {
       def write(id: Id[T]) = JsNumber(id)
 
       def read(value: JsValue) = value match {
-- 
cgit v1.2.3