Merge pull request #121 from hmrc/PLATOPS-2060

PLATOPS-2060: Refactor
hmrc · Mar 28, 2019 · 8567d36 · 8567d36
2 parents 4e7f611 + 49e4703
commit 8567d36
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/main/play-25/uk/gov/hmrc/play/config/GTMConfig.scala b/src/main/play-25/uk/gov/hmrc/play/config/GTMConfig.scala
@@ -21,12 +21,11 @@ import play.api.Configuration
 
 class GTMConfig @Inject()(configuration: Configuration) {
   val url: Option[String] =
-    configuration.getString("gtm.container") match {
-      case None => None
-      case Some(container @ ("transitional" | "main")) =>
+    configuration.getString("gtm.container").map {
+      case container @ ("transitional" | "main") =>
         configuration
           .getString(s"gtm.$container.url")
-          .orElse(throw new RuntimeException(s"Missing configuration gtm.$container.url"))
+          .getOrElse(throw new RuntimeException(s"Missing configuration gtm.$container.url"))
       case _ => throw new IllegalArgumentException("gtm.container should be one of: { transitional, main }")
     }
 }
diff --git a/src/main/play-26/uk/gov/hmrc/play/config/GTMConfig.scala b/src/main/play-26/uk/gov/hmrc/play/config/GTMConfig.scala
@@ -21,12 +21,11 @@ import play.api.Configuration
 
 class GTMConfig @Inject()(configuration: Configuration) {
   val url: Option[String] =
-    configuration.getString("gtm.container") match {
-      case None => None
-      case Some(container @ ("transitional" | "main")) =>
+    configuration.getString("gtm.container").map {
+      case container @ ("transitional" | "main") =>
         configuration
           .getString(s"gtm.$container.url")
-          .orElse(throw new RuntimeException(s"Missing configuration gtm.$container.url"))
+          .getOrElse(throw new RuntimeException(s"Missing configuration gtm.$container.url"))
       case _ => throw new IllegalArgumentException("gtm.container should be one of: { transitional, main }")
     }
 }