Commit 4532fa1b authored by Leonardo Menezes's avatar Leonardo Menezes
Browse files

use annotations for DI rather than explicit module

parent 1c42a7f0
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
package controllers.auth

import com.google.inject.Inject
import com.google.inject.{ImplementedBy, Inject, Singleton}
import controllers.auth.basic.BasicAuthService
import controllers.auth.ldap.LDAPAuthService
import play.api.Configuration

@ImplementedBy(classOf[AuthenticationModuleImpl])
trait AuthenticationModule {

  def authentication(username: String, password: String): Option[String]
@@ -13,6 +14,7 @@ trait AuthenticationModule {

}

@Singleton
class AuthenticationModuleImpl @Inject()(config: Configuration) extends AuthenticationModule {

  val service = config.getString("auth.type") match {

app/controllers/auth/Module.scala

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line
package controllers.auth

import com.google.inject.AbstractModule

class Module extends AbstractModule {

  def configure() = {
    bind(classOf[AuthenticationModule]).to(classOf[AuthenticationModuleImpl]).asEagerSingleton()
  }
}
 No newline at end of file
+3 −0
Original line number Diff line number Diff line
package elastic

import com.google.inject.ImplementedBy
import controllers.auth.AuthenticationModuleImpl
import models.ElasticServer
import play.api.libs.json._

import scala.concurrent.Future

@ImplementedBy(classOf[HTTPElasticClient])
trait ElasticClient {

  def main(target: ElasticServer): Future[ElasticResponse]

app/elastic/ElasticModule.scala

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line
package elastic

import com.google.inject.AbstractModule

class ElasticModule extends AbstractModule {

  def configure() = {
    bind(classOf[ElasticClient]).to(classOf[HTTPElasticClient]).asEagerSingleton()
  }

}
+0 −4
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ play.crypto.secret="ki:s:[[@=Ag?QI`W2jMwkY:eqvrJ]JqoJyi2axj3ZvOv^/KavOT4ViJSv?6Y
# ~~~~~
play.i18n.langs=["en"]

play.modules.enabled += "controllers.auth.Module"
play.modules.enabled += "elastic.ElasticModule"


# The application base path
# ~~~~~
#play.http.context="/cerebro/"