From f6228d3d91387f515600fe3b5682e6674dbb3da3 Mon Sep 17 00:00:00 2001 From: Jules Ivanic Date: Mon, 2 Oct 2023 11:49:46 +0400 Subject: [PATCH] Remove unused code (#2904) --- .../src/main/scala/io/getquill/CassandraZioContext.scala | 2 -- .../src/main/scala/io/getquill/cassandrazio/Quill.scala | 4 +--- .../io/getquill/codegen/jdbc/model/DefaultJdbcTyper.scala | 5 +---- quill-core/src/main/scala/io/getquill/log/ContextLog.scala | 2 +- .../scala/io/getquill/context/qzio/ZioJAsyncContext.scala | 2 +- .../scala/io/getquill/context/jasync/JAsyncContext.scala | 2 +- 6 files changed, 5 insertions(+), 12 deletions(-) diff --git a/quill-cassandra-zio/src/main/scala/io/getquill/CassandraZioContext.scala b/quill-cassandra-zio/src/main/scala/io/getquill/CassandraZioContext.scala index 9118cbfa1d..fbd88fd354 100644 --- a/quill-cassandra-zio/src/main/scala/io/getquill/CassandraZioContext.scala +++ b/quill-cassandra-zio/src/main/scala/io/getquill/CassandraZioContext.scala @@ -45,8 +45,6 @@ class CassandraZioContext[+N <: NamingStrategy](val naming: N) with Context[CqlIdiom, N] with Probing { - private val logger = ContextLogger(classOf[CassandraZioContext[_]]) - override type Error = Throwable override type Environment = CassandraZioSession diff --git a/quill-cassandra-zio/src/main/scala/io/getquill/cassandrazio/Quill.scala b/quill-cassandra-zio/src/main/scala/io/getquill/cassandrazio/Quill.scala index da44ff31cb..59091835de 100644 --- a/quill-cassandra-zio/src/main/scala/io/getquill/cassandrazio/Quill.scala +++ b/quill-cassandra-zio/src/main/scala/io/getquill/cassandrazio/Quill.scala @@ -19,14 +19,12 @@ object Quill { ZLayer.fromFunction((session: CassandraZioSession) => new Cassandra[N](naming, session)) } - case class Cassandra[+N <: NamingStrategy](val naming: N, session: CassandraZioSession) + class Cassandra[+N <: NamingStrategy](val naming: N, session: CassandraZioSession) extends CassandraRowContext[N] with ZioContext[CqlIdiom, N] with Context[CqlIdiom, N] with Probing { - private val logger = ContextLogger(classOf[Quill.Cassandra[_]]) - override type Error = Throwable override type Environment = Any diff --git a/quill-codegen-jdbc/src/main/scala/io/getquill/codegen/jdbc/model/DefaultJdbcTyper.scala b/quill-codegen-jdbc/src/main/scala/io/getquill/codegen/jdbc/model/DefaultJdbcTyper.scala index 7ab8368544..99dae4c4f1 100644 --- a/quill-codegen-jdbc/src/main/scala/io/getquill/codegen/jdbc/model/DefaultJdbcTyper.scala +++ b/quill-codegen-jdbc/src/main/scala/io/getquill/codegen/jdbc/model/DefaultJdbcTyper.scala @@ -1,10 +1,8 @@ package io.getquill.codegen.jdbc.model -import java.sql.Types._ - import io.getquill.codegen.model._ -import io.getquill.util.ContextLogger +import java.sql.Types._ import scala.reflect.{ClassTag, classTag} class DefaultJdbcTyper( @@ -12,7 +10,6 @@ class DefaultJdbcTyper( numericPreference: NumericPreference ) extends (JdbcTypeInfo => Option[ClassTag[_]]) { - private val logger = ContextLogger(classOf[DefaultJdbcTyper]) private[getquill] val MaxIntDigits = 9 private[getquill] val MaxLongDigits = 18 diff --git a/quill-core/src/main/scala/io/getquill/log/ContextLog.scala b/quill-core/src/main/scala/io/getquill/log/ContextLog.scala index 5bc439c42f..55e39382eb 100644 --- a/quill-core/src/main/scala/io/getquill/log/ContextLog.scala +++ b/quill-core/src/main/scala/io/getquill/log/ContextLog.scala @@ -5,6 +5,6 @@ import io.getquill.util.ContextLogger object ContextLog { private val logger = ContextLogger(this.getClass) - def apply(str: String) = + def apply(str: String): Unit = logger.underlying.error(str) } diff --git a/quill-jasync-zio/src/main/scala/io/getquill/context/qzio/ZioJAsyncContext.scala b/quill-jasync-zio/src/main/scala/io/getquill/context/qzio/ZioJAsyncContext.scala index 129f974f79..c780d53f57 100644 --- a/quill-jasync-zio/src/main/scala/io/getquill/context/qzio/ZioJAsyncContext.scala +++ b/quill-jasync-zio/src/main/scala/io/getquill/context/qzio/ZioJAsyncContext.scala @@ -24,7 +24,7 @@ abstract class ZioJAsyncContext[D <: SqlIdiom, +N <: NamingStrategy, C <: Concre with Encoders with ZIOMonad { - protected val dateTimeZone = ZoneId.systemDefault() + protected val dateTimeZone: ZoneId = ZoneId.systemDefault() private val logger = ContextLogger(classOf[ZioJAsyncContext[_, _, _]]) diff --git a/quill-jasync/src/main/scala/io/getquill/context/jasync/JAsyncContext.scala b/quill-jasync/src/main/scala/io/getquill/context/jasync/JAsyncContext.scala index b756c96d8a..2d12623b3a 100644 --- a/quill-jasync/src/main/scala/io/getquill/context/jasync/JAsyncContext.scala +++ b/quill-jasync/src/main/scala/io/getquill/context/jasync/JAsyncContext.scala @@ -46,7 +46,7 @@ abstract class JAsyncContext[D <: SqlIdiom, +N <: NamingStrategy, C <: ConcreteC override type NullChecker = JasyncNullChecker type Runner = Unit - protected val dateTimeZone = ZoneId.systemDefault() + protected val dateTimeZone: ZoneId = ZoneId.systemDefault() class JasyncNullChecker extends BaseNullChecker { override def apply(index: Int, row: RowData): Boolean =