drop export clauses (#99)

* drop export clauses * rename magzio.Transactor to magzio.TransactorZIO * test imports * update imports after merging master
AugustNagro · Feb 2, 2025 · 192532b · 192532b
1 parent f7c55e5
commit 192532b
Show file tree

Hide file tree

Showing 23 changed files with 45 additions and 113 deletions.
diff --git a/...ugustnagro/magnum/magzio/Transactor.scala → ...stnagro/magnum/magzio/TransactorZIO.scala b/...ugustnagro/magnum/magzio/Transactor.scala → ...stnagro/magnum/magzio/TransactorZIO.scala
@@ -7,23 +7,25 @@ import java.sql.Connection
 import javax.sql.DataSource
 import scala.util.control.NonFatal
 
-class Transactor private (
+class TransactorZIO private (
     dataSource: DataSource,
     sqlLogger: SqlLogger,
     connectionConfig: Connection => Unit,
     semaphore: Option[Semaphore]
 ):
 
-  def withSqlLogger(sqlLogger: SqlLogger): Transactor =
-    new Transactor(
+  def withSqlLogger(sqlLogger: SqlLogger): TransactorZIO =
+    new TransactorZIO(
       dataSource,
       sqlLogger,
       connectionConfig,
       semaphore
     )
 
-  def withConnectionConfig(connectionConfig: Connection => Unit): Transactor =
-    new Transactor(
+  def withConnectionConfig(
+      connectionConfig: Connection => Unit
+  ): TransactorZIO =
+    new TransactorZIO(
       dataSource,
       sqlLogger,
       connectionConfig,
@@ -73,12 +75,12 @@ class Transactor private (
         .orDieWith(t =>
           SqlException("Unable to close DB Connection, will die", t)
         )
-end Transactor
+end TransactorZIO
 
-object Transactor:
+object TransactorZIO:
   private val noOpConnectionConfig: Connection => Unit = _ => ()
 
-  /** Construct a Transactor
+  /** Construct a TransactorZIO
     *
     * @param sqlLogger
     *   Logging configuration
@@ -88,14 +90,12 @@ object Transactor:
     *   Number of threads in your connection pool. This helps magzio be more
     *   memory efficient by limiting the number of blocking pool threads used.
     *   Not needed if using the ZIO virtual-thread based blocking executor
-    * @return
-    *   Transactor UIO
     */
   def layer(
       sqlLogger: SqlLogger,
       connectionConfig: Connection => Unit,
       maxBlockingThreads: Option[Int]
-  ): URLayer[DataSource, Transactor] =
+  ): URLayer[DataSource, TransactorZIO] =
     ZLayer.fromZIO {
       for {
         dataSource <- ZIO.service[DataSource]
@@ -104,7 +104,7 @@ object Transactor:
           .flatMap(threads => Semaphore.make(threads))
           .unsome
           .map(semaphoreOpt =>
-            new Transactor(
+            new TransactorZIO(
               dataSource = dataSource,
               sqlLogger = sqlLogger,
               connectionConfig = connectionConfig,
@@ -114,63 +114,53 @@ object Transactor:
       } yield transactor
     }
 
-  /** Construct a Transactor
+  /** Construct a TransactorZIO
     *
     * @param sqlLogger
     *   Logging configuration
     * @param connectionConfig
     *   Customize the underlying JDBC Connections
-    * @return
-    *   Transactor UIO
     */
   def layer(
       sqlLogger: SqlLogger,
       connectionConfig: Connection => Unit
-  ): URLayer[DataSource, Transactor] =
+  ): URLayer[DataSource, TransactorZIO] =
     layer(
       sqlLogger = sqlLogger,
       connectionConfig = connectionConfig,
       maxBlockingThreads = None
     )
 
-  /** Construct a Transactor
+  /** Construct a TransactorZIO
     *
     * @param dataSource
     *   Datasource to be used
     * @param sqlLogger
     *   Logging configuration
-    * @return
-    *   Transactor UIO
     */
-  def layer(sqlLogger: SqlLogger): URLayer[DataSource, Transactor] =
+  def layer(sqlLogger: SqlLogger): URLayer[DataSource, TransactorZIO] =
     layer(
       sqlLogger = sqlLogger,
       connectionConfig = noOpConnectionConfig,
       maxBlockingThreads = None
     )
 
-  /** Construct a Transactor
-    *
-    * @return
-    *   Transactor UIO
-    */
-  def layer: URLayer[DataSource, Transactor] =
+  /** Construct a TransactorZIO */
+  def layer: URLayer[DataSource, TransactorZIO] =
     layer(
       sqlLogger = SqlLogger.Default,
       connectionConfig = noOpConnectionConfig,
       maxBlockingThreads = None
     )
 
-  /** Construct a Transactor
+  /** Construct a TransactorZIO
     *
     * @param connectionConfig
     *   Customize the underlying JDBC Connections
-    * @return
-    *   Transactor UIO
     */
   def layer(
       connectionConfig: Connection => Unit
-  ): URLayer[DataSource, Transactor] =
+  ): URLayer[DataSource, TransactorZIO] =
     layer(
       sqlLogger = SqlLogger.Default,
       connectionConfig = connectionConfig,
@@ -181,13 +171,12 @@ object Transactor:
     *   Number of threads in your connection pool. This helps magzio be more
     *   memory efficient by limiting the number of blocking pool threads used.
     *   Not needed if using the ZIO virtual-thread based blocking executor
-    * @return
     */
-  def layer(maxBlockingThreads: Int): URLayer[DataSource, Transactor] =
+  def layer(maxBlockingThreads: Int): URLayer[DataSource, TransactorZIO] =
     layer(
       sqlLogger = SqlLogger.Default,
       connectionConfig = noOpConnectionConfig,
       maxBlockingThreads = Some(maxBlockingThreads)
     )
 
-end Transactor
+end TransactorZIO
diff --git a/magnum-zio/src/main/scala/com/augustnagro/magnum/magzio/exports.scala b/magnum-zio/src/main/scala/com/augustnagro/magnum/magzio/exports.scala
diff --git a/magnum-zio/src/test/scala/com/augustnagro/magnum/magzio/ImmutableRepoZioTests.scala b/magnum-zio/src/test/scala/com/augustnagro/magnum/magzio/ImmutableRepoZioTests.scala
@@ -1,6 +1,6 @@
 package com.augustnagro.magnum.magzio
 
-import com.augustnagro.magnum.magzio.*
+import com.augustnagro.magnum.*
 import munit.{FunSuite, Location}
 import zio.*
 
@@ -11,7 +11,7 @@ import scala.util.{Success, Using}
 def immutableRepoZioTests(
     suite: FunSuite,
     dbType: DbType,
-    xa: () => Transactor
+    xa: () => TransactorZIO
 )(using
     Location,
     DbCodec[OffsetDateTime]

diff --git a/magnum-zio/src/test/scala/com/augustnagro/magnum/magzio/PgZioTests.scala b/magnum-zio/src/test/scala/com/augustnagro/magnum/magzio/PgZioTests.scala
@@ -1,6 +1,6 @@
 package com.augustnagro.magnum.magzio
 
-import com.augustnagro.magnum.magzio.*
+import com.augustnagro.magnum.*
 import com.dimafeng.testcontainers.PostgreSQLContainer
 import com.dimafeng.testcontainers.munit.fixtures.TestContainersFixtures
 import munit.{AnyFixture, FunSuite, Location}
@@ -25,7 +25,7 @@ class PgZioTests extends FunSuite, TestContainersFixtures:
   override def munitFixtures: Seq[AnyFixture[_]] =
     super.munitFixtures :+ pgContainer
 
-  def xa(): Transactor =
+  def xa(): TransactorZIO =
     val ds = PGSimpleDataSource()
     val pg = pgContainer()
     ds.setUrl(pg.jdbcUrl)
@@ -48,7 +48,7 @@ class PgZioTests extends FunSuite, TestContainersFixtures:
     Unsafe.unsafe { implicit unsafe =>
       zio.Runtime.default.unsafe
         .run(
-          Transactor.layer
+          TransactorZIO.layer
             .build(Scope.global)
             .map(_.get)
             .provide(ZLayer.succeed(ds))

diff --git a/magnum/src/main/scala/com/augustnagro/magnum/common/exports.scala b/magnum/src/main/scala/com/augustnagro/magnum/common/exports.scala
diff --git a/magnum/src/test/scala/ClickHouseTests.scala b/magnum/src/test/scala/ClickHouseTests.scala
@@ -1,4 +1,4 @@
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 import com.clickhouse.jdbc.ClickHouseDataSource
 import com.dimafeng.testcontainers.ClickHouseContainer
 import com.dimafeng.testcontainers.munit.fixtures.TestContainersFixtures

diff --git a/magnum/src/test/scala/EffectiveSubsetTests.scala b/magnum/src/test/scala/EffectiveSubsetTests.scala
@@ -1,4 +1,4 @@
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 import munit.FunSuite
 
 class EffectiveSubsetTests extends FunSuite:

diff --git a/magnum/src/test/scala/H2Tests.scala b/magnum/src/test/scala/H2Tests.scala
@@ -1,4 +1,4 @@
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 import munit.FunSuite
 import org.h2.jdbcx.JdbcDataSource
 import shared.*

diff --git a/magnum/src/test/scala/MySqlTests.scala b/magnum/src/test/scala/MySqlTests.scala
@@ -1,4 +1,4 @@
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 import com.augustnagro.magnum.UUIDCodec.VarCharUUIDCodec
 import com.dimafeng.testcontainers.MySQLContainer
 import com.dimafeng.testcontainers.munit.fixtures.TestContainersFixtures

diff --git a/magnum/src/test/scala/OracleTests.scala b/magnum/src/test/scala/OracleTests.scala
@@ -1,4 +1,4 @@
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 import com.augustnagro.magnum.UUIDCodec.VarCharUUIDCodec
 import com.dimafeng.testcontainers.OracleContainer
 import com.dimafeng.testcontainers.munit.fixtures.TestContainersFixtures

diff --git a/magnum/src/test/scala/PgTests.scala b/magnum/src/test/scala/PgTests.scala
@@ -1,4 +1,4 @@
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 import com.dimafeng.testcontainers.PostgreSQLContainer
 import com.dimafeng.testcontainers.munit.fixtures.TestContainersFixtures
 import munit.{AnyFixture, FunSuite, Location}

diff --git a/magnum/src/test/scala/SqliteTests.scala b/magnum/src/test/scala/SqliteTests.scala
@@ -1,4 +1,4 @@
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 import com.augustnagro.magnum.UUIDCodec.VarCharUUIDCodec
 import munit.FunSuite
 import org.sqlite.SQLiteDataSource

diff --git a/magnum/src/test/scala/opaques.scala b/magnum/src/test/scala/opaques.scala
@@ -1,4 +1,4 @@
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 
 object opaques:
   opaque type Age = Int

diff --git a/magnum/src/test/scala/shared/BigDecTests.scala b/magnum/src/test/scala/shared/BigDecTests.scala
@@ -1,6 +1,6 @@
 package shared
 
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 import munit.{FunSuite, Location}
 
 def bigDecTests(suite: FunSuite, dbType: DbType, xa: () => Transactor)(using

diff --git a/magnum/src/test/scala/shared/EmbeddedFragTests.scala b/magnum/src/test/scala/shared/EmbeddedFragTests.scala
@@ -1,6 +1,6 @@
 package shared
 
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 import munit.{FunSuite, Location}
 
 import java.util.UUID

diff --git a/magnum/src/test/scala/shared/EntityCreatorTests.scala b/magnum/src/test/scala/shared/EntityCreatorTests.scala
@@ -1,6 +1,6 @@
 package shared
 
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 import com.augustnagro.magnum.SqlException
 import munit.{FunSuite, Location}
 

diff --git a/magnum/src/test/scala/shared/ImmutableRepoTests.scala b/magnum/src/test/scala/shared/ImmutableRepoTests.scala
@@ -1,6 +1,6 @@
 package shared
 
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 import munit.{FunSuite, Location}
 
 import java.sql.Connection

diff --git a/magnum/src/test/scala/shared/MultilineFragTests.scala b/magnum/src/test/scala/shared/MultilineFragTests.scala
@@ -1,6 +1,6 @@
 package shared
 
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 import munit.{FunSuite, Location}
 
 def multilineFragTests(suite: FunSuite, dbType: DbType, xa: () => Transactor)(

diff --git a/magnum/src/test/scala/shared/NoIdTests.scala b/magnum/src/test/scala/shared/NoIdTests.scala
@@ -1,6 +1,6 @@
 package shared
 
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 import munit.{FunSuite, Location}
 
 import java.time.OffsetDateTime

diff --git a/magnum/src/test/scala/shared/OptionalProductTests.scala b/magnum/src/test/scala/shared/OptionalProductTests.scala
@@ -1,6 +1,6 @@
 package shared
 
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 import munit.{FunSuite, Location}
 
 import java.time.OffsetDateTime

diff --git a/magnum/src/test/scala/shared/RepoTests.scala b/magnum/src/test/scala/shared/RepoTests.scala
@@ -1,6 +1,6 @@
 package shared
 
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 import com.augustnagro.magnum.{BatchUpdateResult, SqlException, ColumnNames}
 import munit.FunSuite
 

diff --git a/magnum/src/test/scala/shared/SharedTests.scala b/magnum/src/test/scala/shared/SharedTests.scala
@@ -1,6 +1,6 @@
 package shared
 
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 import munit.{FunSuite, Location}
 
 import java.time.OffsetDateTime

diff --git a/magnum/src/test/scala/shared/SpecTests.scala b/magnum/src/test/scala/shared/SpecTests.scala
@@ -1,6 +1,6 @@
 package shared
 
-import com.augustnagro.magnum.common.*
+import com.augustnagro.magnum.*
 import munit.{FunSuite, Location}
 
 import java.time.{OffsetDateTime, ZoneOffset}