Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Scalasphere demo #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Scalasphere demo #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aca9bdd
Setup scalafix
olafurpg Mar 1, 2017
c336c93
Run organize imports
olafurpg Mar 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .scalafix.conf
View file
Open in desktop
@@ -0,0 +1 @@
rewrites = []
1 change: 1 addition & 0 deletions project/plugins.sbt
View file
Open in desktop
@@ -0,0 +1 @@
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.3.1")
4 changes: 2 additions & 2 deletions slick-codegen/src/main/scala/slick/codegen/AbstractGenerator.scala
View file
Open in desktop
@@ -1,10 +1,10 @@
package slick.codegen

import slick.ast.ColumnOption
import slick.{model => m}
import slick.ast.ColumnOption
import slick.model.ForeignKeyAction
import slick.sql.SqlProfile
import slick.relational.RelationalProfile
import slick.sql.SqlProfile

/**
* Slick code generator providing the base structure and facilities.
Expand Down
2 changes: 1 addition & 1 deletion slick-codegen/src/main/scala/slick/codegen/AbstractSourceCodeGenerator.scala
View file
Open in desktop
@@ -1,8 +1,8 @@
package slick.codegen

import slick.SlickException
import slick.ast.ColumnOption
import slick.{model => m}
import slick.ast.ColumnOption
import slick.model.ForeignKeyAction
import slick.relational.RelationalProfile
import slick.sql.SqlProfile
Expand Down
3 changes: 2 additions & 1 deletion slick-codegen/src/main/scala/slick/codegen/OutputHelpers.scala
View file
Open in desktop
@@ -1,7 +1,8 @@
package slick.codegen
import java.io.File
import java.io.BufferedWriter
import java.io.File
import java.io.FileWriter

import slick.SlickException

/** Output-related code-generation utilities. */
Expand Down
9 changes: 5 additions & 4 deletions slick-codegen/src/main/scala/slick/codegen/SourceCodeGenerator.scala
View file
Open in desktop
@@ -1,13 +1,14 @@
package slick.codegen

import java.net.URI

import scala.concurrent.{ExecutionContext, Await}
import scala.concurrent.Await
import scala.concurrent.ExecutionContext
import scala.concurrent.duration.Duration
import scala.util.Try

import slick.basic.DatabaseConfig
import java.net.URI

import slick.{model => m}
import slick.basic.DatabaseConfig
import slick.jdbc.JdbcProfile
import slick.util.ConfigExtensionMethods.configExtensionMethods

Expand Down
1 change: 1 addition & 0 deletions slick-codegen/src/main/scala/slick/codegen/package.scala
View file
Open in desktop
@@ -1,3 +1,4 @@
package slick
/** Code generator / type providers */

package object codegen
8 changes: 5 additions & 3 deletions slick-hikaricp/src/main/scala/slick/jdbc/hikaricp/HikariCPJdbcDataSource.scala
View file
Open in desktop
@@ -1,14 +1,16 @@
package slick.jdbc.hikaricp

import java.sql.{Connection, Driver}
import java.sql.Connection
import java.sql.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.jdbc.JdbcDataSource
import slick.jdbc.JdbcDataSourceFactory
import slick.util.Logging
import slick.util.ConfigExtensionMethods._

/** A JdbcDataSource for a HikariCP connection pool.
* See `slick.jdbc.JdbcBackend#Database.forConfig` for documentation on the config parameters. */
Expand Down
20 changes: 13 additions & 7 deletions slick-testkit/src/codegen/scala/slick/test/codegen/GenerateMainSources.scala
View file
Open in desktop
@@ -1,16 +1,22 @@
package slick.test.codegen

import scala.concurrent.Await
import scala.concurrent.Future
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.duration.Duration
import scala.io.Codec
import scala.io.Source

import java.io.File
import java.sql.Blob

import com.typesafe.slick.testkit.util.{TestCodeGenerator, InternalJdbcTestDB, StandardTestDBs, JdbcTestDB}

import scala.concurrent.{Future, Await}
import scala.concurrent.duration.Duration
import scala.concurrent.ExecutionContext.Implicits.global
import scala.io.{Codec, Source}
import com.typesafe.slick.testkit.util.InternalJdbcTestDB
import com.typesafe.slick.testkit.util.JdbcTestDB
import com.typesafe.slick.testkit.util.StandardTestDBs
import com.typesafe.slick.testkit.util.TestCodeGenerator
import slick.codegen.OutputHelpers
import slick.codegen.SourceCodeGenerator
import slick.dbio.DBIO
import slick.codegen.{OutputHelpers, SourceCodeGenerator}
import slick.jdbc.JdbcBackend
import slick.jdbc.meta.MTable
import slick.model.Model
Expand Down
3 changes: 2 additions & 1 deletion slick-testkit/src/codegen/scala/slick/test/codegen/GenerateRoundtripSources.scala
View file
Open in desktop
@@ -1,8 +1,9 @@
package slick.test.codegen

import scala.concurrent.Await
import scala.concurrent.duration.Duration
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.duration.Duration

import slick.codegen.SourceCodeGenerator
import slick.jdbc.JdbcProfile

Expand Down
10 changes: 6 additions & 4 deletions slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/ActionTest.scala
View file
Open in desktop
@@ -1,12 +1,14 @@
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

import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.RelationalTestDB
import com.typesafe.slick.testkit.util.StandardTestDBs
import slick.dbio.DBIOAction
import slick.dbio.Effect.Read

class ActionTest extends AsyncTest[RelationalTestDB] {
import tdb.profile.api._

Expand Down
6 changes: 4 additions & 2 deletions slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/AggregateTest.scala
View file
Open in desktop
@@ -1,7 +1,9 @@
package com.typesafe.slick.testkit.tests

import com.typesafe.slick.testkit.util.{AsyncTest, RelationalTestDB}
import slick.jdbc.{PostgresProfile, H2Profile}
import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.RelationalTestDB
import slick.jdbc.H2Profile
import slick.jdbc.PostgresProfile

class AggregateTest extends AsyncTest[RelationalTestDB] {
import tdb.profile.api._
Expand Down
3 changes: 2 additions & 1 deletion slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/ColumnDefaultTest.scala
View file
Open in desktop
@@ -1,6 +1,7 @@
package com.typesafe.slick.testkit.tests

import com.typesafe.slick.testkit.util.{AsyncTest, RelationalTestDB}
import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.RelationalTestDB

class ColumnDefaultTest extends AsyncTest[RelationalTestDB] {
import tdb.profile.api._
Expand Down
3 changes: 2 additions & 1 deletion slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/CountTest.scala
View file
Open in desktop
@@ -1,6 +1,7 @@
package com.typesafe.slick.testkit.tests

import com.typesafe.slick.testkit.util.{RelationalTestDB, AsyncTest}
import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.RelationalTestDB

class CountTest extends AsyncTest[RelationalTestDB] {
import tdb.profile.api._
Expand Down
22 changes: 15 additions & 7 deletions slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/ForUpdateTest.scala
View file
Open in desktop
@@ -1,17 +1,25 @@
package com.typesafe.slick.testkit.tests

import java.util.concurrent.{CountDownLatch, LinkedBlockingQueue, TimeUnit, ThreadPoolExecutor}
import scala.concurrent.Await
import scala.concurrent.ExecutionContext
import scala.concurrent.Future
import scala.concurrent.duration.Duration
import scala.util.Failure

import java.util.concurrent.CountDownLatch
import java.util.concurrent.LinkedBlockingQueue
import java.util.concurrent.ThreadPoolExecutor
import java.util.concurrent.TimeUnit

import com.typesafe.slick.testkit.util.{TestkitConfig, AsyncTest, JdbcTestDB}
import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.JdbcTestDB
import com.typesafe.slick.testkit.util.TestkitConfig
import org.junit.Assert
import slick.dbio.DBIOAction
import slick.jdbc.{SQLServerProfile, TransactionIsolation}
import slick.jdbc.SQLServerProfile
import slick.jdbc.TransactionIsolation
import slick.util.Logging

import scala.concurrent.duration.Duration
import scala.concurrent.{Await, ExecutionContext, Future}
import scala.util.Failure


class ForUpdateTest extends AsyncTest[JdbcTestDB] with Logging {
import tdb.profile.api._
Expand Down
3 changes: 2 additions & 1 deletion slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/ForceInsertQueryTest.scala
View file
Open in desktop
@@ -1,6 +1,7 @@
package com.typesafe.slick.testkit.tests

import com.typesafe.slick.testkit.util.{AsyncTest, JdbcTestDB}
import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.JdbcTestDB

class ForceInsertQueryTest extends AsyncTest[JdbcTestDB] {

Expand Down
3 changes: 2 additions & 1 deletion slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/ForeignKeyTest.scala
View file
Open in desktop
@@ -1,6 +1,7 @@
package com.typesafe.slick.testkit.tests

import com.typesafe.slick.testkit.util.{RelationalTestDB, AsyncTest}
import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.RelationalTestDB

class ForeignKeyTest extends AsyncTest[RelationalTestDB] {
import tdb.profile.api._
Expand Down
3 changes: 2 additions & 1 deletion slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/InsertTest.scala
View file
Open in desktop
@@ -1,6 +1,7 @@
package com.typesafe.slick.testkit.tests

import com.typesafe.slick.testkit.util.{AsyncTest, JdbcTestDB}
import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.JdbcTestDB
import slick.jdbc.DerbyProfile

class InsertTest extends AsyncTest[JdbcTestDB] {
Expand Down
7 changes: 4 additions & 3 deletions slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/JdbcMapperTest.scala
View file
Open in desktop
@@ -1,10 +1,11 @@
package com.typesafe.slick.testkit.tests

import org.junit.Assert._

import com.typesafe.slick.testkit.util.{JdbcTestDB, AsyncTest}
import scala.reflect.ClassTag

import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.JdbcTestDB
import org.junit.Assert._

class JdbcMapperTest extends AsyncTest[JdbcTestDB] {
import tdb.profile.api._

Expand Down
7 changes: 5 additions & 2 deletions slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/JdbcMetaTest.scala
View file
Open in desktop
@@ -1,9 +1,12 @@
package com.typesafe.slick.testkit.tests

import org.junit.{Test, Assert}
import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.JdbcTestDB
import com.typesafe.slick.testkit.util.TestDB
import org.junit.Assert
import org.junit.Test
import org.junit.Assert._
import slick.jdbc.meta._
import com.typesafe.slick.testkit.util.{TestDB, JdbcTestDB, AsyncTest}

class JdbcMetaTest extends AsyncTest[JdbcTestDB] {
import tdb.profile.api._
Expand Down
9 changes: 6 additions & 3 deletions slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/JdbcMiscTest.scala
View file
Open in desktop
@@ -1,8 +1,11 @@
package com.typesafe.slick.testkit.tests

import com.typesafe.slick.testkit.util.{JdbcTestDB, AsyncTest}

import slick.jdbc.{ResultSetHoldability, ResultSetConcurrency, ResultSetType, JdbcBackend}
import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.JdbcTestDB
import slick.jdbc.JdbcBackend
import slick.jdbc.ResultSetConcurrency
import slick.jdbc.ResultSetHoldability
import slick.jdbc.ResultSetType

class JdbcMiscTest extends AsyncTest[JdbcTestDB] {
import tdb.profile.api._
Expand Down
8 changes: 6 additions & 2 deletions slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/JdbcScalarFunctionTest.scala
View file
Open in desktop
@@ -1,7 +1,11 @@
package com.typesafe.slick.testkit.tests

import java.sql.{Time, Date, Timestamp}
import com.typesafe.slick.testkit.util.{JdbcTestDB, AsyncTest}
import java.sql.Date
import java.sql.Time
import java.sql.Timestamp

import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.JdbcTestDB

class JdbcScalarFunctionTest extends AsyncTest[JdbcTestDB] {
import tdb.profile.api._
Expand Down
17 changes: 12 additions & 5 deletions slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/JdbcTypeTest.scala
View file
Open in desktop
@@ -1,14 +1,21 @@
package com.typesafe.slick.testkit.tests

import com.typesafe.slick.testkit.util.{JdbcTestDB, AsyncTest}
import java.io.{ObjectInputStream, ObjectOutputStream, ByteArrayOutputStream}
import java.sql.{Blob, Date, Time, Timestamp}
import scala.concurrent.Future

import java.io.ByteArrayOutputStream
import java.io.ObjectInputStream
import java.io.ObjectOutputStream
import java.sql.Blob
import java.sql.Date
import java.sql.Time
import java.sql.Timestamp
import java.util.UUID

import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.JdbcTestDB
import javax.sql.rowset.serial.SerialBlob
import org.junit.Assert._

import scala.concurrent.Future

/** Data type related tests which are specific to JdbcProfile */
class JdbcTypeTest extends AsyncTest[JdbcTestDB] {
import tdb.profile.api._
Expand Down
3 changes: 2 additions & 1 deletion slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/JoinTest.scala
View file
Open in desktop
@@ -1,7 +1,8 @@
package com.typesafe.slick.testkit.tests

import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.RelationalTestDB
import org.junit.Assert._
import com.typesafe.slick.testkit.util.{RelationalTestDB, AsyncTest}

class JoinTest extends AsyncTest[RelationalTestDB] {
import tdb.profile.api._
Expand Down
4 changes: 3 additions & 1 deletion slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/MainTest.scala
View file
Open in desktop
@@ -1,7 +1,9 @@
package com.typesafe.slick.testkit.tests

import scala.language.higherKinds
import com.typesafe.slick.testkit.util.{JdbcTestDB, AsyncTest}

import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.JdbcTestDB

class MainTest extends AsyncTest[JdbcTestDB] { mainTest =>
import tdb.profile.api._
Expand Down
15 changes: 8 additions & 7 deletions slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/ModelBuilderTest.scala
View file
Open in desktop
@@ -1,16 +1,17 @@
package com.typesafe.slick.testkit.tests

import com.typesafe.slick.testkit.util.{AsyncTest, JdbcTestDB}

import org.junit.Assert._

import scala.concurrent.{ExecutionContext, Await}
import scala.concurrent.Await
import scala.concurrent.ExecutionContext
import scala.concurrent.duration.Duration

import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.JdbcTestDB
import org.junit.Assert._
import slick.ast.ColumnOption
import slick.model._
import slick.jdbc.{SQLiteProfile, meta}
import slick.jdbc.SQLiteProfile
import slick.jdbc.meta
import slick.jdbc.meta.MTable
import slick.model._
import slick.relational.RelationalProfile
import slick.sql.SqlProfile

Expand Down
3 changes: 2 additions & 1 deletion slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/MutateTest.scala
View file
Open in desktop
@@ -1,7 +1,8 @@
package com.typesafe.slick.testkit.tests

import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.JdbcTestDB
import org.junit.Assert._
import com.typesafe.slick.testkit.util.{JdbcTestDB, AsyncTest}

class MutateTest extends AsyncTest[JdbcTestDB] {
import tdb.profile.api._
Expand Down
5 changes: 3 additions & 2 deletions slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/NestingTest.scala
View file
Open in desktop
@@ -1,9 +1,10 @@
package com.typesafe.slick.testkit.tests

import com.typesafe.slick.testkit.util.{RelationalTestDB, AsyncTest}

import scala.concurrent.Future

import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.RelationalTestDB

class NestingTest extends AsyncTest[RelationalTestDB] {
import tdb.profile.api._

Expand Down
4 changes: 2 additions & 2 deletions slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/NewQuerySemanticsTest.scala
View file
Open in desktop
@@ -1,9 +1,9 @@
package com.typesafe.slick.testkit.tests

import com.typesafe.slick.testkit.util.AsyncTest
import com.typesafe.slick.testkit.util.RelationalTestDB
import slick.jdbc.H2Profile

import com.typesafe.slick.testkit.util.{RelationalTestDB, AsyncTest}

class NewQuerySemanticsTest extends AsyncTest[RelationalTestDB] {
import tdb.profile.api._

Expand Down