aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvlad <vlad@driver.xyz>2018-01-18 15:42:50 -0800
committervlad <vlad@driver.xyz>2018-01-18 15:42:50 -0800
commit1cda54833c6083020ba20944319e6fb03ecfd419 (patch)
tree58c32a5791ba1e318b19b4c19ecc9f51e70e8726
parent39d3c6bf58d5e386fe0f354e16f487f316e86774 (diff)
downloadrest-query-1cda54833c6083020ba20944319e6fb03ecfd419.tar.gz
rest-query-1cda54833c6083020ba20944319e6fb03ecfd419.tar.bz2
rest-query-1cda54833c6083020ba20944319e6fb03ecfd419.zip
Removing Quill completely from the pdsui-common
-rw-r--r--build.sbt1
-rw-r--r--src/main/scala/xyz/driver/pdsuicommon/db/PostgresContext.scala72
-rw-r--r--src/test/scala/xyz/driver/pdsuicommon/Mocks.scala61
3 files changed, 0 insertions, 134 deletions
diff --git a/build.sbt b/build.sbt
index 888e17d..8f2198d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -11,7 +11,6 @@ lazy val core = (project in file("."))
"com.lihaoyi" %% "fastparse" % "1.0.0",
"com.typesafe.akka" %% "akka-http" % "10.0.10",
"com.typesafe.scala-logging" %% "scala-logging" % "3.5.0",
- "io.getquill" %% "quill-jdbc" % "1.2.1",
"io.github.cloudify" %% "spdf" % "1.4.0",
"xyz.driver" %% "core" % "1.6.12",
"xyz.driver" %% "domain-model" % "0.21.16",
diff --git a/src/main/scala/xyz/driver/pdsuicommon/db/PostgresContext.scala b/src/main/scala/xyz/driver/pdsuicommon/db/PostgresContext.scala
deleted file mode 100644
index 0098a64..0000000
--- a/src/main/scala/xyz/driver/pdsuicommon/db/PostgresContext.scala
+++ /dev/null
@@ -1,72 +0,0 @@
-package xyz.driver.pdsuicommon.db
-
-import java.io.Closeable
-import java.time.{LocalDateTime, ZoneOffset}
-import java.util.UUID
-import java.util.concurrent.Executors
-import javax.sql.DataSource
-
-import io.getquill._
-import xyz.driver.pdsuicommon.concurrent.MdcExecutionContext
-import xyz.driver.pdsuicommon.db.PostgresContext.Settings
-import xyz.driver.pdsuicommon.domain.UuidId
-import xyz.driver.pdsuicommon.logging._
-
-import scala.concurrent.ExecutionContext
-import scala.util.control.NonFatal
-import scala.util.{Failure, Success, Try}
-
-object PostgresContext extends PhiLogging {
-
- final case class Settings(connection: com.typesafe.config.Config,
- connectionAttemptsOnStartup: Int,
- threadPoolSize: Int)
-
- def apply(settings: Settings): PostgresContext = {
- // Prevent leaking credentials to a log
- Try(JdbcContextConfig(settings.connection).dataSource) match {
- case Success(dataSource) => new PostgresContext(dataSource, settings)
- case Failure(NonFatal(e)) =>
- logger.error(phi"Can not load dataSource, error: ${Unsafe(e.getClass.getName)}")
- throw new IllegalArgumentException("Can not load dataSource from config. Check your database and config", e)
- }
- }
-
-}
-
-class PostgresContext(val dataSource: DataSource with Closeable, settings: Settings)
- extends PostgresJdbcContext[SnakeCase](dataSource) with TransactionalContext {
-
- private val tpe = Executors.newFixedThreadPool(settings.threadPoolSize)
-
- implicit val executionContext: ExecutionContext = {
- val orig = ExecutionContext.fromExecutor(tpe)
- MdcExecutionContext.from(orig)
- }
-
- override def close(): Unit = {
- super.close()
- tpe.shutdownNow()
- }
-
- /**
- * Usable for QueryBuilder's extractors
- */
- def timestampToLocalDateTime(timestamp: java.sql.Timestamp): LocalDateTime = {
- LocalDateTime.ofInstant(timestamp.toInstant, ZoneOffset.UTC)
- }
-
- implicit def encodeUuidId[T] = MappedEncoding[UuidId[T], String](_.toString)
- implicit def decodeUuidId[T] = MappedEncoding[String, UuidId[T]] { uuid =>
- UuidId[T](UUID.fromString(uuid))
- }
-
- def decodeOptUuidId[T] = MappedEncoding[Option[String], Option[UuidId[T]]] {
- case Some(x) => Option(x).map(y => UuidId[T](UUID.fromString(y)))
- case None => None
- }
-
- implicit def decodeUuid[T] = MappedEncoding[String, UUID] { uuid =>
- UUID.fromString(uuid)
- }
-}
diff --git a/src/test/scala/xyz/driver/pdsuicommon/Mocks.scala b/src/test/scala/xyz/driver/pdsuicommon/Mocks.scala
deleted file mode 100644
index 699020c..0000000
--- a/src/test/scala/xyz/driver/pdsuicommon/Mocks.scala
+++ /dev/null
@@ -1,61 +0,0 @@
-package xyz.driver.pdsuicommon
-
-import java.io.{Closeable, PrintWriter}
-import java.net.URL
-import java.sql.Connection
-import java.util.logging.Logger
-import javax.sql.DataSource
-
-import xyz.driver.pdsuicommon.db.SlickQueryBuilder.TableData
-import xyz.driver.pdsuicommon.db._
-import xyz.driver.pdsuicommon.http.HttpFetcher
-
-import scala.concurrent.Future
-
-class MockDataSource extends DataSource with Closeable {
- override def getConnection: Connection = throw new NotImplementedError("MockDataSource.getConnection")
- override def getConnection(username: String, password: String): Connection = {
- throw new NotImplementedError(s"MockDataSource.getConnection($username, $password)")
- }
- override def close(): Unit = throw new NotImplementedError("MockDataSource.close")
- override def setLogWriter(out: PrintWriter): Unit = throw new NotImplementedError("MockDataSource.setLogWriter")
- override def getLoginTimeout: Int = throw new NotImplementedError("MockDataSource.getLoginTimeout")
- override def setLoginTimeout(seconds: Int): Unit = throw new NotImplementedError("MockDataSource.setLoginTimeout")
- override def getParentLogger: Logger = throw new NotImplementedError("MockDataSource.getParentLogger")
- override def getLogWriter: PrintWriter = throw new NotImplementedError("MockDataSource.getLogWriter")
- override def unwrap[T](iface: Class[T]): T = throw new NotImplementedError("MockDataSource.unwrap")
- override def isWrapperFor(iface: Class[_]): Boolean = throw new NotImplementedError("MockDataSource.isWrapperFor")
-}
-
-class MockFactory()(implicit val sqlContext: PostgresContext) {
- val MockHttpFetcher: HttpFetcher = { (url: URL) =>
- Future.successful(Array.empty[Byte])
- }
-}
-
-object MockQueryBuilder {
-
- type MockRunnerIn = (SearchFilterExpr, Sorting, Option[Pagination])
- type MockRunnerOut[T] = Future[Seq[T]]
- type MockCountRunnerOut = SlickQueryBuilder.CountResult
-
- def apply[T](matcher: PartialFunction[MockRunnerIn, MockRunnerOut[T]])(
- countMatcher: PartialFunction[MockRunnerIn, MockCountRunnerOut])(
- implicit context: PostgresContext): SlickQueryBuilder[T] = {
-
- val runner: SlickQueryBuilder.Runner[T] = { parameters =>
- matcher((parameters.filter, parameters.sorting, parameters.pagination))
- }
-
- val countRunner: SlickQueryBuilder.CountRunner = { parameters =>
- countMatcher((parameters.filter, parameters.sorting, parameters.pagination))
- }
-
- val parameters = SlickPostgresQueryBuilderParameters(
- databaseName = "test",
- tableData = TableData("", None, Set.empty[String]),
- links = Map.empty
- )
- new SlickPostgresQueryBuilder(parameters)(runner, countRunner)
- }
-}