Optimize imports

mohiva · Jan 15, 2020 · 2a25d60 · 2a25d60
1 parent 422de4e
commit 2a25d60
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 22 deletions.
diff --git a/app/controllers/ActivateAccountController.scala b/app/controllers/ActivateAccountController.scala
@@ -8,7 +8,7 @@ import com.mohiva.play.silhouette.impl.providers.CredentialsProvider
 import javax.inject.Inject
 import play.api.i18n.Messages
 import play.api.libs.mailer.Email
-import play.api.mvc.{ AnyContent, Request }
+import play.api.mvc.AnyContent
 import utils.route.Calls
 
 import scala.concurrent.{ ExecutionContext, Future }

diff --git a/app/controllers/ApplicationController.scala b/app/controllers/ApplicationController.scala
@@ -1,7 +1,6 @@
 package controllers
 
 import com.mohiva.play.silhouette.api.LogoutEvent
-import com.mohiva.play.silhouette.api.actions._
 import com.mohiva.play.silhouette.impl.providers.GoogleTotpInfo
 import javax.inject.Inject
 import play.api.mvc._

diff --git a/app/controllers/ChangePasswordController.scala b/app/controllers/ChangePasswordController.scala
@@ -1,14 +1,12 @@
 package controllers
 
-import com.mohiva.play.silhouette.api.actions.SecuredRequest
 import com.mohiva.play.silhouette.api.exceptions.ProviderException
 import com.mohiva.play.silhouette.api.util.{ Credentials, PasswordInfo }
 import com.mohiva.play.silhouette.impl.providers.CredentialsProvider
 import forms.ChangePasswordForm
 import javax.inject.Inject
 import play.api.i18n.Messages
-import play.api.mvc._
-import utils.auth.{ DefaultEnv, WithProvider }
+import utils.auth.WithProvider
 
 import scala.concurrent.{ ExecutionContext, Future }
 

diff --git a/app/controllers/ForgotPasswordController.scala b/app/controllers/ForgotPasswordController.scala
@@ -6,7 +6,7 @@ import forms.ForgotPasswordForm
 import javax.inject.Inject
 import play.api.i18n.Messages
 import play.api.libs.mailer.Email
-import play.api.mvc.{ AnyContent, Request }
+import play.api.mvc.AnyContent
 import utils.route.Calls
 
 import scala.concurrent.{ ExecutionContext, Future }

diff --git a/app/controllers/MyRequest.scala b/app/controllers/MyRequest.scala
@@ -7,8 +7,8 @@ import play.api.i18n.MessagesApi
 import play.api.mvc._
 import utils.auth.DefaultEnv
 
-import scala.language.higherKinds
 import scala.concurrent.{ExecutionContext, Future}
+import scala.language.higherKinds
 
 // XXX should be OOTB
 trait SecuredRequestHeader[E <: Env] {

diff --git a/app/controllers/ResetPasswordController.scala b/app/controllers/ResetPasswordController.scala
@@ -7,7 +7,7 @@ import com.mohiva.play.silhouette.impl.providers.CredentialsProvider
 import forms.ResetPasswordForm
 import javax.inject.Inject
 import play.api.i18n.Messages
-import play.api.mvc.{ AnyContent, Request }
+import play.api.mvc.AnyContent
 import utils.route.Calls
 
 import scala.concurrent.{ ExecutionContext, Future }

diff --git a/app/controllers/SignInController.scala b/app/controllers/SignInController.scala
@@ -7,7 +7,7 @@ import com.mohiva.play.silhouette.impl.providers._
 import forms.{ SignInForm, TotpForm }
 import javax.inject.Inject
 import play.api.i18n.Messages
-import play.api.mvc.{ AnyContent, Request }
+import play.api.mvc.AnyContent
 import utils.route.Calls
 
 import scala.concurrent.{ ExecutionContext, Future }

diff --git a/app/controllers/SignUpController.scala b/app/controllers/SignUpController.scala
@@ -9,7 +9,7 @@ import javax.inject.Inject
 import models.User
 import play.api.i18n.Messages
 import play.api.libs.mailer.Email
-import play.api.mvc.{ AnyContent, Request }
+import play.api.mvc.AnyContent
 import utils.route.Calls
 
 import scala.concurrent.{ ExecutionContext, Future }

diff --git a/app/controllers/SilhouetteController.scala b/app/controllers/SilhouetteController.scala
@@ -1,10 +1,10 @@
 package controllers
 
+import com.mohiva.play.silhouette.api._
 import com.mohiva.play.silhouette.api.actions._
 import com.mohiva.play.silhouette.api.repositories.AuthInfoRepository
 import com.mohiva.play.silhouette.api.services.{ AuthenticatorService, AvatarService }
 import com.mohiva.play.silhouette.api.util.{ Clock, PasswordHasherRegistry }
-import com.mohiva.play.silhouette.api._
 import com.mohiva.play.silhouette.impl.providers.{ CredentialsProvider, GoogleTotpProvider, SocialProviderRegistry }
 import javax.inject.Inject
 import models.services.{ AuthTokenService, UserService }

diff --git a/app/controllers/SocialAuthController.scala b/app/controllers/SocialAuthController.scala
@@ -5,7 +5,7 @@ import com.mohiva.play.silhouette.api.exceptions.ProviderException
 import com.mohiva.play.silhouette.impl.providers._
 import javax.inject.Inject
 import play.api.i18n.Messages
-import play.api.mvc.{ AnyContent, Request }
+import play.api.mvc.AnyContent
 import utils.route.Calls
 
 import scala.concurrent.{ ExecutionContext, Future }

diff --git a/app/jobs/AuthTokenCleaner.scala b/app/jobs/AuthTokenCleaner.scala
@@ -1,8 +1,8 @@
 package jobs
 
-import javax.inject.Inject
 import akka.actor._
 import com.mohiva.play.silhouette.api.util.Clock
+import javax.inject.Inject
 import jobs.AuthTokenCleaner.Clean
 import models.services.AuthTokenService
 import play.api.Logging

diff --git a/app/models/services/AuthTokenServiceImpl.scala b/app/models/services/AuthTokenServiceImpl.scala
@@ -1,15 +1,15 @@
 package models.services
 
 import java.util.UUID
-import javax.inject.Inject
 
 import com.mohiva.play.silhouette.api.util.Clock
+import javax.inject.Inject
 import models.AuthToken
 import models.daos.AuthTokenDAO
 import org.joda.time.DateTimeZone
 
-import scala.concurrent.{ ExecutionContext, Future }
 import scala.concurrent.duration._
+import scala.concurrent.{ ExecutionContext, Future }
 import scala.language.postfixOps
 
 /**

diff --git a/app/models/services/UserServiceImpl.scala b/app/models/services/UserServiceImpl.scala
@@ -1,10 +1,10 @@
 package models.services
 
 import java.util.UUID
-import javax.inject.Inject
 
 import com.mohiva.play.silhouette.api.LoginInfo
 import com.mohiva.play.silhouette.impl.providers.CommonSocialProfile
+import javax.inject.Inject
 import models.User
 import models.daos.UserDAO
 

diff --git a/app/utils/auth/CustomSecuredErrorHandler.scala b/app/utils/auth/CustomSecuredErrorHandler.scala
@@ -1,9 +1,9 @@
 package utils.auth
 
-import javax.inject.Inject
 import com.mohiva.play.silhouette.api.actions.SecuredErrorHandler
+import javax.inject.Inject
 import play.api.i18n.{ I18nSupport, Messages, MessagesApi }
-import play.api.mvc.{ Call, RequestHeader }
+import play.api.mvc.RequestHeader
 import play.api.mvc.Results._
 import utils.route.Calls
 

diff --git a/app/utils/auth/WithProvider.scala b/app/utils/auth/WithProvider.scala
@@ -1,6 +1,6 @@
 package utils.auth
 
-import com.mohiva.play.silhouette.api.{ Authenticator, Authorization }
+import com.mohiva.play.silhouette.api.Authorization
 import models.User
 import play.api.mvc.Request
 

diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,4 @@
 import com.typesafe.sbt.SbtScalariform._
-
 import scalariform.formatter.preferences._
 
 name := "play-silhouette-seed"

diff --git a/test/controllers/ApplicationControllerSpec.scala b/test/controllers/ApplicationControllerSpec.scala
@@ -3,15 +3,15 @@ package controllers
 import java.util.UUID
 
 import com.google.inject.AbstractModule
-import com.mohiva.play.silhouette.api.{ Environment, LoginInfo }
+import com.mohiva.play.silhouette.api.{Environment, LoginInfo}
 import com.mohiva.play.silhouette.test._
 import models.User
 import net.codingwell.scalaguice.ScalaModule
 import org.specs2.mock.Mockito
 import org.specs2.specification.Scope
 import play.api.inject.guice.GuiceApplicationBuilder
 import play.api.test.CSRFTokenHelper._
-import play.api.test.{ FakeRequest, PlaySpecification, WithApplication }
+import play.api.test.{FakeRequest, PlaySpecification, WithApplication}
 import utils.auth.DefaultEnv
 
 import scala.concurrent.ExecutionContext.Implicits.global