Moving utils package to prevent IntelliJ conflict.

kyleu · Jul 16, 2017 · 9308cb2 · 9308cb2
1 parent 7528990
commit 9308cb2
Show file tree

Hide file tree

Showing 292 changed files with 432 additions and 432 deletions.
diff --git a/app/DatabaseFlow.scala b/app/DatabaseFlow.scala
@@ -1,7 +1,7 @@
 import models.ui.TopFrame
 import play.api._
 import play.core.server.{ProdServerStart, RealServerProcess, ServerConfig, ServerProvider}
-import utils.Logging
+import util.Logging
 
 import scala.util.control.NonFatal
 

diff --git a/app/controllers/BaseController.scala b/app/controllers/BaseController.scala
@@ -3,11 +3,11 @@ package controllers
 import com.mohiva.play.silhouette.api.actions.{SecuredRequest, UserAwareRequest}
 import models.auth.AuthEnv
 import play.api.i18n.I18nSupport
-import utils.FutureUtils.defaultContext
+import util.FutureUtils.defaultContext
 import play.api.mvc._
 import services.user.UserService
-import utils.metrics.Instrumented
-import utils.{ApplicationContext, Logging}
+import util.metrics.Instrumented
+import util.{ApplicationContext, Logging}
 
 import scala.concurrent.Future
 
@@ -49,7 +49,7 @@ abstract class BaseController() extends InjectedController with I18nSupport with
               case _ => Redirect(controllers.auth.routes.AuthenticationController.signInForm())
             }
             Future.successful(result.flashing(
-              "error" -> messagesApi("error.must.sign.in", utils.Config.projectName)(request.lang)
+              "error" -> messagesApi("error.must.sign.in", util.Config.projectName)(request.lang)
             )).map(r => if (!request.uri.contains("signin")) {
               r.withSession(r.session + ("returnUrl" -> request.uri))
             } else {

diff --git a/app/controllers/HomeController.scala b/app/controllers/HomeController.scala
@@ -1,7 +1,7 @@
 package controllers
 
 import services.connection.ConnectionSettingsService
-import utils.ApplicationContext
+import util.ApplicationContext
 
 import scala.concurrent.Future
 

diff --git a/app/controllers/MessagesController.scala b/app/controllers/MessagesController.scala
@@ -4,7 +4,7 @@ import java.net.URL
 
 import models.user.Language
 import play.api.i18n.Messages
-import utils.ApplicationContext
+import util.ApplicationContext
 
 import scala.concurrent.Future
 

diff --git a/app/controllers/admin/ActivityController.scala b/app/controllers/admin/ActivityController.scala
@@ -5,7 +5,7 @@ import java.util.UUID
 import controllers.BaseController
 import services.audit.AuditRecordService
 import services.user.UserSearchService
-import utils.ApplicationContext
+import util.ApplicationContext
 
 import scala.concurrent.Future
 

diff --git a/app/controllers/admin/AdminController.scala b/app/controllers/admin/AdminController.scala
@@ -1,7 +1,7 @@
 package controllers.admin
 
 import controllers.BaseController
-import utils.ApplicationContext
+import util.ApplicationContext
 
 import scala.concurrent.Future
 

diff --git a/app/controllers/admin/MetricsController.scala b/app/controllers/admin/MetricsController.scala
@@ -1,8 +1,8 @@
 package controllers.admin
 
 import controllers.BaseController
-import utils.ApplicationContext
-import utils.FutureUtils.defaultContext
+import util.ApplicationContext
+import util.FutureUtils.defaultContext
 
 @javax.inject.Singleton
 class MetricsController @javax.inject.Inject() (override val ctx: ApplicationContext) extends BaseController {

diff --git a/app/controllers/admin/ResultCacheController.scala b/app/controllers/admin/ResultCacheController.scala
@@ -7,7 +7,7 @@ import models.ddl.DdlQueries
 import services.database.core.ResultCacheDatabase
 import services.result.CachedResultService
 import services.user.UserSearchService
-import utils.ApplicationContext
+import util.ApplicationContext
 
 import scala.concurrent.Future
 

diff --git a/app/controllers/admin/SandboxController.scala b/app/controllers/admin/SandboxController.scala
@@ -6,8 +6,8 @@ import models.sandbox.SandboxTask
 import services.connection.ConnectionSettingsService
 import services.scalaexport.ScalaExportService
 import services.schema.SchemaService
-import utils.FutureUtils.defaultContext
-import utils.ApplicationContext
+import util.FutureUtils.defaultContext
+import util.ApplicationContext
 
 import scala.concurrent.Future
 import scala.concurrent.duration._

diff --git a/app/controllers/admin/SettingsController.scala b/app/controllers/admin/SettingsController.scala
@@ -3,8 +3,8 @@ package controllers.admin
 import controllers.BaseController
 import models.settings.SettingKey
 import services.settings.SettingsService
-import utils.ApplicationContext
-import utils.web.FormUtils
+import util.ApplicationContext
+import util.web.FormUtils
 
 import scala.concurrent.Future
 

diff --git a/app/controllers/admin/UserCreateController.scala b/app/controllers/admin/UserCreateController.scala
@@ -8,10 +8,10 @@ import com.mohiva.play.silhouette.api.{LoginInfo, SignUpEvent}
 import com.mohiva.play.silhouette.impl.providers.CredentialsProvider
 import controllers.BaseController
 import models.user.{Role, User, UserPreferences}
-import utils.FutureUtils.defaultContext
+import util.FutureUtils.defaultContext
 import services.user.UserService
-import utils.ApplicationContext
-import utils.web.FormUtils
+import util.ApplicationContext
+import util.web.FormUtils
 
 import scala.concurrent.Future
 

diff --git a/app/controllers/admin/UserEditController.scala b/app/controllers/admin/UserEditController.scala
@@ -5,8 +5,8 @@ import java.util.UUID
 import controllers.BaseController
 import models.user.Role
 import services.user.{UserSearchService, UserService}
-import utils.ApplicationContext
-import utils.web.FormUtils
+import util.ApplicationContext
+import util.web.FormUtils
 
 import scala.concurrent.Future
 

diff --git a/app/controllers/auth/AuthenticationController.scala b/app/controllers/auth/AuthenticationController.scala
@@ -8,11 +8,11 @@ import controllers.BaseController
 import models.audit.AuditType
 import models.user.{Role, UserForms}
 import play.api.i18n.{Lang, Messages}
-import utils.FutureUtils.defaultContext
+import util.FutureUtils.defaultContext
 import services.audit.AuditRecordService
 import services.settings.SettingsService
 import services.user.UserSearchService
-import utils.ApplicationContext
+import util.ApplicationContext
 
 import scala.concurrent.Future
 

diff --git a/app/controllers/auth/RegistrationController.scala b/app/controllers/auth/RegistrationController.scala
@@ -11,11 +11,11 @@ import models.queries.auth.UserQueries
 import models.settings.SettingKey
 import models.user._
 import play.api.i18n.Messages
-import utils.FutureUtils.defaultContext
+import util.FutureUtils.defaultContext
 import services.database.core.MasterDatabase
 import services.settings.SettingsService
 import services.user.{UserSearchService, UserService}
-import utils.ApplicationContext
+import util.ApplicationContext
 
 import scala.concurrent.Future
 

diff --git a/app/controllers/connection/ConnectionSettingsController.scala b/app/controllers/connection/ConnectionSettingsController.scala
@@ -13,7 +13,7 @@ import services.connection.ConnectionSettingsService
 import services.database.{DatabaseRegistry, SampleDatabaseService}
 import services.schema.SchemaService
 import services.settings.SettingsService
-import utils.{ApplicationContext, PasswordEncryptUtils}
+import util.{ApplicationContext, PasswordEncryptUtils}
 
 import scala.concurrent.Future
 

diff --git a/app/controllers/connection/ConnectionTestController.scala b/app/controllers/connection/ConnectionTestController.scala
@@ -8,7 +8,7 @@ import models.engine.DatabaseEngine
 import models.forms.ConnectionForm
 import services.connection.ConnectionSettingsService
 import services.database.DatabaseRegistry
-import utils.{ApplicationContext, PasswordEncryptUtils, SlugUtils}
+import util.{ApplicationContext, PasswordEncryptUtils, SlugUtils}
 
 import scala.concurrent.Future
 
@@ -17,7 +17,7 @@ class ConnectionTestController @javax.inject.Inject() (override val ctx: Applica
   def test(connectionId: UUID) = withSession("connection.test") { implicit request =>
     val result = ConnectionForm.form.bindFromRequest.fold(
       formWithErrors => {
-        val errors = utils.web.FormUtils.errorsToString(formWithErrors.errors)
+        val errors = util.web.FormUtils.errorsToString(formWithErrors.errors)
         BadRequest(s"Invalid form: $errors")
       },
       cf => {

diff --git a/app/controllers/graphql/GraphQLController.scala b/app/controllers/graphql/GraphQLController.scala
@@ -7,14 +7,14 @@ import io.circe.Json
 import io.circe.parser
 import models.user.User
 import play.api.libs.json.JsObject
-import utils.FutureUtils.defaultContext
+import util.FutureUtils.defaultContext
 import sangria.execution.{ErrorWithResolver, QueryAnalysisError}
 import sangria.marshalling.circe._
 import sangria.marshalling.MarshallingUtil._
 import sangria.parser.SyntaxError
 import services.connection.ConnectionSettingsService
 import services.graphql.GraphQLService
-import utils.ApplicationContext
+import util.ApplicationContext
 
 import scala.concurrent.Future
 

diff --git a/app/controllers/graphql/SchemaController.scala b/app/controllers/graphql/SchemaController.scala
@@ -5,8 +5,8 @@ import models.SchemaResponse
 import services.connection.ConnectionSettingsService
 import services.graphql.GraphQLService
 import services.schema.SchemaService
-import utils.FutureUtils.defaultContext
-import utils.{ApplicationContext, JsonSerializers}
+import util.FutureUtils.defaultContext
+import util.{ApplicationContext, JsonSerializers}
 
 import scala.concurrent.Future
 

diff --git a/app/controllers/query/ExportController.scala b/app/controllers/query/ExportController.scala
@@ -13,8 +13,8 @@ import services.database.DatabaseRegistry
 import services.database.core.ResultCacheDatabase
 import services.query.SharedResultService
 import upickle.default._
-import utils.web.FormUtils
-import utils.{ApplicationContext, DateUtils}
+import util.web.FormUtils
+import util.{ApplicationContext, DateUtils}
 
 import scala.concurrent.Future
 import scala.util.control.NonFatal
@@ -60,7 +60,7 @@ class ExportController @javax.inject.Inject() (override val ctx: ApplicationCont
     }
 
     val ts = DateUtils.now.toString("yyyy-MM-dd")
-    val finalName = s"${utils.Config.projectId}-export-$ts.$format"
+    val finalName = s"${util.Config.projectId}-export-$ts.$format"
 
     val os = new ByteArrayOutputStream()
     val (sql, values: Seq[Any]) = EngineQueries.selectFrom(source.name, Nil, source.asRowDataOptions(None))(db.engine)

diff --git a/app/controllers/query/QueryController.scala b/app/controllers/query/QueryController.scala
@@ -7,13 +7,13 @@ import akka.stream.Materializer
 import com.mohiva.play.silhouette.api.HandlerResult
 import controllers.BaseController
 import models.{RequestMessage, ResponseMessage}
-import utils.FutureUtils.defaultContext
+import util.FutureUtils.defaultContext
 import play.api.libs.streams.ActorFlow
 import play.api.mvc._
 import services.connection.ConnectionSettingsService
 import services.socket.SocketService
-import utils.ApplicationContext
-import utils.web.MessageFrameFormatter
+import util.ApplicationContext
+import util.web.MessageFrameFormatter
 
 import scala.concurrent.Future
 

diff --git a/app/controllers/query/SharedResultController.scala b/app/controllers/query/SharedResultController.scala
@@ -7,8 +7,8 @@ import models.query.RowDataOptions
 import models.user.Permission
 import services.query.SharedResultService
 import services.user.UserService
-import utils.ApplicationContext
-import utils.web.FormUtils
+import util.ApplicationContext
+import util.web.FormUtils
 
 import scala.concurrent.Future
 

diff --git a/app/controllers/user/ProfileController.scala b/app/controllers/user/ProfileController.scala
@@ -7,10 +7,10 @@ import com.mohiva.play.silhouette.impl.providers.CredentialsProvider
 import controllers.BaseController
 import models.user.UserForms
 import play.api.i18n.Lang
-import utils.FutureUtils.defaultContext
+import util.FutureUtils.defaultContext
 import services.user.UserService
-import utils.ApplicationContext
-import utils.web.FormUtils
+import util.ApplicationContext
+import util.web.FormUtils
 
 import scala.concurrent.Future
 

diff --git a/app/controllers/user/UserActivityController.scala b/app/controllers/user/UserActivityController.scala
@@ -6,7 +6,7 @@ import controllers.BaseController
 import models.settings.SettingKey
 import services.audit.AuditRecordService
 import services.settings.SettingsService
-import utils.ApplicationContext
+import util.ApplicationContext
 
 import scala.concurrent.Future
 

diff --git a/app/models/auth/AuthModule.scala b/app/models/auth/AuthModule.scala
@@ -13,11 +13,11 @@ import com.mohiva.play.silhouette.impl.util.{DefaultFingerprintGenerator, Secure
 import com.mohiva.play.silhouette.password.BCryptPasswordHasher
 import com.mohiva.play.silhouette.persistence.repositories.DelegableAuthInfoRepository
 import net.codingwell.scalaguice.ScalaModule
-import utils.FutureUtils.defaultContext
+import util.FutureUtils.defaultContext
 import play.api.libs.ws.WSClient
 import play.api.mvc.DefaultCookieHeaderEncoding
 import services.user.{PasswordInfoService, UserSearchService}
-import utils.Configuration
+import util.Configuration
 
 object AuthModule {
   val encKey = "dead60d84c1a41648ae258b57e8b5727"

diff --git a/app/models/connection/ConnectionGraphQL.scala b/app/models/connection/ConnectionGraphQL.scala
@@ -8,7 +8,7 @@ import models.user.Permission
 import sangria.schema._
 import services.query.{SavedQueryService, SharedResultService, SimpleQueryService}
 import services.schema.SchemaService
-import utils.FutureUtils.defaultContext
+import util.FutureUtils.defaultContext
 import services.explore.ExploreService
 
 object ConnectionGraphQL {

diff --git a/app/models/database/Conversions.scala b/app/models/database/Conversions.scala
@@ -3,7 +3,7 @@ package models.database
 import java.sql.Timestamp
 
 import org.joda.time.{LocalDateTime, LocalDate, DateTime, ReadableInstant}
-import utils.DateUtils
+import util.DateUtils
 
 object Conversions {
   @SuppressWarnings(Array("MethodReturningAny"))

diff --git a/app/models/database/Queryable.scala b/app/models/database/Queryable.scala
@@ -4,7 +4,7 @@ import java.sql.{Connection, PreparedStatement, Types}
 import java.util.UUID
 
 import services.query.QueryExecutionService
-import utils.{Logging, NullUtils}
+import util.{Logging, NullUtils}
 
 import scala.annotation.tailrec
 

diff --git a/app/models/forms/ConnectionForm.scala b/app/models/forms/ConnectionForm.scala
@@ -5,7 +5,7 @@ import models.engine.DatabaseEngine
 import models.user.Permission
 import play.api.data.Form
 import play.api.data.Forms._
-import utils.SlugUtils
+import util.SlugUtils
 
 object ConnectionForm {
   val form = Form(

diff --git a/app/models/graphql/ForeignKeyGraphQL.scala b/app/models/graphql/ForeignKeyGraphQL.scala
@@ -5,7 +5,7 @@ import models.result.QueryResultRow
 import models.schema.{ColumnType, FilterOp, ForeignKey, Table}
 import sangria.schema.{Context, Field, ObjectType, OptionType, Projector}
 import services.query.QueryResultRowService
-import utils.FutureUtils.defaultContext
+import util.FutureUtils.defaultContext
 
 object ForeignKeyGraphQL {
   def getForeignKeyField(schema: models.schema.Schema, src: Table, tgt: ObjectType[GraphQLContext, QueryResultRow], notNull: Boolean, fk: ForeignKey) = {

diff --git a/app/models/graphql/GraphQLContext.scala b/app/models/graphql/GraphQLContext.scala
@@ -1,6 +1,6 @@
 package models.graphql
 
 import models.user.User
-import utils.ApplicationContext
+import util.ApplicationContext
 
 case class GraphQLContext(app: ApplicationContext, user: User)
diff --git a/app/models/parse/StatementParser.scala b/app/models/parse/StatementParser.scala
@@ -1,7 +1,7 @@
 package models.parse
 
 import fastparse.all._
-import utils.Logging
+import util.Logging
 
 object StatementParser extends Logging {
   def sourceFor(sql: String) = singleTable(sql) match {

diff --git a/app/models/queries/BaseQueries.scala b/app/models/queries/BaseQueries.scala
@@ -1,7 +1,7 @@
 package models.queries
 
 import models.database.{FlatSingleRowQuery, Query, Row, Statement}
-import utils.{Config, JdbcUtils}
+import util.{Config, JdbcUtils}
 
 trait BaseQueries[T] {
   protected def tableName: String = "_invalid_"

diff --git a/app/models/queries/QueryTranslations.scala b/app/models/queries/QueryTranslations.scala
@@ -3,7 +3,7 @@ package models.queries
 import java.sql.Types._
 
 import models.schema.ColumnType._
-import utils.Logging
+import util.Logging
 
 object QueryTranslations extends Logging {
   def forType(i: Int, n: String) = i match {

diff --git a/app/models/queries/audit/AuditRecordQueries.scala b/app/models/queries/audit/AuditRecordQueries.scala
@@ -6,7 +6,7 @@ import java.util.UUID
 import models.audit.{AuditRecord, AuditStatus, AuditType}
 import models.database.{Query, Row, Statement}
 import models.queries.BaseQueries
-import utils.JdbcUtils
+import util.JdbcUtils
 
 object AuditRecordQueries extends BaseQueries[AuditRecord] {
   override protected val tableName = "audit_records"