Merge branch 'master' into hadoop

nsutcliffe · Mar 15, 2018 · bb0f3fd · bb0f3fd
2 parents 499c562 + b1d0157
commit bb0f3fd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/modules/http4s/src/main/scala/pureconfig/modules/http4s/package.scala b/modules/http4s/src/main/scala/pureconfig/modules/http4s/package.scala
@@ -2,9 +2,13 @@ package pureconfig.modules
 
 import org.http4s.Uri
 import pureconfig.ConfigReader
+import pureconfig.error.CannotConvert
 
 package object http4s {
 
   implicit val uriReader: ConfigReader[Uri] =
-    ConfigReader[String].map(str => Uri(path = str))
+    ConfigReader.fromString(str =>
+      Uri.fromString(str).fold(
+        err => Left(CannotConvert(str, "Uri", err.sanitized)),
+        uri => Right(uri)))
 }
diff --git a/modules/http4s/src/test/scala/pureconfig/modules/http4s/Http4sTest.scala b/modules/http4s/src/test/scala/pureconfig/modules/http4s/Http4sTest.scala
@@ -1,9 +1,10 @@
 package pureconfig.modules.http4s
 
-import pureconfig.syntax._
 import com.typesafe.config.ConfigFactory
 import org.http4s.Uri
 import pureconfig.BaseSuite
+import pureconfig.error.{ CannotConvert, ConfigReaderFailures, ConvertFailure }
+import pureconfig.syntax._
 
 class Http4sTest extends BaseSuite {
 
@@ -12,6 +13,14 @@ class Http4sTest extends BaseSuite {
   "reading the uri config" should "parse the uri" in {
     val conf = ConfigFactory.parseString(s"""{uri:"http://http4s.org/"}""")
 
-    conf.to[ServerConfig].right.value shouldEqual ServerConfig(Uri(path = "http://http4s.org/"))
+    conf.to[ServerConfig].right.value shouldEqual ServerConfig(Uri.unsafeFromString("http://http4s.org/"))
+  }
+
+  "reading the uri config" should "get a CannotConvert error" in {
+    val conf = ConfigFactory.parseString(s"""{uri:"\\\\"}""")
+
+    val errors = ConfigReaderFailures(ConvertFailure(CannotConvert("\\", "Uri", "Invalid URI"), None, "uri"))
+
+    conf.to[ServerConfig].left.value shouldEqual errors
   }
 }