From bc729eaf1db1cb81f4d51a54aa95a21f02991e7a Mon Sep 17 00:00:00 2001 From: Pavel Salamon Date: Wed, 27 Dec 2023 18:35:36 +0100 Subject: [PATCH] Change package name --- .../{doobiedb => doobie}/AvailableMetaInstancesTest.scala | 2 +- .../co/absa/fadb/{doobiedb => doobie}/DatesTimesTest.scala | 4 ++-- .../DoobieMultipleResultFunctionTest.scala | 4 ++-- .../DoobieOptionalResultFunctionTest.scala | 4 ++-- .../fadb/{doobiedb => doobie}/DoobieOtherTypesTest.scala | 4 ++-- .../DoobieSingleResultFunctionTest.scala | 4 ++-- .../DoobieSingleResultFunctionWithStatusTest.scala | 4 ++-- .../za/co/absa/fadb/{doobiedb => doobie}/DoobieTest.scala | 2 +- .../za/co/absa/fadb/{doobiedb => doobie}/DoobieEngine.scala | 2 +- .../co/absa/fadb/{doobiedb => doobie}/DoobieFunction.scala | 6 +++--- .../za/co/absa/fadb/{doobiedb => doobie}/DoobieQuery.scala | 2 +- .../co/absa/fadb/{doobiedb => doobie}/StatusWithData.scala | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) rename doobie/src/it/scala/za/co/absa/fadb/{doobiedb => doobie}/AvailableMetaInstancesTest.scala (99%) rename doobie/src/it/scala/za/co/absa/fadb/{doobiedb => doobie}/DatesTimesTest.scala (97%) rename doobie/src/it/scala/za/co/absa/fadb/{doobiedb => doobie}/DoobieMultipleResultFunctionTest.scala (93%) rename doobie/src/it/scala/za/co/absa/fadb/{doobiedb => doobie}/DoobieOptionalResultFunctionTest.scala (93%) rename doobie/src/it/scala/za/co/absa/fadb/{doobiedb => doobie}/DoobieOtherTypesTest.scala (96%) rename doobie/src/it/scala/za/co/absa/fadb/{doobiedb => doobie}/DoobieSingleResultFunctionTest.scala (94%) rename doobie/src/it/scala/za/co/absa/fadb/{doobiedb => doobie}/DoobieSingleResultFunctionWithStatusTest.scala (97%) rename doobie/src/it/scala/za/co/absa/fadb/{doobiedb => doobie}/DoobieTest.scala (97%) rename doobie/src/main/scala/za/co/absa/fadb/{doobiedb => doobie}/DoobieEngine.scala (99%) rename doobie/src/main/scala/za/co/absa/fadb/{doobiedb => doobie}/DoobieFunction.scala (97%) rename doobie/src/main/scala/za/co/absa/fadb/{doobiedb => doobie}/DoobieQuery.scala (98%) rename doobie/src/main/scala/za/co/absa/fadb/{doobiedb => doobie}/StatusWithData.scala (95%) diff --git a/doobie/src/it/scala/za/co/absa/fadb/doobiedb/AvailableMetaInstancesTest.scala b/doobie/src/it/scala/za/co/absa/fadb/doobie/AvailableMetaInstancesTest.scala similarity index 99% rename from doobie/src/it/scala/za/co/absa/fadb/doobiedb/AvailableMetaInstancesTest.scala rename to doobie/src/it/scala/za/co/absa/fadb/doobie/AvailableMetaInstancesTest.scala index 3d9c1149..53c3f17f 100644 --- a/doobie/src/it/scala/za/co/absa/fadb/doobiedb/AvailableMetaInstancesTest.scala +++ b/doobie/src/it/scala/za/co/absa/fadb/doobie/AvailableMetaInstancesTest.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.doobiedb +package za.co.absa.fadb.doobie import doobie.util.meta.Meta import org.scalatest.funsuite.AnyFunSuite diff --git a/doobie/src/it/scala/za/co/absa/fadb/doobiedb/DatesTimesTest.scala b/doobie/src/it/scala/za/co/absa/fadb/doobie/DatesTimesTest.scala similarity index 97% rename from doobie/src/it/scala/za/co/absa/fadb/doobiedb/DatesTimesTest.scala rename to doobie/src/it/scala/za/co/absa/fadb/doobie/DatesTimesTest.scala index bac51165..a0e27db2 100644 --- a/doobie/src/it/scala/za/co/absa/fadb/doobiedb/DatesTimesTest.scala +++ b/doobie/src/it/scala/za/co/absa/fadb/doobie/DatesTimesTest.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.doobiedb +package za.co.absa.fadb.doobie import cats.effect.IO import cats.effect.unsafe.implicits.global @@ -23,7 +23,7 @@ import doobie.util.Read import doobie.util.fragment.Fragment import org.scalatest.funsuite.AnyFunSuite import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.doobiedb.DoobieFunction.{DoobieSingleResultFunction, DoobieSingleResultFunctionWithStatus} +import za.co.absa.fadb.doobie.DoobieFunction.{DoobieSingleResultFunction, DoobieSingleResultFunctionWithStatus} import za.co.absa.fadb.status.handling.implementations.StandardStatusHandling class DatesTimesTest extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieMultipleResultFunctionTest.scala b/doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieMultipleResultFunctionTest.scala similarity index 93% rename from doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieMultipleResultFunctionTest.scala rename to doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieMultipleResultFunctionTest.scala index 55b3fa02..b208227d 100644 --- a/doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieMultipleResultFunctionTest.scala +++ b/doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieMultipleResultFunctionTest.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.doobiedb +package za.co.absa.fadb.doobie import cats.effect.IO import cats.effect.unsafe.implicits.global @@ -23,7 +23,7 @@ import doobie.util.Read import doobie.util.fragment.Fragment import org.scalatest.funsuite.AnyFunSuite import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.doobiedb.DoobieFunction.DoobieMultipleResultFunction +import za.co.absa.fadb.doobie.DoobieFunction.DoobieMultipleResultFunction class DoobieMultipleResultFunctionTest extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieOptionalResultFunctionTest.scala b/doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieOptionalResultFunctionTest.scala similarity index 93% rename from doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieOptionalResultFunctionTest.scala rename to doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieOptionalResultFunctionTest.scala index ac2ddd11..a69928b3 100644 --- a/doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieOptionalResultFunctionTest.scala +++ b/doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieOptionalResultFunctionTest.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.doobiedb +package za.co.absa.fadb.doobie import cats.effect.IO import cats.effect.unsafe.implicits.global @@ -23,7 +23,7 @@ import doobie.util.Read import doobie.util.fragment.Fragment import org.scalatest.funsuite.AnyFunSuite import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.doobiedb.DoobieFunction.DoobieOptionalResultFunction +import za.co.absa.fadb.doobie.DoobieFunction.DoobieOptionalResultFunction class DoobieOptionalResultFunctionTest extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieOtherTypesTest.scala b/doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieOtherTypesTest.scala similarity index 96% rename from doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieOtherTypesTest.scala rename to doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieOtherTypesTest.scala index 6681133e..71f1d6c6 100644 --- a/doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieOtherTypesTest.scala +++ b/doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieOtherTypesTest.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.doobiedb +package za.co.absa.fadb.doobie import cats.effect.IO import cats.effect.unsafe.implicits.global @@ -23,7 +23,7 @@ import doobie.util.Read import doobie.util.fragment.Fragment import org.scalatest.funsuite.AnyFunSuite import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.doobiedb.DoobieFunction.{DoobieSingleResultFunction, DoobieSingleResultFunctionWithStatus} +import za.co.absa.fadb.doobie.DoobieFunction.{DoobieSingleResultFunction, DoobieSingleResultFunctionWithStatus} import za.co.absa.fadb.exceptions.DataConflictException import za.co.absa.fadb.status.FunctionStatus import za.co.absa.fadb.status.handling.implementations.StandardStatusHandling diff --git a/doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieSingleResultFunctionTest.scala b/doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieSingleResultFunctionTest.scala similarity index 94% rename from doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieSingleResultFunctionTest.scala rename to doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieSingleResultFunctionTest.scala index e7a005e1..7454acdc 100644 --- a/doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieSingleResultFunctionTest.scala +++ b/doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieSingleResultFunctionTest.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.doobiedb +package za.co.absa.fadb.doobie import cats.effect.IO import cats.effect.unsafe.implicits.global @@ -23,7 +23,7 @@ import doobie.util.Read import doobie.util.fragment.Fragment import org.scalatest.funsuite.AnyFunSuite import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.doobiedb.DoobieFunction.DoobieSingleResultFunction +import za.co.absa.fadb.doobie.DoobieFunction.DoobieSingleResultFunction class DoobieSingleResultFunctionTest extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieSingleResultFunctionWithStatusTest.scala b/doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieSingleResultFunctionWithStatusTest.scala similarity index 97% rename from doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieSingleResultFunctionWithStatusTest.scala rename to doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieSingleResultFunctionWithStatusTest.scala index d1fe9bbe..14a98f04 100644 --- a/doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieSingleResultFunctionWithStatusTest.scala +++ b/doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieSingleResultFunctionWithStatusTest.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.doobiedb +package za.co.absa.fadb.doobie import cats.effect.IO import cats.effect.unsafe.implicits.global @@ -24,7 +24,7 @@ import doobie.util.Read import doobie.util.invariant.NonNullableColumnRead import org.scalatest.funsuite.AnyFunSuite import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.doobiedb.DoobieFunction.DoobieSingleResultFunctionWithStatus +import za.co.absa.fadb.doobie.DoobieFunction.DoobieSingleResultFunctionWithStatus import za.co.absa.fadb.status.handling.implementations.StandardStatusHandling class DoobieSingleResultFunctionWithStatusTest extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieTest.scala b/doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieTest.scala similarity index 97% rename from doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieTest.scala rename to doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieTest.scala index a3778c74..36f5c5f9 100644 --- a/doobie/src/it/scala/za/co/absa/fadb/doobiedb/DoobieTest.scala +++ b/doobie/src/it/scala/za/co/absa/fadb/doobie/DoobieTest.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.doobiedb +package za.co.absa.fadb.doobie import cats.effect.IO import doobie.util.transactor.Transactor diff --git a/doobie/src/main/scala/za/co/absa/fadb/doobiedb/DoobieEngine.scala b/doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieEngine.scala similarity index 99% rename from doobie/src/main/scala/za/co/absa/fadb/doobiedb/DoobieEngine.scala rename to doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieEngine.scala index cf7e105d..d33585b1 100644 --- a/doobie/src/main/scala/za/co/absa/fadb/doobiedb/DoobieEngine.scala +++ b/doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieEngine.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.doobiedb +package za.co.absa.fadb.doobie import cats.effect.Async import cats.implicits._ diff --git a/doobie/src/main/scala/za/co/absa/fadb/doobiedb/DoobieFunction.scala b/doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieFunction.scala similarity index 97% rename from doobie/src/main/scala/za/co/absa/fadb/doobiedb/DoobieFunction.scala rename to doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieFunction.scala index d289b97f..14be3b82 100644 --- a/doobie/src/main/scala/za/co/absa/fadb/doobiedb/DoobieFunction.scala +++ b/doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieFunction.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.doobiedb +package za.co.absa.fadb.doobie import cats.Monad import cats.effect.kernel.Async @@ -39,7 +39,7 @@ trait DoobieFunctionBase[R] { * @tparam I the input type of the function * @tparam R the result type of the function */ -private[doobiedb] trait DoobieFunction[I, R] extends DoobieFunctionBase[R] { +private[doobie] trait DoobieFunction[I, R] extends DoobieFunctionBase[R] { /** * Generates a Doobie `Fragment` representing the SQL query for the function. * @@ -57,7 +57,7 @@ private[doobiedb] trait DoobieFunction[I, R] extends DoobieFunctionBase[R] { protected def query(values: I): DoobieQuery[R] = new DoobieQuery[R](sql(values)) } -private[doobiedb] trait DoobieFunctionWithStatus[I, R] extends DoobieFunctionBase[R] { +private[doobie] trait DoobieFunctionWithStatus[I, R] extends DoobieFunctionBase[R] { /** * The `Read[StatusWithData[R]]` instance used to read the query result with status into `StatusWithData[R]`. */ diff --git a/doobie/src/main/scala/za/co/absa/fadb/doobiedb/DoobieQuery.scala b/doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieQuery.scala similarity index 98% rename from doobie/src/main/scala/za/co/absa/fadb/doobiedb/DoobieQuery.scala rename to doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieQuery.scala index a398d309..0909d363 100644 --- a/doobie/src/main/scala/za/co/absa/fadb/doobiedb/DoobieQuery.scala +++ b/doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieQuery.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.doobiedb +package za.co.absa.fadb.doobie import doobie.util.Read import doobie.util.fragment.Fragment diff --git a/doobie/src/main/scala/za/co/absa/fadb/doobiedb/StatusWithData.scala b/doobie/src/main/scala/za/co/absa/fadb/doobie/StatusWithData.scala similarity index 95% rename from doobie/src/main/scala/za/co/absa/fadb/doobiedb/StatusWithData.scala rename to doobie/src/main/scala/za/co/absa/fadb/doobie/StatusWithData.scala index 88153ae6..fefaebd5 100644 --- a/doobie/src/main/scala/za/co/absa/fadb/doobiedb/StatusWithData.scala +++ b/doobie/src/main/scala/za/co/absa/fadb/doobie/StatusWithData.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.doobiedb +package za.co.absa.fadb.doobie /** * Represents a function status with data.