simplify configuration

common/app/app/FrontendApplicationLoader.scala

@@ -1,6 +1,6 @@
 package app
 
-import common.{ApplicationMetrics, AkkaAsync, JobScheduler, LifecycleComponent}
+import common._
 import model.ApplicationIdentity
 import play.api.ApplicationLoader.Context
 import play.api._
@@ -46,6 +46,7 @@ trait FrontendComponents
   lazy val jobScheduler = new JobScheduler(environment)
   lazy val akkaAsync = new AkkaAsync(environment, actorSystem)
   lazy val appMetrics = ApplicationMetrics()
+  lazy val guardianConf = new GuardianConfiguration
 
   // this is a workaround to make wsapi and the actorsystem available to the injector.
   // I'm forced to do that as we still use Ws.url and Akka.system(app) *everywhere*, and both directly get the reference from the injector

common/app/common/configuration.scala

@@ -10,18 +10,18 @@ import conf.switches.Switches
 import conf.{Configuration, Static}
 import org.apache.commons.io.IOUtils
 import play.api.Play
-import play.api.Play.current
 
 import scala.util.Try
 
 class BadConfigurationException(msg: String) extends RuntimeException(msg)
 
-class GuardianConfiguration(val application: String, val webappConfDirectory: String = "env") extends Logging {
+class GuardianConfiguration extends Logging {
+  implicit private lazy val app = Play.current
 
   case class OAuthCredentials(oauthClientId: String, oauthSecret: String, oauthCallback: String)
   case class OAuthCredentialsWithMultipleCallbacks(oauthClientId: String, oauthSecret: String, authorizedOauthCallbacks: List[String])
 
-  protected val configuration = ConfigurationFactory.getNonLoggingConfiguration(application, webappConfDirectory)
+  protected val configuration = ConfigurationFactory.getNonLoggingConfiguration("frontend", "env")
 
   private implicit class OptionalString2MandatoryString(conf: com.gu.conf.Configuration) {
     def getMandatoryStringProperty(property: String) = configuration.getStringProperty(property)

common/app/conf/application.scala

@@ -1,4 +1,4 @@
 package conf
 
-object Configuration extends common.GuardianConfiguration("frontend", webappConfDirectory = "env")
+object Configuration extends common.GuardianConfiguration
 object Static extends common.Assets.Assets(Configuration.assets.path, "assets/assets.map")

identity/app/conf/IdentityConfiguration.scala

@@ -5,7 +5,7 @@ import com.gu.email.exacttarget.ExactTargetFactory
 import java.net.URI
 import utils.SafeLogging
 
-class IdentityConfiguration extends GuardianConfiguration("frontend", webappConfDirectory = "env") with SafeLogging {
+class IdentityConfiguration extends GuardianConfiguration with SafeLogging {
 
   object exacttarget {
     lazy val factory = for {