API-1888 - Load file from resource

hmrc · Sep 9, 2016 · 4452e8d · 4452e8d
1 parent 7645e92
commit 4452e8d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/services/CountryService.scala b/app/uk/gov/hmrc/openidconnect/userinfo/services/CountryService.scala
@@ -16,7 +16,7 @@
 
 package uk.gov.hmrc.openidconnect.userinfo.services
 
-import scala.io.Source.fromFile
+import scala.io.Source
 
 trait CountryService {
 
@@ -26,5 +26,13 @@ trait CountryService {
 }
 
 object CountryService extends CountryService {
-  override val countries = fromFile("conf/country.properties").getLines().map(_.split("=")).map(t => (t(0), t(1))).toMap
+  override val countries = loadCountriesFromFile("/resources/country.properties")
+
+  private def loadCountriesFromFile(file: String) = {
+    val is = getClass.getResourceAsStream(file)
+    try {
+      val lines = Source.fromInputStream(is).getLines().toSeq
+      lines.map(_.split("=")).map(t => (t(0), t(1))).toMap
+    } finally is.close()
+  }
 }
diff --git a/conf/country.properties → conf/resources/country.properties b/conf/country.properties → conf/resources/country.properties