Permalink
Browse files

Remove unused imports.

This diff was automatically generated by a work-in-progress scalafix
rewrite, with no manual edits.
  • Loading branch information...
olafurpg committed May 27, 2017
1 parent 3e7b771 commit 65a59491fdf238bb0af581fefd80447bfd2540f9
Showing with 48 additions and 161 deletions.
  1. +0 −1 slick-codegen/src/main/scala/slick/codegen/OutputHelpers.scala
  2. +0 −1 slick-codegen/src/main/scala/slick/codegen/SourceCodeGenerator.scala
  3. +0 −4 slick-hikaricp/src/main/scala/slick/jdbc/hikaricp/HikariCPJdbcDataSource.scala
  4. +0 −3 slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/ActionTest.scala
  5. +1 −3 slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/ForUpdateTest.scala
  6. +0 −2 slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/JdbcMapperTest.scala
  7. +1 −3 slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/JdbcMetaTest.scala
  8. +0 −1 slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/JdbcTypeTest.scala
  9. +0 −1 slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/JoinTest.scala
  10. +1 −3 slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/ModelBuilderTest.scala
  11. +0 −1 slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/MutateTest.scala
  12. +0 −2 slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/PlainSQLTest.scala
  13. +1 −1 slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/RelationalMiscTest.scala
  14. +2 −2 slick-testkit/src/main/scala/com/typesafe/slick/testkit/util/BuildCapabilitiesTable.scala
  15. +0 −1 slick-testkit/src/main/scala/com/typesafe/slick/testkit/util/ShouldNotTypecheck.scala
  16. +0 −2 slick-testkit/src/main/scala/com/typesafe/slick/testkit/util/StandardTestDBs.scala
  17. +1 −4 slick-testkit/src/main/scala/com/typesafe/slick/testkit/util/TestDB.scala
  18. +4 −4 slick-testkit/src/main/scala/com/typesafe/slick/testkit/util/Testkit.scala
  19. +1 −2 slick-testkit/src/main/scala/com/typesafe/slick/testkit/util/TestkitConfig.scala
  20. +0 −1 slick-testkit/src/test/scala/slick/test/codegen/CodeGenRoundTripTest.scala
  21. +1 −2 slick-testkit/src/test/scala/slick/test/codegen/GeneratedCodeTest.scala
  22. +1 −1 slick-testkit/src/test/scala/slick/test/compile/NestedShapesTest.scala
  23. +0 −2 slick-testkit/src/test/scala/slick/test/jdbc/DataSourceTest.scala
  24. +0 −1 slick-testkit/src/test/scala/slick/test/jdbc/ModelBuilderTest.scala
  25. +1 −1 slick-testkit/src/test/scala/slick/test/jdbc/hikaricp/SlickDeadlockTest.scala
  26. +0 −1 slick-testkit/src/test/scala/slick/test/memory/DistributedQueryingTest.scala
  27. +0 −1 slick-testkit/src/test/scala/slick/test/model/ModelTest.scala
  28. +0 −1 slick/src/main/scala/slick/ast/ClientSideOp.scala
  29. +1 −2 slick/src/main/scala/slick/ast/Node.scala
  30. +0 −1 slick/src/main/scala/slick/ast/Symbol.scala
  31. +0 −2 slick/src/main/scala/slick/ast/Type.scala
  32. +0 −4 slick/src/main/scala/slick/ast/Util.scala
  33. +2 −4 slick/src/main/scala/slick/basic/BasicBackend.scala
  34. +1 −2 slick/src/main/scala/slick/basic/BasicProfile.scala
  35. +1 −3 slick/src/main/scala/slick/compiler/AssignUniqueSymbols.scala
  36. +1 −1 slick/src/main/scala/slick/compiler/CreateAggregates.scala
  37. +0 −1 slick/src/main/scala/slick/compiler/CreateResultSetMapping.scala
  38. +0 −1 slick/src/main/scala/slick/compiler/FixRowNumberOrdering.scala
  39. +0 −1 slick/src/main/scala/slick/compiler/FlattenProjections.scala
  40. +1 −1 slick/src/main/scala/slick/compiler/HoistClientOps.scala
  41. +0 −4 slick/src/main/scala/slick/compiler/InferTypes.scala
  42. +0 −1 slick/src/main/scala/slick/compiler/InsertCompiler.scala
  43. +2 −2 slick/src/main/scala/slick/compiler/MergeToComprehensions.scala
  44. +0 −1 slick/src/main/scala/slick/compiler/OptimizeScalar.scala
  45. +0 −1 slick/src/main/scala/slick/compiler/ResolveZipJoins.scala
  46. +0 −1 slick/src/main/scala/slick/compiler/RewriteBooleans.scala
  47. +0 −1 slick/src/main/scala/slick/compiler/RewriteDistinct.scala
  48. +0 −1 slick/src/main/scala/slick/compiler/RewriteJoins.scala
  49. +0 −1 slick/src/main/scala/slick/compiler/SpecializeParameters.scala
  50. +0 −1 slick/src/main/scala/slick/dbio/DBIOAction.scala
  51. +1 −2 slick/src/main/scala/slick/jdbc/DB2Profile.scala
  52. +1 −2 slick/src/main/scala/slick/jdbc/DerbyProfile.scala
  53. +0 −1 slick/src/main/scala/slick/jdbc/H2Profile.scala
  54. +1 −3 slick/src/main/scala/slick/jdbc/HsqldbProfile.scala
  55. +0 −1 slick/src/main/scala/slick/jdbc/Invoker.scala
  56. +1 −3 slick/src/main/scala/slick/jdbc/JdbcActionComponent.scala
  57. +0 −1 slick/src/main/scala/slick/jdbc/JdbcBackend.scala
  58. +0 −1 slick/src/main/scala/slick/jdbc/JdbcDataSource.scala
  59. +1 −1 slick/src/main/scala/slick/jdbc/JdbcInvokerComponent.scala
  60. +0 −2 slick/src/main/scala/slick/jdbc/JdbcMappingCompilerComponent.scala
  61. +1 −2 slick/src/main/scala/slick/jdbc/JdbcModelBuilder.scala
  62. +1 −1 slick/src/main/scala/slick/jdbc/JdbcModelComponent.scala
  63. +1 −1 slick/src/main/scala/slick/jdbc/JdbcProfile.scala
  64. +0 −2 slick/src/main/scala/slick/jdbc/JdbcResultConverter.scala
  65. +2 −3 slick/src/main/scala/slick/jdbc/JdbcStatementBuilderComponent.scala
  66. +0 −1 slick/src/main/scala/slick/jdbc/MacroTreeBuilder.scala
  67. +0 −2 slick/src/main/scala/slick/jdbc/MySQLProfile.scala
  68. +2 −4 slick/src/main/scala/slick/jdbc/OracleProfile.scala
  69. +0 −3 slick/src/main/scala/slick/jdbc/PostgresProfile.scala
  70. +1 −1 slick/src/main/scala/slick/jdbc/ResultSetInvoker.scala
  71. +0 −1 slick/src/main/scala/slick/jdbc/SQLServerProfile.scala
  72. +0 −4 slick/src/main/scala/slick/jdbc/SQLiteProfile.scala
  73. +0 −1 slick/src/main/scala/slick/jdbc/StatementInvoker.scala
  74. +1 −4 slick/src/main/scala/slick/jdbc/StaticQuery.scala
  75. +1 −1 slick/src/main/scala/slick/jdbc/TransactionIsolation.scala
  76. +1 −1 slick/src/main/scala/slick/jdbc/meta/MForeignKey.scala
  77. +1 −1 slick/src/main/scala/slick/jdbc/meta/MPrimaryKey.scala
  78. +1 −1 slick/src/main/scala/slick/jdbc/meta/MTable.scala
  79. +0 −1 slick/src/main/scala/slick/lifted/Case.scala
  80. +1 −2 slick/src/main/scala/slick/lifted/Compiled.scala
  81. +1 −1 slick/src/main/scala/slick/lifted/OptionMapper.scala
  82. +1 −2 slick/src/main/scala/slick/lifted/Shape.scala
  83. +0 −1 slick/src/main/scala/slick/memory/DistributedBackend.scala
  84. +0 −2 slick/src/main/scala/slick/memory/DistributedProfile.scala
  85. +0 −1 slick/src/main/scala/slick/memory/HeapBackend.scala
  86. +1 −2 slick/src/main/scala/slick/memory/MemoryProfile.scala
  87. +0 −3 slick/src/main/scala/slick/memory/MemoryQueryingProfile.scala
  88. +1 −1 slick/src/main/scala/slick/relational/RelationalProfile.scala
  89. +0 −3 slick/src/main/scala/slick/relational/ResultConverter.scala
  90. +1 −2 slick/src/main/scala/slick/sql/SqlProfile.scala
@@ -2,7 +2,6 @@ package slick.codegen
import java.io.File
import java.io.BufferedWriter
import java.io.FileWriter
import slick.SlickException
/** Output-related code-generation utilities. */
trait OutputHelpers{
@@ -4,7 +4,6 @@ import java.net.URI
import scala.concurrent.{ExecutionContext, Await}
import scala.concurrent.duration.Duration
import scala.util.Try
import slick.basic.DatabaseConfig
import slick.{model => m}
@@ -1,14 +1,10 @@
package slick.jdbc.hikaricp
import java.sql.{Connection, Driver}
import java.util.concurrent.atomic.AtomicInteger
import java.util.concurrent.locks.ReentrantLock
import com.typesafe.config.Config
import slick.SlickException
import slick.jdbc.{JdbcDataSource, JdbcDataSourceFactory}
import slick.util.ConfigExtensionMethods._
import slick.util.Logging
/** A JdbcDataSource for a HikariCP connection pool.
* See `slick.jdbc.JdbcBackend#Database.forConfig` for documentation on the config parameters. */
@@ -1,10 +1,7 @@
package com.typesafe.slick.testkit.tests
import com.typesafe.slick.testkit.util.{AsyncTest, RelationalTestDB, StandardTestDBs}
import slick.dbio.DBIOAction
import slick.dbio.Effect.Read
import scala.collection.mutable.ArrayBuffer
import scala.concurrent.Future
class ActionTest extends AsyncTest[RelationalTestDB] {
@@ -5,11 +5,9 @@ import java.util.concurrent.{CountDownLatch, LinkedBlockingQueue, TimeUnit, Thre
import com.typesafe.slick.testkit.util.{TestkitConfig, AsyncTest, JdbcTestDB}
import org.junit.Assert
import slick.dbio.DBIOAction
import slick.jdbc.{SQLServerProfile, TransactionIsolation}
import slick.util.Logging
import scala.concurrent.duration.Duration
import scala.concurrent.{Await, ExecutionContext, Future}
import scala.concurrent.Await
import scala.util.Failure
@@ -1,6 +1,5 @@
package com.typesafe.slick.testkit.tests
import org.junit.Assert._
import com.typesafe.slick.testkit.util.{JdbcTestDB, AsyncTest}
import scala.reflect.ClassTag
@@ -78,7 +77,6 @@ class JdbcMapperTest extends AsyncTest[JdbcTestDB] {
def testWideMappedEntity = {
import slick.collection.heterogeneous._
import slick.collection.heterogeneous.syntax._
case class Part(i1: Int, i2: Int, i3: Int, i4: Int, i5: Int, i6: Int)
case class Whole(id: Int, p1: Part, p2: Part, p3: Part, p4: Part)
@@ -1,9 +1,7 @@
package com.typesafe.slick.testkit.tests
import org.junit.{Test, Assert}
import org.junit.Assert._
import slick.jdbc.meta._
import com.typesafe.slick.testkit.util.{TestDB, JdbcTestDB, AsyncTest}
import com.typesafe.slick.testkit.util.{JdbcTestDB, AsyncTest}
class JdbcMetaTest extends AsyncTest[JdbcTestDB] {
import tdb.profile.api._
@@ -5,7 +5,6 @@ import java.io.{ObjectInputStream, ObjectOutputStream, ByteArrayOutputStream}
import java.sql.{Blob, Date, Time, Timestamp}
import java.util.UUID
import javax.sql.rowset.serial.SerialBlob
import org.junit.Assert._
import scala.concurrent.Future
@@ -1,6 +1,5 @@
package com.typesafe.slick.testkit.tests
import org.junit.Assert._
import com.typesafe.slick.testkit.util.{RelationalTestDB, AsyncTest}
class JoinTest extends AsyncTest[RelationalTestDB] {
@@ -4,12 +4,10 @@ import com.typesafe.slick.testkit.util.{AsyncTest, JdbcTestDB}
import org.junit.Assert._
import scala.concurrent.{ExecutionContext, Await}
import scala.concurrent.duration.Duration
import slick.ast.ColumnOption
import slick.model._
import slick.jdbc.{SQLiteProfile, meta}
import slick.jdbc.SQLiteProfile
import slick.jdbc.meta.MTable
import slick.relational.RelationalProfile
import slick.sql.SqlProfile
@@ -1,6 +1,5 @@
package com.typesafe.slick.testkit.tests
import org.junit.Assert._
import com.typesafe.slick.testkit.util.{JdbcTestDB, AsyncTest}
class MutateTest extends AsyncTest[JdbcTestDB] {
@@ -1,7 +1,5 @@
package com.typesafe.slick.testkit.tests
import org.junit.Assert
import org.junit.Assert._
import slick.jdbc.GetResult
import com.typesafe.slick.testkit.util.{JdbcTestDB, AsyncTest}
@@ -58,7 +58,7 @@ class RelationalMiscTest extends AsyncTest[RelationalTestDB] {
}
def testSorting = {
import slick.lifted.{Shape, ShapeLevel, Ordered}
import slick.lifted.{Shape, Ordered}
class T1(tag: Tag) extends Table[(String, String, String)](tag, "t1_3") {
def a = column[String]("a")
@@ -1,9 +1,9 @@
package com.typesafe.slick.testkit.util
import java.io.{PrintWriter, OutputStreamWriter, BufferedWriter, FileOutputStream, FileWriter}
import java.io.{PrintWriter, OutputStreamWriter, BufferedWriter, FileOutputStream}
import slick.basic.BasicProfile
import slick.jdbc.{JdbcCapabilities, JdbcProfile}
import slick.jdbc.JdbcCapabilities
import slick.relational.RelationalCapabilities
import slick.sql.SqlCapabilities
@@ -3,7 +3,6 @@ package com.typesafe.slick.testkit.util
import scala.language.experimental.macros
import scala.reflect.macros.blackbox.Context
import scala.reflect.macros.TypecheckException
import scala.util.control.NonFatal
import java.util.regex.Pattern
/**
@@ -1,11 +1,9 @@
package com.typesafe.slick.testkit.util
import java.io.File
import java.util.logging.{Level, Logger}
import java.sql.SQLException
import slick.compiler.Phase
import slick.dbio._
import slick.driver.JdbcProfile
import slick.memory.MemoryProfile
import slick.jdbc._
import slick.jdbc.GetResult._
@@ -1,10 +1,8 @@
package com.typesafe.slick.testkit.util
import java.lang.reflect.Method
import com.typesafe.config.Config
import org.junit.Assert
import java.io._
import java.net.{URL, URLClassLoader}
@@ -16,10 +14,9 @@ import java.util.zip.GZIPInputStream
import scala.collection.mutable
import scala.concurrent.{Await, Future, ExecutionContext}
import slick.SlickException
import slick.basic.{BasicProfile, Capability}
import slick.dbio.{NoStream, DBIOAction, DBIO}
import slick.jdbc.{JdbcProfile, ResultSetAction, JdbcDataSource, SimpleJdbcAction}
import slick.jdbc.{JdbcProfile, ResultSetAction, JdbcDataSource}
import slick.jdbc.GetResult._
import slick.relational.RelationalProfile
import slick.sql.SqlProfile
@@ -6,7 +6,7 @@ import java.lang.reflect.Method
import java.util.concurrent.{LinkedBlockingQueue, ThreadPoolExecutor, ExecutionException, TimeUnit}
import java.util.concurrent.atomic.AtomicInteger
import scala.concurrent.{Promise, ExecutionContext, Await, Future, blocking}
import scala.concurrent.{Promise, ExecutionContext, Await, Future}
import scala.concurrent.duration.Duration
import scala.reflect.ClassTag
import scala.util.{Failure, Success}
@@ -15,11 +15,11 @@ import scala.util.control.NonFatal
import slick.SlickTreeException
import slick.basic.Capability
import slick.dbio._
import slick.jdbc.{JdbcProfile, JdbcCapabilities, JdbcBackend}
import slick.jdbc.{JdbcCapabilities, JdbcBackend}
import slick.lifted.Rep
import slick.util.DumpInfo
import slick.relational.{RelationalProfile, RelationalCapabilities}
import slick.sql.{SqlProfile, SqlCapabilities}
import slick.relational.RelationalCapabilities
import slick.sql.SqlCapabilities
import org.junit.runner.Description
import org.junit.runner.notification.RunNotifier
@@ -3,8 +3,7 @@ package com.typesafe.slick.testkit.util
import java.util.concurrent.TimeUnit
import com.typesafe.config.{ConfigValueFactory, Config, ConfigFactory}
import java.io.{FileInputStream, File}
import java.util.Properties
import java.io.File
import scala.collection.JavaConverters._
import scala.concurrent.duration.Duration
import slick.SlickException
@@ -10,7 +10,6 @@ import scala.concurrent.ExecutionContext.Implicits.global
object CodeGeneratorRoundTripTest extends DBTestObject(H2Mem, SQLiteMem, Postgres, MySQL, DerbyMem, HsqldbMem)
class CodeGeneratorRoundTripTest(val tdb: JdbcTestDB) extends DBTest {
import tdb.profile.api._
import tdb.profile.quoteIdentifier
@Test def test: Unit = runBlocking {
@@ -2,10 +2,9 @@ package slick.test.codegen
import scala.concurrent.ExecutionContext.Implicits.global
import slick.ast.{FieldSymbol, Node, Select}
import slick.jdbc.JdbcProfile
import slick.jdbc.meta.MTable
import slick.test.codegen.generated._
import com.typesafe.slick.testkit.util.{TestCodeRunner, JdbcTestDB}
import com.typesafe.slick.testkit.util.TestCodeRunner
import org.junit.Assert._
/** Test files generated by CodeGeneratorTest */
@@ -2,7 +2,7 @@ package slick.test.compile
import com.typesafe.slick.testkit.util.ShouldNotTypecheck
import slick.jdbc.H2Profile.api._
import slick.lifted.{Shape, ShapeLevel}
import slick.lifted.Shape
class NestedShapesTest {
def legal = {
@@ -1,10 +1,8 @@
package slick.test.jdbc
import java.io.PrintWriter
import java.sql.{Connection, Driver, DriverPropertyInfo, SQLException}
import java.util.Properties
import java.util.logging.Logger
import javax.sql.DataSource
import com.typesafe.config.ConfigFactory
import org.junit.Test
@@ -5,7 +5,6 @@ import org.junit.Assert._
import scala.concurrent.Await
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.duration.Duration
import slick.testutil._
import com.typesafe.slick.testkit.util.{DBTest, DBTestObject, JdbcTestDB}
import com.typesafe.slick.testkit.util.StandardTestDBs._
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
import javax.sql.rowset.serial.SerialBlob
import com.typesafe.slick.testkit.util.{AsyncTest, JdbcTestDB}
import org.junit.{After, Before, Ignore, Test}
import org.junit.{After, Before, Test}
import slick.jdbc.H2Profile.api._
import slick.lifted.{ProvenShape, TableQuery}
@@ -2,7 +2,6 @@ package slick.test.memory
import org.junit.Test
import org.junit.Assert._
import com.typesafe.slick.testkit.util.StandardTestDBs
import slick.basic.DatabaseConfig
import slick.jdbc.JdbcProfile
import slick.memory.{DistributedBackend, DistributedProfile}
@@ -1,7 +1,6 @@
package slick.test.model
import org.junit.Test
import org.junit.Assert._
import slick.model._
/** Test case for the SQL schema support in table definitions */
@@ -1,6 +1,5 @@
package slick.ast
import slick.ast.Util._
import slick.ast.TypeUtil._
import slick.SlickException
import slick.util.ConstArray
@@ -4,8 +4,7 @@ import scala.collection.mutable.ListBuffer
import scala.language.existentials
import scala.reflect.ClassTag
import slick.SlickException
import slick.util.{Logging, Dumpable, DumpInfo, GlobalConfig, ConstArray}
import Util._
import slick.util.{Dumpable, DumpInfo, GlobalConfig, ConstArray}
import TypeUtil._
/** A node in the Slick AST.
@@ -1,6 +1,5 @@
package slick.ast
import Util._
import slick.util.ConstArray
import scala.collection.mutable.HashMap
import scala.reflect.ClassTag
@@ -5,8 +5,6 @@ import slick.SlickException
import scala.collection.generic.CanBuild
import scala.collection.mutable.{Builder, ArrayBuilder}
import scala.reflect.{ClassTag, classTag => mkClassTag}
import Util._
import scala.collection.mutable.ArrayBuffer
import scala.annotation.implicitNotFound
import slick.util.{DumpInfo, Dumpable, TupleSupport, ConstArray}
@@ -1,12 +1,9 @@
package slick.ast
import slick.ast.TypeUtil.:@
import slick.util.ConstArray
import scala.collection
import scala.collection.mutable
import scala.language.implicitConversions
import scala.collection.mutable.ArrayBuffer
/**
* Utility methods for AST manipulation.
@@ -27,7 +24,6 @@ object Util {
/** Extra methods for Nodes. */
final class NodeOps(val tree: Node) extends AnyVal {
import Util._
import NodeOps._
def collect[T](pf: PartialFunction[Node, T], stopOnMatch: Boolean = false): ConstArray[T] = {
val retNull: (Node => T) = (_ => null.asInstanceOf[T])
@@ -2,16 +2,14 @@ package slick.basic
import slick.util.AsyncExecutor.{Priority, Continuation, Fresh, WithConnection}
import scala.language.existentials
import java.io.Closeable
import java.util.concurrent.atomic.{AtomicReferenceArray, AtomicBoolean, AtomicLong}
import java.util.concurrent.atomic.{AtomicReferenceArray, AtomicLong}
import com.typesafe.config.Config
import scala.collection.mutable.ArrayBuffer
import scala.concurrent.{Promise, ExecutionContext, Future}
import scala.util.{Try, Success, Failure}
import scala.util.{Success, Failure}
import scala.util.control.NonFatal
import org.slf4j.LoggerFactory
@@ -2,14 +2,13 @@ package slick.basic
import scala.language.{higherKinds, implicitConversions, existentials}
import slick.SlickException
import slick.ast._
import slick.compiler.QueryCompiler
import slick.dbio._
import slick.lifted._
import slick.util.GlobalConfig
import com.typesafe.config.{ConfigFactory, Config}
import com.typesafe.config.Config
/** The basic functionality that has to be implemented by all profiles. */
trait BasicProfile extends BasicActionComponent { self: BasicProfile =>
@@ -2,10 +2,8 @@ package slick.compiler
import slick.ast.Library.AggregateFunctionSymbol
import scala.collection.mutable.{HashSet, HashMap}
import slick.SlickException
import scala.collection.mutable.HashMap
import slick.ast._
import TypeUtil._
/** Ensure that all symbol definitions in a tree are unique. The same symbol can initially occur in
* multiple sub-trees when some part of a query is reused multiple times. This phase assigns new,
Oops, something went wrong.

0 comments on commit 65a5949

Please sign in to comment.