From f56e43a0959b3fbd86fe58db1ca45bdc9d4c8675 Mon Sep 17 00:00:00 2001 From: David Benedeki Date: Fri, 28 Jun 2024 17:15:49 +0200 Subject: [PATCH 1/4] #125: Move code into sub-package db * moving code into `db` sub-package * tests are not executed in parallel --- build.sbt | 30 ++++++++----------- .../za/co/absa/{ => db}/fadb/DBEngine.scala | 4 +-- .../za/co/absa/{ => db}/fadb/DBFunction.scala | 8 ++--- .../absa/{ => db}/fadb/DBFunctionFabric.scala | 2 +- .../za/co/absa/{ => db}/fadb/DBSchema.scala | 4 +-- .../za/co/absa/{ => db}/fadb/Query.scala | 4 +-- .../fadb/exceptions/NamingException.scala | 2 +- .../fadb/exceptions/StatusException.scala | 4 +-- .../fadb/naming/ExplicitNamingRequired.scala | 4 +-- .../{ => db}/fadb/naming/LettersCase.scala | 2 +- .../fadb/naming/NamingConvention.scala | 2 +- .../naming/implementations/AsIsNaming.scala | 4 +-- .../implementations/SnakeCaseNaming.scala | 4 +-- .../za/co/absa/{ => db}/fadb/status/README.md | 0 .../status/aggregation/StatusAggregator.scala | 6 ++-- .../ByFirstErrorStatusAggregator.scala | 6 ++-- .../ByFirstRowStatusAggregator.scala | 6 ++-- .../ByMajorityErrorsStatusAggregator.scala | 6 ++-- .../fadb/status/handling/StatusHandling.scala | 4 +-- .../StandardStatusHandling.scala | 8 ++--- .../UserDefinedStatusHandling.scala | 8 ++--- .../absa/{ => db}/fadb/status/package.scala | 4 +-- .../fadb/DBFunctionFabricUnitTests.scala | 4 +-- .../{ => db}/fadb/DBFunctionUnitTests.scala | 8 ++--- .../{ => db}/fadb/DBSchemaUnitTests.scala | 6 ++-- ...NamingRequiredPerConventionUnitTests.scala | 4 +-- .../ExplicitNamingRequiredUnitTests.scala | 4 +-- .../implementations/AsIsNamingUnitTests.scala | 4 +-- .../SnakeCaseNamingUnitTests.scala | 4 +-- .../status/StatusExceptionUnitTests.scala | 4 +-- .../StatusAggregatorUnitTests.scala | 6 ++-- ...yFirstErrorStatusAggregatorUnitTests.scala | 6 ++-- .../ByFirstRowStatusAggregatorUnitTests.scala | 6 ++-- ...orityErrorsStatusAggregatorUnitTests.scala | 6 ++-- .../StandardStatusHandlingUnitTests.scala | 6 ++-- .../{ => db}/fadb/doobie/DoobieEngine.scala | 6 ++-- .../{ => db}/fadb/doobie/DoobieFunction.scala | 8 ++--- .../{ => db}/fadb/doobie/DoobieQuery.scala | 6 ++-- .../{ => db}/fadb/doobie/StatusWithData.scala | 2 +- .../AvailableMetaInstancesUnitTests.scala | 2 +- .../doobie/DatesTimesIntegrationTests.scala | 8 ++--- ...ltipleResultFunctionIntegrationTests.scala | 6 ++-- ...unctionWithAggStatusIntegrationTests.scala | 12 ++++---- ...ltFunctionWithStatusIntegrationTests.scala | 12 ++++---- ...tionalResultFunctionIntegrationTests.scala | 6 ++-- .../DoobieOtherTypesIntegrationTests.scala | 12 ++++---- ...SingleResultFunctionIntegrationTests.scala | 6 ++-- ...ltFunctionWithStatusIntegrationTests.scala | 10 +++---- .../{ => db}/fadb/doobie/DoobieTest.scala | 6 ++-- publish.sbt | 2 +- .../fadb/slick/FaDbPostgresProfile.scala | 4 +-- .../{ => db}/fadb/slick/SlickFunction.scala | 8 ++--- .../{ => db}/fadb/slick/SlickPgEngine.scala | 6 ++-- .../absa/{ => db}/fadb/slick/SlickQuery.scala | 6 ++-- .../fadb/slick/support/PgUUIDSupport.scala | 2 +- .../co/absa/{ => db}/fadb/slick/Actor.scala | 2 +- .../fadb/slick/ActorSlickConverter.scala | 2 +- .../FaDbPostgresProfileIntegrationTests.scala | 10 +++---- .../slick/OptionalActorSlickConverter.scala | 2 +- ...ltipleResultFunctionIntegrationTests.scala | 8 ++--- ...unctionWithAggStatusIntegrationTests.scala | 14 ++++----- ...ltFunctionWithStatusIntegrationTests.scala | 12 ++++---- ...tionalResultFunctionIntegrationTests.scala | 8 ++--- ...ltFunctionWithStatusIntegrationTests.scala | 10 +++---- .../absa/{ => db}/fadb/slick/SlickTest.scala | 6 ++-- 65 files changed, 195 insertions(+), 199 deletions(-) rename core/src/main/scala/za/co/absa/{ => db}/fadb/DBEngine.scala (97%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/DBFunction.scala (98%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/DBFunctionFabric.scala (98%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/DBSchema.scala (96%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/Query.scala (96%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/exceptions/NamingException.scala (95%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/exceptions/StatusException.scala (95%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/naming/ExplicitNamingRequired.scala (95%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/naming/LettersCase.scala (97%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/naming/NamingConvention.scala (98%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/naming/implementations/AsIsNaming.scala (93%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/naming/implementations/SnakeCaseNaming.scala (94%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/status/README.md (100%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/status/aggregation/StatusAggregator.scala (92%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/status/aggregation/implementations/ByFirstErrorStatusAggregator.scala (88%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/status/aggregation/implementations/ByFirstRowStatusAggregator.scala (88%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/status/aggregation/implementations/ByMajorityErrorsStatusAggregator.scala (91%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/status/handling/StatusHandling.scala (92%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/status/handling/implementations/StandardStatusHandling.scala (88%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/status/handling/implementations/UserDefinedStatusHandling.scala (81%) rename core/src/main/scala/za/co/absa/{ => db}/fadb/status/package.scala (95%) rename core/src/test/scala/za/co/absa/{ => db}/fadb/DBFunctionFabricUnitTests.scala (93%) rename core/src/test/scala/za/co/absa/{ => db}/fadb/DBFunctionUnitTests.scala (91%) rename core/src/test/scala/za/co/absa/{ => db}/fadb/DBSchemaUnitTests.scala (91%) rename core/src/test/scala/za/co/absa/{ => db}/fadb/naming/ExplicitNamingRequiredPerConventionUnitTests.scala (93%) rename core/src/test/scala/za/co/absa/{ => db}/fadb/naming/ExplicitNamingRequiredUnitTests.scala (94%) rename core/src/test/scala/za/co/absa/{ => db}/fadb/naming/implementations/AsIsNamingUnitTests.scala (91%) rename core/src/test/scala/za/co/absa/{ => db}/fadb/naming/implementations/SnakeCaseNamingUnitTests.scala (94%) rename core/src/test/scala/za/co/absa/{ => db}/fadb/status/StatusExceptionUnitTests.scala (94%) rename core/src/test/scala/za/co/absa/{ => db}/fadb/status/aggregation/StatusAggregatorUnitTests.scala (95%) rename core/src/test/scala/za/co/absa/{ => db}/fadb/status/aggregation/implementations/ByFirstErrorStatusAggregatorUnitTests.scala (96%) rename core/src/test/scala/za/co/absa/{ => db}/fadb/status/aggregation/implementations/ByFirstRowStatusAggregatorUnitTests.scala (96%) rename core/src/test/scala/za/co/absa/{ => db}/fadb/status/aggregation/implementations/ByMajorityErrorsStatusAggregatorUnitTests.scala (97%) rename core/src/test/scala/za/co/absa/{ => db}/fadb/status/handling/implementations/StandardStatusHandlingUnitTests.scala (96%) rename doobie/src/main/scala/za/co/absa/{ => db}/fadb/doobie/DoobieEngine.scala (96%) rename doobie/src/main/scala/za/co/absa/{ => db}/fadb/doobie/DoobieFunction.scala (98%) rename doobie/src/main/scala/za/co/absa/{ => db}/fadb/doobie/DoobieQuery.scala (93%) rename doobie/src/main/scala/za/co/absa/{ => db}/fadb/doobie/StatusWithData.scala (97%) rename doobie/src/test/scala/za/co/absa/{ => db}/fadb/doobie/AvailableMetaInstancesUnitTests.scala (98%) rename doobie/src/test/scala/za/co/absa/{ => db}/fadb/doobie/DatesTimesIntegrationTests.scala (95%) rename doobie/src/test/scala/za/co/absa/{ => db}/fadb/doobie/DoobieMultipleResultFunctionIntegrationTests.scala (94%) rename doobie/src/test/scala/za/co/absa/{ => db}/fadb/doobie/DoobieMultipleResultFunctionWithAggStatusIntegrationTests.scala (90%) rename doobie/src/test/scala/za/co/absa/{ => db}/fadb/doobie/DoobieMultipleResultFunctionWithStatusIntegrationTests.scala (89%) rename doobie/src/test/scala/za/co/absa/{ => db}/fadb/doobie/DoobieOptionalResultFunctionIntegrationTests.scala (89%) rename doobie/src/test/scala/za/co/absa/{ => db}/fadb/doobie/DoobieOtherTypesIntegrationTests.scala (91%) rename doobie/src/test/scala/za/co/absa/{ => db}/fadb/doobie/DoobieSingleResultFunctionIntegrationTests.scala (91%) rename doobie/src/test/scala/za/co/absa/{ => db}/fadb/doobie/DoobieSingleResultFunctionWithStatusIntegrationTests.scala (92%) rename doobie/src/test/scala/za/co/absa/{ => db}/fadb/doobie/DoobieTest.scala (89%) rename slick/src/main/scala/za/co/absa/{ => db}/fadb/slick/FaDbPostgresProfile.scala (95%) rename slick/src/main/scala/za/co/absa/{ => db}/fadb/slick/SlickFunction.scala (97%) rename slick/src/main/scala/za/co/absa/{ => db}/fadb/slick/SlickPgEngine.scala (94%) rename slick/src/main/scala/za/co/absa/{ => db}/fadb/slick/SlickQuery.scala (95%) rename slick/src/main/scala/za/co/absa/{ => db}/fadb/slick/support/PgUUIDSupport.scala (98%) rename slick/src/test/scala/za/co/absa/{ => db}/fadb/slick/Actor.scala (95%) rename slick/src/test/scala/za/co/absa/{ => db}/fadb/slick/ActorSlickConverter.scala (96%) rename slick/src/test/scala/za/co/absa/{ => db}/fadb/slick/FaDbPostgresProfileIntegrationTests.scala (95%) rename slick/src/test/scala/za/co/absa/{ => db}/fadb/slick/OptionalActorSlickConverter.scala (96%) rename slick/src/test/scala/za/co/absa/{ => db}/fadb/slick/SlickMultipleResultFunctionIntegrationTests.scala (89%) rename slick/src/test/scala/za/co/absa/{ => db}/fadb/slick/SlickMultipleResultFunctionWithAggStatusIntegrationTests.scala (83%) rename slick/src/test/scala/za/co/absa/{ => db}/fadb/slick/SlickMultipleResultFunctionWithStatusIntegrationTests.scala (85%) rename slick/src/test/scala/za/co/absa/{ => db}/fadb/slick/SlickOptionalResultFunctionIntegrationTests.scala (89%) rename slick/src/test/scala/za/co/absa/{ => db}/fadb/slick/SlickSingleResultFunctionWithStatusIntegrationTests.scala (85%) rename slick/src/test/scala/za/co/absa/{ => db}/fadb/slick/SlickTest.scala (87%) diff --git a/build.sbt b/build.sbt index 4653289f..187d6f35 100644 --- a/build.sbt +++ b/build.sbt @@ -48,6 +48,14 @@ lazy val commonJacocoReportSettings: JacocoReportSettings = JacocoReportSettings lazy val commonJacocoExcludes: Seq[String] = Seq( ) +lazy val commonSettings = Seq( + javacOptions ++= commonJavacOptions, + scalacOptions ++= commonScalacOptions, + Test / parallelExecution := false, + (Compile / compile) := ((Compile / compile) dependsOn printScalaVersion).value, // printScalaVersion is run with compile + jacocoExcludes := commonJacocoExcludes +) + lazy val parent = (project in file(".")) .aggregate(faDbCore, faDBSlick, faDBDoobie) .settings( @@ -59,42 +67,30 @@ lazy val parent = (project in file(".")) ) lazy val faDbCore = (project in file("core")) + .settings(commonSettings: _*) .settings( name := "core", libraryDependencies ++= coreDependencies(scalaVersion.value), - javacOptions ++= commonJavacOptions, - scalacOptions ++= commonScalacOptions, - (Compile / compile) := ((Compile / compile) dependsOn printScalaVersion).value, // printScalaVersion is run with compile - ) - .settings( jacocoReportSettings := commonJacocoReportSettings.withTitle(s"fa-db:core Jacoco Report - scala:${scalaVersion.value}"), - jacocoExcludes := commonJacocoExcludes ) lazy val faDBSlick = (project in file("slick")) + .settings(commonSettings: _*) .settings( name := "slick", libraryDependencies ++= slickDependencies(scalaVersion.value), - javacOptions ++= commonJavacOptions, - scalacOptions ++= commonScalacOptions, - (Compile / compile) := ((Compile / compile) dependsOn printScalaVersion).value, // printScalaVersion is run with compile - ).dependsOn(faDbCore) - .settings( jacocoReportSettings := commonJacocoReportSettings.withTitle(s"fa-db:slick Jacoco Report - scala:${scalaVersion.value}"), - jacocoExcludes := commonJacocoExcludes ) + .dependsOn(faDbCore) lazy val faDBDoobie = (project in file("doobie")) + .settings(commonSettings: _*) .settings( name := "doobie", libraryDependencies ++= doobieDependencies(scalaVersion.value), - javacOptions ++= commonJavacOptions, - scalacOptions ++= commonScalacOptions, - ).dependsOn(faDbCore) - .settings( jacocoReportSettings := commonJacocoReportSettings.withTitle(s"fa-db:doobie Jacoco Report - scala:${scalaVersion.value}"), - jacocoExcludes := commonJacocoExcludes ) + .dependsOn(faDbCore) lazy val flywaySettings = project .enablePlugins(FlywayPlugin) diff --git a/core/src/main/scala/za/co/absa/fadb/DBEngine.scala b/core/src/main/scala/za/co/absa/db/fadb/DBEngine.scala similarity index 97% rename from core/src/main/scala/za/co/absa/fadb/DBEngine.scala rename to core/src/main/scala/za/co/absa/db/fadb/DBEngine.scala index 2e9db29d..c4619944 100644 --- a/core/src/main/scala/za/co/absa/fadb/DBEngine.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/DBEngine.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package za.co.absa.fadb +package za.co.absa.db.fadb import cats.Monad import cats.implicits.toFunctorOps -import za.co.absa.fadb.status.FailedOrRow +import za.co.absa.db.fadb.status.FailedOrRow import scala.language.higherKinds diff --git a/core/src/main/scala/za/co/absa/fadb/DBFunction.scala b/core/src/main/scala/za/co/absa/db/fadb/DBFunction.scala similarity index 98% rename from core/src/main/scala/za/co/absa/fadb/DBFunction.scala rename to core/src/main/scala/za/co/absa/db/fadb/DBFunction.scala index 03becddc..68c253f2 100644 --- a/core/src/main/scala/za/co/absa/fadb/DBFunction.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/DBFunction.scala @@ -14,13 +14,13 @@ * limitations under the License. */ -package za.co.absa.fadb +package za.co.absa.db.fadb import cats.MonadError import cats.implicits.toFlatMapOps -import za.co.absa.fadb.status.aggregation.StatusAggregator -import za.co.absa.fadb.status.handling.StatusHandling -import za.co.absa.fadb.status.{FailedOrRows, FailedOrRow, Row} +import za.co.absa.db.fadb.status.aggregation.StatusAggregator +import za.co.absa.db.fadb.status.handling.StatusHandling +import za.co.absa.db.fadb.status.{FailedOrRows, FailedOrRow, Row} import scala.language.higherKinds diff --git a/core/src/main/scala/za/co/absa/fadb/DBFunctionFabric.scala b/core/src/main/scala/za/co/absa/db/fadb/DBFunctionFabric.scala similarity index 98% rename from core/src/main/scala/za/co/absa/fadb/DBFunctionFabric.scala rename to core/src/main/scala/za/co/absa/db/fadb/DBFunctionFabric.scala index 1fb39a1c..a29c1d50 100644 --- a/core/src/main/scala/za/co/absa/fadb/DBFunctionFabric.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/DBFunctionFabric.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb +package za.co.absa.db.fadb /** * This trait serves the purpose of introducing functions that are common to all DB Function objects and mix-in traits diff --git a/core/src/main/scala/za/co/absa/fadb/DBSchema.scala b/core/src/main/scala/za/co/absa/db/fadb/DBSchema.scala similarity index 96% rename from core/src/main/scala/za/co/absa/fadb/DBSchema.scala rename to core/src/main/scala/za/co/absa/db/fadb/DBSchema.scala index 8fadd6d2..b77d8702 100644 --- a/core/src/main/scala/za/co/absa/fadb/DBSchema.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/DBSchema.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package za.co.absa.fadb +package za.co.absa.db.fadb -import za.co.absa.fadb.naming.NamingConvention +import za.co.absa.db.fadb.naming.NamingConvention /** * An abstract class, an ancestor to represent a database schema diff --git a/core/src/main/scala/za/co/absa/fadb/Query.scala b/core/src/main/scala/za/co/absa/db/fadb/Query.scala similarity index 96% rename from core/src/main/scala/za/co/absa/fadb/Query.scala rename to core/src/main/scala/za/co/absa/db/fadb/Query.scala index e6ab348a..ecb2ab09 100644 --- a/core/src/main/scala/za/co/absa/fadb/Query.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/Query.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package za.co.absa.fadb +package za.co.absa.db.fadb -import za.co.absa.fadb.status.{FailedOrRow, Row} +import za.co.absa.db.fadb.status.{FailedOrRow, Row} /** * The basis for all query types of [[DBEngine]] implementations diff --git a/core/src/main/scala/za/co/absa/fadb/exceptions/NamingException.scala b/core/src/main/scala/za/co/absa/db/fadb/exceptions/NamingException.scala similarity index 95% rename from core/src/main/scala/za/co/absa/fadb/exceptions/NamingException.scala rename to core/src/main/scala/za/co/absa/db/fadb/exceptions/NamingException.scala index 4d4c4d56..14653354 100644 --- a/core/src/main/scala/za/co/absa/fadb/exceptions/NamingException.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/exceptions/NamingException.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.exceptions +package za.co.absa.db.fadb.exceptions /** * Exception thrown when a naming convention is not found for a given string diff --git a/core/src/main/scala/za/co/absa/fadb/exceptions/StatusException.scala b/core/src/main/scala/za/co/absa/db/fadb/exceptions/StatusException.scala similarity index 95% rename from core/src/main/scala/za/co/absa/fadb/exceptions/StatusException.scala rename to core/src/main/scala/za/co/absa/db/fadb/exceptions/StatusException.scala index f25d5802..1a0fe128 100644 --- a/core/src/main/scala/za/co/absa/fadb/exceptions/StatusException.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/exceptions/StatusException.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package za.co.absa.fadb.exceptions +package za.co.absa.db.fadb.exceptions -import za.co.absa.fadb.status.FunctionStatus +import za.co.absa.db.fadb.status.FunctionStatus /** * Represents an exception that is returned when the function status is not successful. diff --git a/core/src/main/scala/za/co/absa/fadb/naming/ExplicitNamingRequired.scala b/core/src/main/scala/za/co/absa/db/fadb/naming/ExplicitNamingRequired.scala similarity index 95% rename from core/src/main/scala/za/co/absa/fadb/naming/ExplicitNamingRequired.scala rename to core/src/main/scala/za/co/absa/db/fadb/naming/ExplicitNamingRequired.scala index b0fbde12..afc42d2a 100644 --- a/core/src/main/scala/za/co/absa/fadb/naming/ExplicitNamingRequired.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/naming/ExplicitNamingRequired.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package za.co.absa.fadb.naming +package za.co.absa.db.fadb.naming -import za.co.absa.fadb.exceptions.NamingException +import za.co.absa.db.fadb.exceptions.NamingException /** * `ExplicitNamingRequired` is a `NamingConvention` that throws a `NamingConvention` for any string. diff --git a/core/src/main/scala/za/co/absa/fadb/naming/LettersCase.scala b/core/src/main/scala/za/co/absa/db/fadb/naming/LettersCase.scala similarity index 97% rename from core/src/main/scala/za/co/absa/fadb/naming/LettersCase.scala rename to core/src/main/scala/za/co/absa/db/fadb/naming/LettersCase.scala index 471dc1c1..1410e3ef 100644 --- a/core/src/main/scala/za/co/absa/fadb/naming/LettersCase.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/naming/LettersCase.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.naming +package za.co.absa.db.fadb.naming /** * `LettersCase` is a sealed trait that represents different cases of letters. diff --git a/core/src/main/scala/za/co/absa/fadb/naming/NamingConvention.scala b/core/src/main/scala/za/co/absa/db/fadb/naming/NamingConvention.scala similarity index 98% rename from core/src/main/scala/za/co/absa/fadb/naming/NamingConvention.scala rename to core/src/main/scala/za/co/absa/db/fadb/naming/NamingConvention.scala index b5adadfa..59a5db7c 100644 --- a/core/src/main/scala/za/co/absa/fadb/naming/NamingConvention.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/naming/NamingConvention.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.naming +package za.co.absa.db.fadb.naming /** * `NamingConvention` is a base trait that defines the interface for different naming conventions. diff --git a/core/src/main/scala/za/co/absa/fadb/naming/implementations/AsIsNaming.scala b/core/src/main/scala/za/co/absa/db/fadb/naming/implementations/AsIsNaming.scala similarity index 93% rename from core/src/main/scala/za/co/absa/fadb/naming/implementations/AsIsNaming.scala rename to core/src/main/scala/za/co/absa/db/fadb/naming/implementations/AsIsNaming.scala index 926cd00c..bdfc493c 100644 --- a/core/src/main/scala/za/co/absa/fadb/naming/implementations/AsIsNaming.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/naming/implementations/AsIsNaming.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package za.co.absa.fadb.naming.implementations +package za.co.absa.db.fadb.naming.implementations -import za.co.absa.fadb.naming.{LettersCase, NamingConvention} +import za.co.absa.db.fadb.naming.{LettersCase, NamingConvention} import LettersCase.AsIs /** diff --git a/core/src/main/scala/za/co/absa/fadb/naming/implementations/SnakeCaseNaming.scala b/core/src/main/scala/za/co/absa/db/fadb/naming/implementations/SnakeCaseNaming.scala similarity index 94% rename from core/src/main/scala/za/co/absa/fadb/naming/implementations/SnakeCaseNaming.scala rename to core/src/main/scala/za/co/absa/db/fadb/naming/implementations/SnakeCaseNaming.scala index 7362ea2c..dfc49319 100644 --- a/core/src/main/scala/za/co/absa/fadb/naming/implementations/SnakeCaseNaming.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/naming/implementations/SnakeCaseNaming.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package za.co.absa.fadb.naming.implementations +package za.co.absa.db.fadb.naming.implementations -import za.co.absa.fadb.naming.{LettersCase, NamingConvention} +import za.co.absa.db.fadb.naming.{LettersCase, NamingConvention} import LettersCase.LowerCase /** diff --git a/core/src/main/scala/za/co/absa/fadb/status/README.md b/core/src/main/scala/za/co/absa/db/fadb/status/README.md similarity index 100% rename from core/src/main/scala/za/co/absa/fadb/status/README.md rename to core/src/main/scala/za/co/absa/db/fadb/status/README.md diff --git a/core/src/main/scala/za/co/absa/fadb/status/aggregation/StatusAggregator.scala b/core/src/main/scala/za/co/absa/db/fadb/status/aggregation/StatusAggregator.scala similarity index 92% rename from core/src/main/scala/za/co/absa/fadb/status/aggregation/StatusAggregator.scala rename to core/src/main/scala/za/co/absa/db/fadb/status/aggregation/StatusAggregator.scala index 6b22e12a..d9d0f0a8 100644 --- a/core/src/main/scala/za/co/absa/fadb/status/aggregation/StatusAggregator.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/status/aggregation/StatusAggregator.scala @@ -14,10 +14,10 @@ * limitations under the License. */ -package za.co.absa.fadb.status.aggregation +package za.co.absa.db.fadb.status.aggregation -import za.co.absa.fadb.exceptions.StatusException -import za.co.absa.fadb.status.{FailedOrRows, FailedOrRow, Row} +import za.co.absa.db.fadb.exceptions.StatusException +import za.co.absa.db.fadb.status.{FailedOrRows, FailedOrRow, Row} /** * `StatusAggregator` is a base trait that defines the interface for aggregating the error statuses of a function diff --git a/core/src/main/scala/za/co/absa/fadb/status/aggregation/implementations/ByFirstErrorStatusAggregator.scala b/core/src/main/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByFirstErrorStatusAggregator.scala similarity index 88% rename from core/src/main/scala/za/co/absa/fadb/status/aggregation/implementations/ByFirstErrorStatusAggregator.scala rename to core/src/main/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByFirstErrorStatusAggregator.scala index ec14366d..8598c658 100644 --- a/core/src/main/scala/za/co/absa/fadb/status/aggregation/implementations/ByFirstErrorStatusAggregator.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByFirstErrorStatusAggregator.scala @@ -14,10 +14,10 @@ * limitations under the License. */ -package za.co.absa.fadb.status.aggregation.implementations +package za.co.absa.db.fadb.status.aggregation.implementations -import za.co.absa.fadb.status.aggregation.StatusAggregator -import za.co.absa.fadb.status.{FailedOrRows, FailedOrRow} +import za.co.absa.db.fadb.status.aggregation.StatusAggregator +import za.co.absa.db.fadb.status.{FailedOrRows, FailedOrRow} /** * `ByFirstErrorStatusAggregator` is a trait that extends the `StatusAggregator` interface. diff --git a/core/src/main/scala/za/co/absa/fadb/status/aggregation/implementations/ByFirstRowStatusAggregator.scala b/core/src/main/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByFirstRowStatusAggregator.scala similarity index 88% rename from core/src/main/scala/za/co/absa/fadb/status/aggregation/implementations/ByFirstRowStatusAggregator.scala rename to core/src/main/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByFirstRowStatusAggregator.scala index 8de4cda9..1eb73330 100644 --- a/core/src/main/scala/za/co/absa/fadb/status/aggregation/implementations/ByFirstRowStatusAggregator.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByFirstRowStatusAggregator.scala @@ -14,10 +14,10 @@ * limitations under the License. */ -package za.co.absa.fadb.status.aggregation.implementations +package za.co.absa.db.fadb.status.aggregation.implementations -import za.co.absa.fadb.status.aggregation.StatusAggregator -import za.co.absa.fadb.status.{FailedOrRows, FailedOrRow} +import za.co.absa.db.fadb.status.aggregation.StatusAggregator +import za.co.absa.db.fadb.status.{FailedOrRows, FailedOrRow} /** * `ByFirstRowStatusAggregator` is a trait that extends the `StatusAggregator` interface. diff --git a/core/src/main/scala/za/co/absa/fadb/status/aggregation/implementations/ByMajorityErrorsStatusAggregator.scala b/core/src/main/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByMajorityErrorsStatusAggregator.scala similarity index 91% rename from core/src/main/scala/za/co/absa/fadb/status/aggregation/implementations/ByMajorityErrorsStatusAggregator.scala rename to core/src/main/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByMajorityErrorsStatusAggregator.scala index 45b8720a..162c7d86 100644 --- a/core/src/main/scala/za/co/absa/fadb/status/aggregation/implementations/ByMajorityErrorsStatusAggregator.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByMajorityErrorsStatusAggregator.scala @@ -14,10 +14,10 @@ * limitations under the License. */ -package za.co.absa.fadb.status.aggregation.implementations +package za.co.absa.db.fadb.status.aggregation.implementations -import za.co.absa.fadb.status.aggregation.StatusAggregator -import za.co.absa.fadb.status.{FailedOrRows, FailedOrRow} +import za.co.absa.db.fadb.status.aggregation.StatusAggregator +import za.co.absa.db.fadb.status.{FailedOrRows, FailedOrRow} /** * `ByMajorityErrorsStatusAggregator` is a trait that extends the `StatusAggregator` interface. diff --git a/core/src/main/scala/za/co/absa/fadb/status/handling/StatusHandling.scala b/core/src/main/scala/za/co/absa/db/fadb/status/handling/StatusHandling.scala similarity index 92% rename from core/src/main/scala/za/co/absa/fadb/status/handling/StatusHandling.scala rename to core/src/main/scala/za/co/absa/db/fadb/status/handling/StatusHandling.scala index 2e34f67c..bb85da90 100644 --- a/core/src/main/scala/za/co/absa/fadb/status/handling/StatusHandling.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/status/handling/StatusHandling.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package za.co.absa.fadb.status.handling +package za.co.absa.db.fadb.status.handling -import za.co.absa.fadb.status.{FailedOrRow, Row} +import za.co.absa.db.fadb.status.{FailedOrRow, Row} /** * `StatusHandling` is a base trait that defines the interface for handling the status of a function invocation. diff --git a/core/src/main/scala/za/co/absa/fadb/status/handling/implementations/StandardStatusHandling.scala b/core/src/main/scala/za/co/absa/db/fadb/status/handling/implementations/StandardStatusHandling.scala similarity index 88% rename from core/src/main/scala/za/co/absa/fadb/status/handling/implementations/StandardStatusHandling.scala rename to core/src/main/scala/za/co/absa/db/fadb/status/handling/implementations/StandardStatusHandling.scala index cd2e3ff9..68c0dfcd 100644 --- a/core/src/main/scala/za/co/absa/fadb/status/handling/implementations/StandardStatusHandling.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/status/handling/implementations/StandardStatusHandling.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package za.co.absa.fadb.status.handling.implementations +package za.co.absa.db.fadb.status.handling.implementations -import za.co.absa.fadb.exceptions._ -import za.co.absa.fadb.status.{FailedOrRow, Row} -import za.co.absa.fadb.status.handling.StatusHandling +import za.co.absa.db.fadb.exceptions._ +import za.co.absa.db.fadb.status.{FailedOrRow, Row} +import za.co.absa.db.fadb.status.handling.StatusHandling /** * `StandardStatusHandling` is a trait that extends the `StatusHandling` interface. diff --git a/core/src/main/scala/za/co/absa/fadb/status/handling/implementations/UserDefinedStatusHandling.scala b/core/src/main/scala/za/co/absa/db/fadb/status/handling/implementations/UserDefinedStatusHandling.scala similarity index 81% rename from core/src/main/scala/za/co/absa/fadb/status/handling/implementations/UserDefinedStatusHandling.scala rename to core/src/main/scala/za/co/absa/db/fadb/status/handling/implementations/UserDefinedStatusHandling.scala index 548a004b..c1e81953 100644 --- a/core/src/main/scala/za/co/absa/fadb/status/handling/implementations/UserDefinedStatusHandling.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/status/handling/implementations/UserDefinedStatusHandling.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package za.co.absa.fadb.status.handling.implementations +package za.co.absa.db.fadb.status.handling.implementations -import za.co.absa.fadb.exceptions.OtherStatusException -import za.co.absa.fadb.status.handling.StatusHandling -import za.co.absa.fadb.status.{FailedOrRow, Row} +import za.co.absa.db.fadb.exceptions.OtherStatusException +import za.co.absa.db.fadb.status.handling.StatusHandling +import za.co.absa.db.fadb.status.{FailedOrRow, Row} /** * Trait represents user defined status handling diff --git a/core/src/main/scala/za/co/absa/fadb/status/package.scala b/core/src/main/scala/za/co/absa/db/fadb/status/package.scala similarity index 95% rename from core/src/main/scala/za/co/absa/fadb/status/package.scala rename to core/src/main/scala/za/co/absa/db/fadb/status/package.scala index 38f9aa2a..eae596b0 100644 --- a/core/src/main/scala/za/co/absa/fadb/status/package.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/status/package.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package za.co.absa.fadb +package za.co.absa.db.fadb -import za.co.absa.fadb.exceptions.StatusException +import za.co.absa.db.fadb.exceptions.StatusException package object status { diff --git a/core/src/test/scala/za/co/absa/fadb/DBFunctionFabricUnitTests.scala b/core/src/test/scala/za/co/absa/db/fadb/DBFunctionFabricUnitTests.scala similarity index 93% rename from core/src/test/scala/za/co/absa/fadb/DBFunctionFabricUnitTests.scala rename to core/src/test/scala/za/co/absa/db/fadb/DBFunctionFabricUnitTests.scala index 3745bf9c..32cfb663 100644 --- a/core/src/test/scala/za/co/absa/fadb/DBFunctionFabricUnitTests.scala +++ b/core/src/test/scala/za/co/absa/db/fadb/DBFunctionFabricUnitTests.scala @@ -1,8 +1,8 @@ -package za.co.absa.fadb +package za.co.absa.db.fadb import org.scalatest.funsuite.AnyFunSuiteLike -import za.co.absa.fadb.naming.implementations.SnakeCaseNaming.Implicits._ +import za.co.absa.db.fadb.naming.implementations.SnakeCaseNaming.Implicits._ class DBFunctionFabricUnitTests extends AnyFunSuiteLike { diff --git a/core/src/test/scala/za/co/absa/fadb/DBFunctionUnitTests.scala b/core/src/test/scala/za/co/absa/db/fadb/DBFunctionUnitTests.scala similarity index 91% rename from core/src/test/scala/za/co/absa/fadb/DBFunctionUnitTests.scala rename to core/src/test/scala/za/co/absa/db/fadb/DBFunctionUnitTests.scala index 618e99b9..4a2eda4b 100644 --- a/core/src/test/scala/za/co/absa/fadb/DBFunctionUnitTests.scala +++ b/core/src/test/scala/za/co/absa/db/fadb/DBFunctionUnitTests.scala @@ -14,14 +14,14 @@ * limitations under the License. */ -package za.co.absa.fadb +package za.co.absa.db.fadb import cats.MonadError import cats.implicits._ import org.scalatest.funsuite.AnyFunSuite -import za.co.absa.fadb.DBFunction.DBSingleResultFunction -import za.co.absa.fadb.naming.implementations.SnakeCaseNaming.Implicits.namingConvention -import za.co.absa.fadb.status.FailedOrRow +import za.co.absa.db.fadb.DBFunction.DBSingleResultFunction +import za.co.absa.db.fadb.naming.implementations.SnakeCaseNaming.Implicits.namingConvention +import za.co.absa.db.fadb.status.FailedOrRow import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future diff --git a/core/src/test/scala/za/co/absa/fadb/DBSchemaUnitTests.scala b/core/src/test/scala/za/co/absa/db/fadb/DBSchemaUnitTests.scala similarity index 91% rename from core/src/test/scala/za/co/absa/fadb/DBSchemaUnitTests.scala rename to core/src/test/scala/za/co/absa/db/fadb/DBSchemaUnitTests.scala index 28d773f7..e6e31715 100644 --- a/core/src/test/scala/za/co/absa/fadb/DBSchemaUnitTests.scala +++ b/core/src/test/scala/za/co/absa/db/fadb/DBSchemaUnitTests.scala @@ -13,11 +13,11 @@ * limitations under the License. */ -package za.co.absa.fadb +package za.co.absa.db.fadb import org.scalatest.funsuite.AnyFunSuite -import za.co.absa.fadb.naming.NamingConvention -import za.co.absa.fadb.naming.implementations.SnakeCaseNaming.Implicits.namingConvention +import za.co.absa.db.fadb.naming.NamingConvention +import za.co.absa.db.fadb.naming.implementations.SnakeCaseNaming.Implicits.namingConvention class DBSchemaUnitTests extends AnyFunSuite { diff --git a/core/src/test/scala/za/co/absa/fadb/naming/ExplicitNamingRequiredPerConventionUnitTests.scala b/core/src/test/scala/za/co/absa/db/fadb/naming/ExplicitNamingRequiredPerConventionUnitTests.scala similarity index 93% rename from core/src/test/scala/za/co/absa/fadb/naming/ExplicitNamingRequiredPerConventionUnitTests.scala rename to core/src/test/scala/za/co/absa/db/fadb/naming/ExplicitNamingRequiredPerConventionUnitTests.scala index f638019d..325397b2 100644 --- a/core/src/test/scala/za/co/absa/fadb/naming/ExplicitNamingRequiredPerConventionUnitTests.scala +++ b/core/src/test/scala/za/co/absa/db/fadb/naming/ExplicitNamingRequiredPerConventionUnitTests.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package za.co.absa.fadb.naming +package za.co.absa.db.fadb.naming import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import za.co.absa.fadb.exceptions.NamingException +import za.co.absa.db.fadb.exceptions.NamingException class ExplicitNamingRequiredPerConventionUnitTests extends AnyWordSpec with Matchers { private val explicitNamingRequired = new ExplicitNamingRequired() diff --git a/core/src/test/scala/za/co/absa/fadb/naming/ExplicitNamingRequiredUnitTests.scala b/core/src/test/scala/za/co/absa/db/fadb/naming/ExplicitNamingRequiredUnitTests.scala similarity index 94% rename from core/src/test/scala/za/co/absa/fadb/naming/ExplicitNamingRequiredUnitTests.scala rename to core/src/test/scala/za/co/absa/db/fadb/naming/ExplicitNamingRequiredUnitTests.scala index 002516b0..b979cb63 100644 --- a/core/src/test/scala/za/co/absa/fadb/naming/ExplicitNamingRequiredUnitTests.scala +++ b/core/src/test/scala/za/co/absa/db/fadb/naming/ExplicitNamingRequiredUnitTests.scala @@ -14,10 +14,10 @@ * limitations under the License. */ -package za.co.absa.fadb.naming +package za.co.absa.db.fadb.naming import org.scalatest.funsuite.AnyFunSuiteLike -import za.co.absa.fadb.exceptions.NamingException +import za.co.absa.db.fadb.exceptions.NamingException class ExplicitNamingRequiredUnitTests extends AnyFunSuiteLike { diff --git a/core/src/test/scala/za/co/absa/fadb/naming/implementations/AsIsNamingUnitTests.scala b/core/src/test/scala/za/co/absa/db/fadb/naming/implementations/AsIsNamingUnitTests.scala similarity index 91% rename from core/src/test/scala/za/co/absa/fadb/naming/implementations/AsIsNamingUnitTests.scala rename to core/src/test/scala/za/co/absa/db/fadb/naming/implementations/AsIsNamingUnitTests.scala index d3893b59..4fb813cd 100644 --- a/core/src/test/scala/za/co/absa/fadb/naming/implementations/AsIsNamingUnitTests.scala +++ b/core/src/test/scala/za/co/absa/db/fadb/naming/implementations/AsIsNamingUnitTests.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package za.co.absa.fadb.naming.implementations +package za.co.absa.db.fadb.naming.implementations import org.scalatest.funsuite.AnyFunSuiteLike import org.scalatest.matchers.should.Matchers -import za.co.absa.fadb.naming.LettersCase +import za.co.absa.db.fadb.naming.LettersCase class AsIsNamingUnitTests extends AnyFunSuiteLike with Matchers { diff --git a/core/src/test/scala/za/co/absa/fadb/naming/implementations/SnakeCaseNamingUnitTests.scala b/core/src/test/scala/za/co/absa/db/fadb/naming/implementations/SnakeCaseNamingUnitTests.scala similarity index 94% rename from core/src/test/scala/za/co/absa/fadb/naming/implementations/SnakeCaseNamingUnitTests.scala rename to core/src/test/scala/za/co/absa/db/fadb/naming/implementations/SnakeCaseNamingUnitTests.scala index 1ac047d8..b3f62a7e 100644 --- a/core/src/test/scala/za/co/absa/fadb/naming/implementations/SnakeCaseNamingUnitTests.scala +++ b/core/src/test/scala/za/co/absa/db/fadb/naming/implementations/SnakeCaseNamingUnitTests.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package za.co.absa.fadb.naming.implementations +package za.co.absa.db.fadb.naming.implementations import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import za.co.absa.fadb.naming.LettersCase._ +import za.co.absa.db.fadb.naming.LettersCase._ class SnakeCaseNamingUnitTests extends AnyWordSpec with Matchers { private class ThisIsATestClass diff --git a/core/src/test/scala/za/co/absa/fadb/status/StatusExceptionUnitTests.scala b/core/src/test/scala/za/co/absa/db/fadb/status/StatusExceptionUnitTests.scala similarity index 94% rename from core/src/test/scala/za/co/absa/fadb/status/StatusExceptionUnitTests.scala rename to core/src/test/scala/za/co/absa/db/fadb/status/StatusExceptionUnitTests.scala index 6c5dddb6..86987411 100644 --- a/core/src/test/scala/za/co/absa/fadb/status/StatusExceptionUnitTests.scala +++ b/core/src/test/scala/za/co/absa/db/fadb/status/StatusExceptionUnitTests.scala @@ -14,10 +14,10 @@ * limitations under the License. */ -package za.co.absa.fadb.status +package za.co.absa.db.fadb.status import org.scalatest.funsuite.AnyFunSuite -import za.co.absa.fadb.exceptions._ +import za.co.absa.db.fadb.exceptions._ class StatusExceptionUnitTests extends AnyFunSuite { test("Test equals - when they are the same") { diff --git a/core/src/test/scala/za/co/absa/fadb/status/aggregation/StatusAggregatorUnitTests.scala b/core/src/test/scala/za/co/absa/db/fadb/status/aggregation/StatusAggregatorUnitTests.scala similarity index 95% rename from core/src/test/scala/za/co/absa/fadb/status/aggregation/StatusAggregatorUnitTests.scala rename to core/src/test/scala/za/co/absa/db/fadb/status/aggregation/StatusAggregatorUnitTests.scala index 64cdd50d..46312458 100644 --- a/core/src/test/scala/za/co/absa/fadb/status/aggregation/StatusAggregatorUnitTests.scala +++ b/core/src/test/scala/za/co/absa/db/fadb/status/aggregation/StatusAggregatorUnitTests.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package za.co.absa.fadb.status.aggregation +package za.co.absa.db.fadb.status.aggregation import org.scalatest.funsuite.AnyFunSuite -import za.co.absa.fadb.exceptions._ -import za.co.absa.fadb.status.{FunctionStatus, Row} +import za.co.absa.db.fadb.exceptions._ +import za.co.absa.db.fadb.status.{FunctionStatus, Row} class StatusAggregatorUnitTests extends AnyFunSuite { diff --git a/core/src/test/scala/za/co/absa/fadb/status/aggregation/implementations/ByFirstErrorStatusAggregatorUnitTests.scala b/core/src/test/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByFirstErrorStatusAggregatorUnitTests.scala similarity index 96% rename from core/src/test/scala/za/co/absa/fadb/status/aggregation/implementations/ByFirstErrorStatusAggregatorUnitTests.scala rename to core/src/test/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByFirstErrorStatusAggregatorUnitTests.scala index 584a39bd..773865fc 100644 --- a/core/src/test/scala/za/co/absa/fadb/status/aggregation/implementations/ByFirstErrorStatusAggregatorUnitTests.scala +++ b/core/src/test/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByFirstErrorStatusAggregatorUnitTests.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package za.co.absa.fadb.status.aggregation.implementations +package za.co.absa.db.fadb.status.aggregation.implementations import org.scalatest.funsuite.AnyFunSuiteLike -import za.co.absa.fadb.exceptions._ -import za.co.absa.fadb.status.{FunctionStatus, Row} +import za.co.absa.db.fadb.exceptions._ +import za.co.absa.db.fadb.status.{FunctionStatus, Row} class ByFirstErrorStatusAggregatorUnitTests extends AnyFunSuiteLike { diff --git a/core/src/test/scala/za/co/absa/fadb/status/aggregation/implementations/ByFirstRowStatusAggregatorUnitTests.scala b/core/src/test/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByFirstRowStatusAggregatorUnitTests.scala similarity index 96% rename from core/src/test/scala/za/co/absa/fadb/status/aggregation/implementations/ByFirstRowStatusAggregatorUnitTests.scala rename to core/src/test/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByFirstRowStatusAggregatorUnitTests.scala index e34558f9..45e8cf7e 100644 --- a/core/src/test/scala/za/co/absa/fadb/status/aggregation/implementations/ByFirstRowStatusAggregatorUnitTests.scala +++ b/core/src/test/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByFirstRowStatusAggregatorUnitTests.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package za.co.absa.fadb.status.aggregation.implementations +package za.co.absa.db.fadb.status.aggregation.implementations import org.scalatest.funsuite.AnyFunSuiteLike -import za.co.absa.fadb.exceptions._ -import za.co.absa.fadb.status.{FunctionStatus, Row} +import za.co.absa.db.fadb.exceptions._ +import za.co.absa.db.fadb.status.{FunctionStatus, Row} class ByFirstRowStatusAggregatorUnitTests extends AnyFunSuiteLike { diff --git a/core/src/test/scala/za/co/absa/fadb/status/aggregation/implementations/ByMajorityErrorsStatusAggregatorUnitTests.scala b/core/src/test/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByMajorityErrorsStatusAggregatorUnitTests.scala similarity index 97% rename from core/src/test/scala/za/co/absa/fadb/status/aggregation/implementations/ByMajorityErrorsStatusAggregatorUnitTests.scala rename to core/src/test/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByMajorityErrorsStatusAggregatorUnitTests.scala index 6c31051d..dc49de80 100644 --- a/core/src/test/scala/za/co/absa/fadb/status/aggregation/implementations/ByMajorityErrorsStatusAggregatorUnitTests.scala +++ b/core/src/test/scala/za/co/absa/db/fadb/status/aggregation/implementations/ByMajorityErrorsStatusAggregatorUnitTests.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package za.co.absa.fadb.status.aggregation.implementations +package za.co.absa.db.fadb.status.aggregation.implementations import org.scalatest.funsuite.AnyFunSuiteLike -import za.co.absa.fadb.exceptions._ -import za.co.absa.fadb.status.{FunctionStatus, Row} +import za.co.absa.db.fadb.exceptions._ +import za.co.absa.db.fadb.status.{FunctionStatus, Row} class ByMajorityErrorsStatusAggregatorUnitTests extends AnyFunSuiteLike { diff --git a/core/src/test/scala/za/co/absa/fadb/status/handling/implementations/StandardStatusHandlingUnitTests.scala b/core/src/test/scala/za/co/absa/db/fadb/status/handling/implementations/StandardStatusHandlingUnitTests.scala similarity index 96% rename from core/src/test/scala/za/co/absa/fadb/status/handling/implementations/StandardStatusHandlingUnitTests.scala rename to core/src/test/scala/za/co/absa/db/fadb/status/handling/implementations/StandardStatusHandlingUnitTests.scala index ce831a78..32a5dda7 100644 --- a/core/src/test/scala/za/co/absa/fadb/status/handling/implementations/StandardStatusHandlingUnitTests.scala +++ b/core/src/test/scala/za/co/absa/db/fadb/status/handling/implementations/StandardStatusHandlingUnitTests.scala @@ -14,12 +14,12 @@ * limitations under the License. */ -package za.co.absa.fadb.status.handling.implementations +package za.co.absa.db.fadb.status.handling.implementations import org.scalatest.funsuite.AnyFunSuiteLike import org.scalatest.matchers.should.Matchers.convertToAnyShouldWrapper -import za.co.absa.fadb.exceptions._ -import za.co.absa.fadb.status.{FunctionStatus, Row} +import za.co.absa.db.fadb.exceptions._ +import za.co.absa.db.fadb.status.{FunctionStatus, Row} class StandardStatusHandlingUnitTests extends AnyFunSuiteLike { diff --git a/doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieEngine.scala b/doobie/src/main/scala/za/co/absa/db/fadb/doobie/DoobieEngine.scala similarity index 96% rename from doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieEngine.scala rename to doobie/src/main/scala/za/co/absa/db/fadb/doobie/DoobieEngine.scala index 180ac534..1a14bfb5 100644 --- a/doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieEngine.scala +++ b/doobie/src/main/scala/za/co/absa/db/fadb/doobie/DoobieEngine.scala @@ -14,15 +14,15 @@ * limitations under the License. */ -package za.co.absa.fadb.doobie +package za.co.absa.db.fadb.doobie import cats.effect.Async import cats.implicits._ import doobie._ import doobie.implicits._ import doobie.util.Read -import za.co.absa.fadb.DBEngine -import za.co.absa.fadb.status.FailedOrRow +import za.co.absa.db.fadb.DBEngine +import za.co.absa.db.fadb.status.FailedOrRow import scala.language.higherKinds diff --git a/doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieFunction.scala b/doobie/src/main/scala/za/co/absa/db/fadb/doobie/DoobieFunction.scala similarity index 98% rename from doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieFunction.scala rename to doobie/src/main/scala/za/co/absa/db/fadb/doobie/DoobieFunction.scala index f58896c5..ca7fd5a9 100644 --- a/doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieFunction.scala +++ b/doobie/src/main/scala/za/co/absa/db/fadb/doobie/DoobieFunction.scala @@ -14,15 +14,15 @@ * limitations under the License. */ -package za.co.absa.fadb.doobie +package za.co.absa.db.fadb.doobie import cats.MonadError import doobie.implicits.toSqlInterpolator import doobie.util.Read import doobie.util.fragment.Fragment -import za.co.absa.fadb.DBFunction._ -import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.status.{FailedOrRow, Row} +import za.co.absa.db.fadb.DBFunction._ +import za.co.absa.db.fadb.DBSchema +import za.co.absa.db.fadb.status.{FailedOrRow, Row} import scala.language.higherKinds diff --git a/doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieQuery.scala b/doobie/src/main/scala/za/co/absa/db/fadb/doobie/DoobieQuery.scala similarity index 93% rename from doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieQuery.scala rename to doobie/src/main/scala/za/co/absa/db/fadb/doobie/DoobieQuery.scala index fedeb57e..66d50eb2 100644 --- a/doobie/src/main/scala/za/co/absa/fadb/doobie/DoobieQuery.scala +++ b/doobie/src/main/scala/za/co/absa/db/fadb/doobie/DoobieQuery.scala @@ -14,12 +14,12 @@ * limitations under the License. */ -package za.co.absa.fadb.doobie +package za.co.absa.db.fadb.doobie import doobie.util.Read import doobie.util.fragment.Fragment -import za.co.absa.fadb.status.{FailedOrRow, FunctionStatus, Row} -import za.co.absa.fadb.{Query, QueryWithStatus} +import za.co.absa.db.fadb.status.{FailedOrRow, FunctionStatus, Row} +import za.co.absa.db.fadb.{Query, QueryWithStatus} /** * `DoobieQuery` is a class that extends `Query` with `R` as the result type. diff --git a/doobie/src/main/scala/za/co/absa/fadb/doobie/StatusWithData.scala b/doobie/src/main/scala/za/co/absa/db/fadb/doobie/StatusWithData.scala similarity index 97% rename from doobie/src/main/scala/za/co/absa/fadb/doobie/StatusWithData.scala rename to doobie/src/main/scala/za/co/absa/db/fadb/doobie/StatusWithData.scala index d51c6b2c..5da6b4fa 100644 --- a/doobie/src/main/scala/za/co/absa/fadb/doobie/StatusWithData.scala +++ b/doobie/src/main/scala/za/co/absa/db/fadb/doobie/StatusWithData.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.doobie +package za.co.absa.db.fadb.doobie /** * Represents a function status with data (basically a row returned from a DB). diff --git a/doobie/src/test/scala/za/co/absa/fadb/doobie/AvailableMetaInstancesUnitTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/AvailableMetaInstancesUnitTests.scala similarity index 98% rename from doobie/src/test/scala/za/co/absa/fadb/doobie/AvailableMetaInstancesUnitTests.scala rename to doobie/src/test/scala/za/co/absa/db/fadb/doobie/AvailableMetaInstancesUnitTests.scala index bda0b251..b49d494b 100644 --- a/doobie/src/test/scala/za/co/absa/fadb/doobie/AvailableMetaInstancesUnitTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/AvailableMetaInstancesUnitTests.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.doobie +package za.co.absa.db.fadb.doobie import doobie.util.meta.Meta import org.scalatest.funsuite.AnyFunSuite diff --git a/doobie/src/test/scala/za/co/absa/fadb/doobie/DatesTimesIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DatesTimesIntegrationTests.scala similarity index 95% rename from doobie/src/test/scala/za/co/absa/fadb/doobie/DatesTimesIntegrationTests.scala rename to doobie/src/test/scala/za/co/absa/db/fadb/doobie/DatesTimesIntegrationTests.scala index 86241a9f..0532aebc 100644 --- a/doobie/src/test/scala/za/co/absa/fadb/doobie/DatesTimesIntegrationTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DatesTimesIntegrationTests.scala @@ -14,15 +14,15 @@ * limitations under the License. */ -package za.co.absa.fadb.doobie +package za.co.absa.db.fadb.doobie import cats.effect.IO import cats.effect.unsafe.implicits.global import doobie.implicits.toSqlInterpolator import org.scalatest.funsuite.AnyFunSuite -import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.doobie.DoobieFunction.{DoobieSingleResultFunction, DoobieSingleResultFunctionWithStatus} -import za.co.absa.fadb.status.handling.implementations.StandardStatusHandling +import za.co.absa.db.fadb.DBSchema +import za.co.absa.db.fadb.doobie.DoobieFunction.{DoobieSingleResultFunction, DoobieSingleResultFunctionWithStatus} +import za.co.absa.db.fadb.status.handling.implementations.StandardStatusHandling class DatesTimesIntegrationTests extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieMultipleResultFunctionIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionIntegrationTests.scala similarity index 94% rename from doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieMultipleResultFunctionIntegrationTests.scala rename to doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionIntegrationTests.scala index d9eafbb3..0dfb893d 100644 --- a/doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieMultipleResultFunctionIntegrationTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionIntegrationTests.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.doobie +package za.co.absa.db.fadb.doobie import cats.Semigroup import cats.effect.IO @@ -23,8 +23,8 @@ import cats.implicits.catsSyntaxSemigroup import doobie.Fragment import doobie.implicits.toSqlInterpolator import org.scalatest.funsuite.AnyFunSuite -import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.doobie.DoobieFunction.DoobieMultipleResultFunction +import za.co.absa.db.fadb.DBSchema +import za.co.absa.db.fadb.doobie.DoobieFunction.DoobieMultipleResultFunction class DoobieMultipleResultFunctionIntegrationTests extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieMultipleResultFunctionWithAggStatusIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionWithAggStatusIntegrationTests.scala similarity index 90% rename from doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieMultipleResultFunctionWithAggStatusIntegrationTests.scala rename to doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionWithAggStatusIntegrationTests.scala index ffa433d0..8aac494f 100644 --- a/doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieMultipleResultFunctionWithAggStatusIntegrationTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionWithAggStatusIntegrationTests.scala @@ -14,18 +14,18 @@ * limitations under the License. */ -package za.co.absa.fadb.doobie +package za.co.absa.db.fadb.doobie import cats.effect.IO import cats.effect.unsafe.implicits.global import doobie.Fragment import doobie.implicits.toSqlInterpolator import org.scalatest.funsuite.AnyFunSuite -import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.doobie.DoobieFunction.DoobieMultipleResultFunctionWithAggStatus -import za.co.absa.fadb.status.aggregation.implementations.ByMajorityErrorsStatusAggregator -import za.co.absa.fadb.status.handling.implementations.StandardStatusHandling -import za.co.absa.fadb.status.{FunctionStatus, Row} +import za.co.absa.db.fadb.DBSchema +import za.co.absa.db.fadb.doobie.DoobieFunction.DoobieMultipleResultFunctionWithAggStatus +import za.co.absa.db.fadb.status.aggregation.implementations.ByMajorityErrorsStatusAggregator +import za.co.absa.db.fadb.status.handling.implementations.StandardStatusHandling +import za.co.absa.db.fadb.status.{FunctionStatus, Row} class DoobieMultipleResultFunctionWithAggStatusIntegrationTests extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieMultipleResultFunctionWithStatusIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionWithStatusIntegrationTests.scala similarity index 89% rename from doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieMultipleResultFunctionWithStatusIntegrationTests.scala rename to doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionWithStatusIntegrationTests.scala index dd0122f4..3c721f1d 100644 --- a/doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieMultipleResultFunctionWithStatusIntegrationTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionWithStatusIntegrationTests.scala @@ -14,18 +14,18 @@ * limitations under the License. */ -package za.co.absa.fadb.doobie +package za.co.absa.db.fadb.doobie import cats.effect.IO import cats.effect.unsafe.implicits.global import doobie.Fragment import doobie.implicits.toSqlInterpolator import org.scalatest.funsuite.AnyFunSuite -import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.doobie.DoobieFunction.DoobieMultipleResultFunctionWithStatus -import za.co.absa.fadb.exceptions.{DataNotFoundException, StatusException} -import za.co.absa.fadb.status.handling.implementations.StandardStatusHandling -import za.co.absa.fadb.status.{FunctionStatus, Row} +import za.co.absa.db.fadb.DBSchema +import za.co.absa.db.fadb.doobie.DoobieFunction.DoobieMultipleResultFunctionWithStatus +import za.co.absa.db.fadb.exceptions.{DataNotFoundException, StatusException} +import za.co.absa.db.fadb.status.handling.implementations.StandardStatusHandling +import za.co.absa.db.fadb.status.{FunctionStatus, Row} class DoobieMultipleResultFunctionWithStatusIntegrationTests extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieOptionalResultFunctionIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieOptionalResultFunctionIntegrationTests.scala similarity index 89% rename from doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieOptionalResultFunctionIntegrationTests.scala rename to doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieOptionalResultFunctionIntegrationTests.scala index 04ae56cc..d752b8df 100644 --- a/doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieOptionalResultFunctionIntegrationTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieOptionalResultFunctionIntegrationTests.scala @@ -14,14 +14,14 @@ * limitations under the License. */ -package za.co.absa.fadb.doobie +package za.co.absa.db.fadb.doobie import cats.effect.IO import cats.effect.unsafe.implicits.global import doobie.implicits.toSqlInterpolator import org.scalatest.funsuite.AnyFunSuite -import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.doobie.DoobieFunction.DoobieOptionalResultFunction +import za.co.absa.db.fadb.DBSchema +import za.co.absa.db.fadb.doobie.DoobieFunction.DoobieOptionalResultFunction class DoobieOptionalResultFunctionIntegrationTests extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieOtherTypesIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieOtherTypesIntegrationTests.scala similarity index 91% rename from doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieOtherTypesIntegrationTests.scala rename to doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieOtherTypesIntegrationTests.scala index c4a32943..72cdc9f5 100644 --- a/doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieOtherTypesIntegrationTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieOtherTypesIntegrationTests.scala @@ -14,17 +14,17 @@ * limitations under the License. */ -package za.co.absa.fadb.doobie +package za.co.absa.db.fadb.doobie import cats.effect.IO import cats.effect.unsafe.implicits.global import doobie.implicits.toSqlInterpolator import org.scalatest.funsuite.AnyFunSuite -import za.co.absa.fadb.DBSchema -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 +import za.co.absa.db.fadb.DBSchema +import za.co.absa.db.fadb.doobie.DoobieFunction.{DoobieSingleResultFunction, DoobieSingleResultFunctionWithStatus} +import za.co.absa.db.fadb.exceptions.DataConflictException +import za.co.absa.db.fadb.status.FunctionStatus +import za.co.absa.db.fadb.status.handling.implementations.StandardStatusHandling import java.net.InetAddress import java.util.UUID diff --git a/doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieSingleResultFunctionIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieSingleResultFunctionIntegrationTests.scala similarity index 91% rename from doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieSingleResultFunctionIntegrationTests.scala rename to doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieSingleResultFunctionIntegrationTests.scala index 642d3df3..ebde2737 100644 --- a/doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieSingleResultFunctionIntegrationTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieSingleResultFunctionIntegrationTests.scala @@ -14,14 +14,14 @@ * limitations under the License. */ -package za.co.absa.fadb.doobie +package za.co.absa.db.fadb.doobie import cats.effect.IO import cats.effect.unsafe.implicits.global import doobie.implicits.toSqlInterpolator import org.scalatest.funsuite.AnyFunSuite -import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.doobie.DoobieFunction.DoobieSingleResultFunction +import za.co.absa.db.fadb.DBSchema +import za.co.absa.db.fadb.doobie.DoobieFunction.DoobieSingleResultFunction class DoobieSingleResultFunctionIntegrationTests extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieSingleResultFunctionWithStatusIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieSingleResultFunctionWithStatusIntegrationTests.scala similarity index 92% rename from doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieSingleResultFunctionWithStatusIntegrationTests.scala rename to doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieSingleResultFunctionWithStatusIntegrationTests.scala index ead0d48c..df5fb2ca 100644 --- a/doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieSingleResultFunctionWithStatusIntegrationTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieSingleResultFunctionWithStatusIntegrationTests.scala @@ -14,17 +14,17 @@ * limitations under the License. */ -package za.co.absa.fadb.doobie +package za.co.absa.db.fadb.doobie import cats.effect.IO import cats.effect.unsafe.implicits.global import doobie.implicits.toSqlInterpolator import doobie.util.invariant.NonNullableColumnRead import org.scalatest.funsuite.AnyFunSuite -import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.doobie.DoobieFunction.DoobieSingleResultFunctionWithStatus -import za.co.absa.fadb.exceptions.StatusException -import za.co.absa.fadb.status.handling.implementations.StandardStatusHandling +import za.co.absa.db.fadb.DBSchema +import za.co.absa.db.fadb.doobie.DoobieFunction.DoobieSingleResultFunctionWithStatus +import za.co.absa.db.fadb.exceptions.StatusException +import za.co.absa.db.fadb.status.handling.implementations.StandardStatusHandling class DoobieSingleResultFunctionWithStatusIntegrationTests extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieTest.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieTest.scala similarity index 89% rename from doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieTest.scala rename to doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieTest.scala index 170c41bd..a7975113 100644 --- a/doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieTest.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieTest.scala @@ -14,12 +14,12 @@ * limitations under the License. */ -package za.co.absa.fadb.doobie +package za.co.absa.db.fadb.doobie import cats.effect.IO import doobie.util.transactor.Transactor import doobie.util.transactor.Transactor.Aux -import za.co.absa.fadb.DBSchema +import za.co.absa.db.fadb.DBSchema trait DoobieTest { case class Actor(actorId: Int, firstName: String, lastName: String) @@ -27,7 +27,7 @@ trait DoobieTest { case class GetActorsByLastnameQueryParameters(lastName: String, firstName: Option[String] = None) case class CreateActorRequestBody(firstName: String, lastName: String) - import za.co.absa.fadb.naming.implementations.SnakeCaseNaming.Implicits._ + import za.co.absa.db.fadb.naming.implementations.SnakeCaseNaming.Implicits._ object Integration extends DBSchema protected val transactor: Aux[IO, Unit] = Transactor.fromDriverManager[IO]( diff --git a/publish.sbt b/publish.sbt index 6f11edb4..45cc50fc 100644 --- a/publish.sbt +++ b/publish.sbt @@ -16,7 +16,7 @@ ThisBuild / organizationHomepage := Some(url("https://www.absa.africa")) -sonatypeProfileName := "za.co.absa" +sonatypeProfileName := "za.co.absa.db" ThisBuild / scmInfo := Some( ScmInfo( diff --git a/slick/src/main/scala/za/co/absa/fadb/slick/FaDbPostgresProfile.scala b/slick/src/main/scala/za/co/absa/db/fadb/slick/FaDbPostgresProfile.scala similarity index 95% rename from slick/src/main/scala/za/co/absa/fadb/slick/FaDbPostgresProfile.scala rename to slick/src/main/scala/za/co/absa/db/fadb/slick/FaDbPostgresProfile.scala index b0044d15..74a0e626 100644 --- a/slick/src/main/scala/za/co/absa/fadb/slick/FaDbPostgresProfile.scala +++ b/slick/src/main/scala/za/co/absa/db/fadb/slick/FaDbPostgresProfile.scala @@ -14,10 +14,10 @@ * limitations under the License. */ -package za.co.absa.fadb.slick +package za.co.absa.db.fadb.slick import com.github.tminglei.slickpg._ -import za.co.absa.fadb.slick.support.PgUUIDSupport +import za.co.absa.db.fadb.slick.support.PgUUIDSupport /** * DB profile recommended to use with SlickPgEngine to offer support for all extended Postgres types. diff --git a/slick/src/main/scala/za/co/absa/fadb/slick/SlickFunction.scala b/slick/src/main/scala/za/co/absa/db/fadb/slick/SlickFunction.scala similarity index 97% rename from slick/src/main/scala/za/co/absa/fadb/slick/SlickFunction.scala rename to slick/src/main/scala/za/co/absa/db/fadb/slick/SlickFunction.scala index 89e351cb..5093c2fc 100644 --- a/slick/src/main/scala/za/co/absa/fadb/slick/SlickFunction.scala +++ b/slick/src/main/scala/za/co/absa/db/fadb/slick/SlickFunction.scala @@ -14,13 +14,13 @@ * limitations under the License. */ -package za.co.absa.fadb.slick +package za.co.absa.db.fadb.slick import cats.MonadError import slick.jdbc.{GetResult, SQLActionBuilder} -import za.co.absa.fadb.DBFunction._ -import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.status.{FailedOrRow, Row} +import za.co.absa.db.fadb.DBFunction._ +import za.co.absa.db.fadb.DBSchema +import za.co.absa.db.fadb.status.{FailedOrRow, Row} import scala.concurrent.Future import scala.language.higherKinds diff --git a/slick/src/main/scala/za/co/absa/fadb/slick/SlickPgEngine.scala b/slick/src/main/scala/za/co/absa/db/fadb/slick/SlickPgEngine.scala similarity index 94% rename from slick/src/main/scala/za/co/absa/fadb/slick/SlickPgEngine.scala rename to slick/src/main/scala/za/co/absa/db/fadb/slick/SlickPgEngine.scala index 1fd0ad03..e0cbe468 100644 --- a/slick/src/main/scala/za/co/absa/fadb/slick/SlickPgEngine.scala +++ b/slick/src/main/scala/za/co/absa/db/fadb/slick/SlickPgEngine.scala @@ -14,12 +14,12 @@ * limitations under the License. */ -package za.co.absa.fadb.slick +package za.co.absa.db.fadb.slick import cats.implicits._ import slick.jdbc.PostgresProfile.api._ -import za.co.absa.fadb.DBEngine -import za.co.absa.fadb.status.FailedOrRow +import za.co.absa.db.fadb.DBEngine +import za.co.absa.db.fadb.status.FailedOrRow import scala.concurrent.{ExecutionContext, Future} import scala.language.higherKinds diff --git a/slick/src/main/scala/za/co/absa/fadb/slick/SlickQuery.scala b/slick/src/main/scala/za/co/absa/db/fadb/slick/SlickQuery.scala similarity index 95% rename from slick/src/main/scala/za/co/absa/fadb/slick/SlickQuery.scala rename to slick/src/main/scala/za/co/absa/db/fadb/slick/SlickQuery.scala index 266c038b..2bffc5f4 100644 --- a/slick/src/main/scala/za/co/absa/fadb/slick/SlickQuery.scala +++ b/slick/src/main/scala/za/co/absa/db/fadb/slick/SlickQuery.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package za.co.absa.fadb.slick +package za.co.absa.db.fadb.slick import slick.jdbc.{GetResult, PositionedResult, SQLActionBuilder} -import za.co.absa.fadb.status.{FailedOrRow, FunctionStatus, Row} -import za.co.absa.fadb.{Query, QueryWithStatus} +import za.co.absa.db.fadb.status.{FailedOrRow, FunctionStatus, Row} +import za.co.absa.db.fadb.{Query, QueryWithStatus} /** * SQL query representation for Slick diff --git a/slick/src/main/scala/za/co/absa/fadb/slick/support/PgUUIDSupport.scala b/slick/src/main/scala/za/co/absa/db/fadb/slick/support/PgUUIDSupport.scala similarity index 98% rename from slick/src/main/scala/za/co/absa/fadb/slick/support/PgUUIDSupport.scala rename to slick/src/main/scala/za/co/absa/db/fadb/slick/support/PgUUIDSupport.scala index 695772fc..d8656a05 100644 --- a/slick/src/main/scala/za/co/absa/fadb/slick/support/PgUUIDSupport.scala +++ b/slick/src/main/scala/za/co/absa/db/fadb/slick/support/PgUUIDSupport.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.slick.support +package za.co.absa.db.fadb.slick.support import com.github.tminglei.slickpg.{ExPostgresProfile, utils} import com.github.tminglei.slickpg.utils.PgCommonJdbcTypes diff --git a/slick/src/test/scala/za/co/absa/fadb/slick/Actor.scala b/slick/src/test/scala/za/co/absa/db/fadb/slick/Actor.scala similarity index 95% rename from slick/src/test/scala/za/co/absa/fadb/slick/Actor.scala rename to slick/src/test/scala/za/co/absa/db/fadb/slick/Actor.scala index 3aa92737..e1f1fca8 100644 --- a/slick/src/test/scala/za/co/absa/fadb/slick/Actor.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/slick/Actor.scala @@ -14,6 +14,6 @@ * limitations under the License. */ -package za.co.absa.fadb.slick +package za.co.absa.db.fadb.slick case class Actor(actorId: Int, firstName: String, lastName: String) diff --git a/slick/src/test/scala/za/co/absa/fadb/slick/ActorSlickConverter.scala b/slick/src/test/scala/za/co/absa/db/fadb/slick/ActorSlickConverter.scala similarity index 96% rename from slick/src/test/scala/za/co/absa/fadb/slick/ActorSlickConverter.scala rename to slick/src/test/scala/za/co/absa/db/fadb/slick/ActorSlickConverter.scala index bbf2defd..339fa7ef 100644 --- a/slick/src/test/scala/za/co/absa/fadb/slick/ActorSlickConverter.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/slick/ActorSlickConverter.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.slick +package za.co.absa.db.fadb.slick import slick.jdbc.{GetResult, PositionedResult} diff --git a/slick/src/test/scala/za/co/absa/fadb/slick/FaDbPostgresProfileIntegrationTests.scala b/slick/src/test/scala/za/co/absa/db/fadb/slick/FaDbPostgresProfileIntegrationTests.scala similarity index 95% rename from slick/src/test/scala/za/co/absa/fadb/slick/FaDbPostgresProfileIntegrationTests.scala rename to slick/src/test/scala/za/co/absa/db/fadb/slick/FaDbPostgresProfileIntegrationTests.scala index 62bdfe69..006fec59 100644 --- a/slick/src/test/scala/za/co/absa/fadb/slick/FaDbPostgresProfileIntegrationTests.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/slick/FaDbPostgresProfileIntegrationTests.scala @@ -14,15 +14,15 @@ * limitations under the License. */ -package za.co.absa.fadb.slick +package za.co.absa.db.fadb.slick import com.github.tminglei.slickpg.{InetString, LTree, MacAddrString, Range} import org.scalatest.flatspec.AsyncFlatSpec import slick.jdbc.{GetResult, SQLActionBuilder} -import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.naming.implementations.SnakeCaseNaming.Implicits._ -import za.co.absa.fadb.slick.FaDbPostgresProfile.api._ -import za.co.absa.fadb.slick.SlickFunction.SlickSingleResultFunction +import za.co.absa.db.fadb.DBSchema +import za.co.absa.db.fadb.naming.implementations.SnakeCaseNaming.Implicits._ +import za.co.absa.db.fadb.slick.FaDbPostgresProfile.api._ +import za.co.absa.db.fadb.slick.SlickFunction.SlickSingleResultFunction import java.time._ import java.util.UUID diff --git a/slick/src/test/scala/za/co/absa/fadb/slick/OptionalActorSlickConverter.scala b/slick/src/test/scala/za/co/absa/db/fadb/slick/OptionalActorSlickConverter.scala similarity index 96% rename from slick/src/test/scala/za/co/absa/fadb/slick/OptionalActorSlickConverter.scala rename to slick/src/test/scala/za/co/absa/db/fadb/slick/OptionalActorSlickConverter.scala index e5904d61..7c4786cb 100644 --- a/slick/src/test/scala/za/co/absa/fadb/slick/OptionalActorSlickConverter.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/slick/OptionalActorSlickConverter.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.fadb.slick +package za.co.absa.db.fadb.slick import slick.jdbc.{GetResult, PositionedResult} diff --git a/slick/src/test/scala/za/co/absa/fadb/slick/SlickMultipleResultFunctionIntegrationTests.scala b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionIntegrationTests.scala similarity index 89% rename from slick/src/test/scala/za/co/absa/fadb/slick/SlickMultipleResultFunctionIntegrationTests.scala rename to slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionIntegrationTests.scala index cc7e692d..4df66450 100644 --- a/slick/src/test/scala/za/co/absa/fadb/slick/SlickMultipleResultFunctionIntegrationTests.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionIntegrationTests.scala @@ -14,14 +14,14 @@ * limitations under the License. */ -package za.co.absa.fadb.slick +package za.co.absa.db.fadb.slick import org.scalatest.concurrent.ScalaFutures import org.scalatest.funsuite.AnyFunSuite import slick.jdbc.SQLActionBuilder -import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.slick.FaDbPostgresProfile.api._ -import za.co.absa.fadb.slick.SlickFunction.SlickMultipleResultFunction +import za.co.absa.db.fadb.DBSchema +import za.co.absa.db.fadb.slick.FaDbPostgresProfile.api._ +import za.co.absa.db.fadb.slick.SlickFunction.SlickMultipleResultFunction import scala.concurrent.ExecutionContext.Implicits.global diff --git a/slick/src/test/scala/za/co/absa/fadb/slick/SlickMultipleResultFunctionWithAggStatusIntegrationTests.scala b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionWithAggStatusIntegrationTests.scala similarity index 83% rename from slick/src/test/scala/za/co/absa/fadb/slick/SlickMultipleResultFunctionWithAggStatusIntegrationTests.scala rename to slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionWithAggStatusIntegrationTests.scala index 55e4f06f..107d0275 100644 --- a/slick/src/test/scala/za/co/absa/fadb/slick/SlickMultipleResultFunctionWithAggStatusIntegrationTests.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionWithAggStatusIntegrationTests.scala @@ -14,17 +14,17 @@ * limitations under the License. */ -package za.co.absa.fadb.slick +package za.co.absa.db.fadb.slick import org.scalatest.concurrent.ScalaFutures import org.scalatest.funsuite.AnyFunSuite import slick.jdbc.SQLActionBuilder -import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.slick.FaDbPostgresProfile.api._ -import za.co.absa.fadb.slick.SlickFunction.SlickMultipleResultFunctionWithAggStatus -import za.co.absa.fadb.status.aggregation.implementations.ByFirstErrorStatusAggregator -import za.co.absa.fadb.status.handling.implementations.StandardStatusHandling -import za.co.absa.fadb.status.{FunctionStatus, Row} +import za.co.absa.db.fadb.DBSchema +import za.co.absa.db.fadb.slick.FaDbPostgresProfile.api._ +import za.co.absa.db.fadb.slick.SlickFunction.SlickMultipleResultFunctionWithAggStatus +import za.co.absa.db.fadb.status.aggregation.implementations.ByFirstErrorStatusAggregator +import za.co.absa.db.fadb.status.handling.implementations.StandardStatusHandling +import za.co.absa.db.fadb.status.{FunctionStatus, Row} import scala.concurrent.ExecutionContext.Implicits.global diff --git a/slick/src/test/scala/za/co/absa/fadb/slick/SlickMultipleResultFunctionWithStatusIntegrationTests.scala b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionWithStatusIntegrationTests.scala similarity index 85% rename from slick/src/test/scala/za/co/absa/fadb/slick/SlickMultipleResultFunctionWithStatusIntegrationTests.scala rename to slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionWithStatusIntegrationTests.scala index 364a71e4..2e072805 100644 --- a/slick/src/test/scala/za/co/absa/fadb/slick/SlickMultipleResultFunctionWithStatusIntegrationTests.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionWithStatusIntegrationTests.scala @@ -14,16 +14,16 @@ * limitations under the License. */ -package za.co.absa.fadb.slick +package za.co.absa.db.fadb.slick import org.scalatest.concurrent.ScalaFutures import org.scalatest.funsuite.AnyFunSuite import slick.jdbc.SQLActionBuilder -import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.slick.FaDbPostgresProfile.api._ -import za.co.absa.fadb.slick.SlickFunction.SlickMultipleResultFunctionWithStatus -import za.co.absa.fadb.status.{FunctionStatus, Row} -import za.co.absa.fadb.status.handling.implementations.StandardStatusHandling +import za.co.absa.db.fadb.DBSchema +import za.co.absa.db.fadb.slick.FaDbPostgresProfile.api._ +import za.co.absa.db.fadb.slick.SlickFunction.SlickMultipleResultFunctionWithStatus +import za.co.absa.db.fadb.status.{FunctionStatus, Row} +import za.co.absa.db.fadb.status.handling.implementations.StandardStatusHandling import scala.concurrent.ExecutionContext.Implicits.global diff --git a/slick/src/test/scala/za/co/absa/fadb/slick/SlickOptionalResultFunctionIntegrationTests.scala b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickOptionalResultFunctionIntegrationTests.scala similarity index 89% rename from slick/src/test/scala/za/co/absa/fadb/slick/SlickOptionalResultFunctionIntegrationTests.scala rename to slick/src/test/scala/za/co/absa/db/fadb/slick/SlickOptionalResultFunctionIntegrationTests.scala index bfab957f..2be36393 100644 --- a/slick/src/test/scala/za/co/absa/fadb/slick/SlickOptionalResultFunctionIntegrationTests.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickOptionalResultFunctionIntegrationTests.scala @@ -14,14 +14,14 @@ * limitations under the License. */ -package za.co.absa.fadb.slick +package za.co.absa.db.fadb.slick import org.scalatest.concurrent.ScalaFutures import org.scalatest.funsuite.AnyFunSuite import slick.jdbc.SQLActionBuilder -import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.slick.FaDbPostgresProfile.api._ -import za.co.absa.fadb.slick.SlickFunction.SlickOptionalResultFunction +import za.co.absa.db.fadb.DBSchema +import za.co.absa.db.fadb.slick.FaDbPostgresProfile.api._ +import za.co.absa.db.fadb.slick.SlickFunction.SlickOptionalResultFunction import scala.concurrent.ExecutionContext.Implicits.global diff --git a/slick/src/test/scala/za/co/absa/fadb/slick/SlickSingleResultFunctionWithStatusIntegrationTests.scala b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickSingleResultFunctionWithStatusIntegrationTests.scala similarity index 85% rename from slick/src/test/scala/za/co/absa/fadb/slick/SlickSingleResultFunctionWithStatusIntegrationTests.scala rename to slick/src/test/scala/za/co/absa/db/fadb/slick/SlickSingleResultFunctionWithStatusIntegrationTests.scala index 4caed5e5..3cfb3abd 100644 --- a/slick/src/test/scala/za/co/absa/fadb/slick/SlickSingleResultFunctionWithStatusIntegrationTests.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickSingleResultFunctionWithStatusIntegrationTests.scala @@ -14,15 +14,15 @@ * limitations under the License. */ -package za.co.absa.fadb.slick +package za.co.absa.db.fadb.slick import org.scalatest.concurrent.ScalaFutures import org.scalatest.funsuite.AnyFunSuite import slick.jdbc.{GetResult, SQLActionBuilder} -import za.co.absa.fadb.DBSchema -import za.co.absa.fadb.slick.FaDbPostgresProfile.api._ -import za.co.absa.fadb.slick.SlickFunction.SlickSingleResultFunctionWithStatus -import za.co.absa.fadb.status.handling.implementations.StandardStatusHandling +import za.co.absa.db.fadb.DBSchema +import za.co.absa.db.fadb.slick.FaDbPostgresProfile.api._ +import za.co.absa.db.fadb.slick.SlickFunction.SlickSingleResultFunctionWithStatus +import za.co.absa.db.fadb.status.handling.implementations.StandardStatusHandling import scala.concurrent.ExecutionContext.Implicits.global diff --git a/slick/src/test/scala/za/co/absa/fadb/slick/SlickTest.scala b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickTest.scala similarity index 87% rename from slick/src/test/scala/za/co/absa/fadb/slick/SlickTest.scala rename to slick/src/test/scala/za/co/absa/db/fadb/slick/SlickTest.scala index ce7fa2ac..53afe77a 100644 --- a/slick/src/test/scala/za/co/absa/fadb/slick/SlickTest.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickTest.scala @@ -14,10 +14,10 @@ * limitations under the License. */ -package za.co.absa.fadb.slick +package za.co.absa.db.fadb.slick import slick.jdbc.JdbcBackend.Database -import za.co.absa.fadb.DBSchema +import za.co.absa.db.fadb.DBSchema trait SlickTest { case class GetActorsQueryParameters(firstName: Option[String], lastName: Option[String]) @@ -25,7 +25,7 @@ trait SlickTest { case class CreateActorRequestBody(firstName: String, lastName: String) - import za.co.absa.fadb.naming.implementations.SnakeCaseNaming.Implicits._ + import za.co.absa.db.fadb.naming.implementations.SnakeCaseNaming.Implicits._ object Integration extends DBSchema val db = Database.forConfig("postgrestestdb") From a8068579367a19719ce2b4fcc6d145acaa6a8cf3 Mon Sep 17 00:00:00 2001 From: David Benedeki Date: Fri, 28 Jun 2024 17:51:46 +0200 Subject: [PATCH 2/4] * moved testing classes to own folder * fixed doc --- .github/workflows/test_filenames_check.yml | 2 +- build.sbt | 4 ++-- core/src/main/scala/za/co/absa/db/fadb/DBSchema.scala | 4 ++-- .../co/absa/db/fadb/doobie/DatesTimesIntegrationTests.scala | 1 + .../doobie/DoobieMultipleResultFunctionIntegrationTests.scala | 1 + ...eMultipleResultFunctionWithAggStatusIntegrationTests.scala | 1 + ...obieMultipleResultFunctionWithStatusIntegrationTests.scala | 1 + .../doobie/DoobieOptionalResultFunctionIntegrationTests.scala | 1 + .../db/fadb/doobie/DoobieOtherTypesIntegrationTests.scala | 1 + .../doobie/DoobieSingleResultFunctionIntegrationTests.scala | 1 + ...DoobieSingleResultFunctionWithStatusIntegrationTests.scala | 1 + .../absa/db/fadb/{doobie => testing/classes}/DoobieTest.scala | 2 +- .../za/co/absa/db/fadb/{slick => testng/classes}/Actor.scala | 0 .../fadb/{slick => testng/classes}/ActorSlickConverter.scala | 0 .../classes}/OptionalActorSlickConverter.scala | 0 .../co/absa/db/fadb/{slick => testng/classes}/SlickTest.scala | 0 16 files changed, 14 insertions(+), 6 deletions(-) rename doobie/src/test/scala/za/co/absa/db/fadb/{doobie => testing/classes}/DoobieTest.scala (97%) rename slick/src/test/scala/za/co/absa/db/fadb/{slick => testng/classes}/Actor.scala (100%) rename slick/src/test/scala/za/co/absa/db/fadb/{slick => testng/classes}/ActorSlickConverter.scala (100%) rename slick/src/test/scala/za/co/absa/db/fadb/{slick => testng/classes}/OptionalActorSlickConverter.scala (100%) rename slick/src/test/scala/za/co/absa/db/fadb/{slick => testng/classes}/SlickTest.scala (100%) diff --git a/.github/workflows/test_filenames_check.yml b/.github/workflows/test_filenames_check.yml index a9ff5afd..612f3a9d 100644 --- a/.github/workflows/test_filenames_check.yml +++ b/.github/workflows/test_filenames_check.yml @@ -36,6 +36,6 @@ jobs: name-patterns: '*UnitTests.*,*IntegrationTests.*' paths: '**/src/test/scala/**' report-format: 'console' - excludes: 'slick/src/test/scala/za/co/absa/fadb/slick/Actor.scala,slick/src/test/scala/za/co/absa/fadb/slick/ActorSlickConverter.scala,slick/src/test/scala/za/co/absa/fadb/slick/SlickTest.scala,doobie/src/test/scala/za/co/absa/fadb/doobie/DoobieTest.scala,slick/src/test/scala/za/co/absa/fadb/slick/OptionalActorSlickConverter.scala' + excludes: '**/src/test/scala/za/co/absa/db/fadb/testing/**' verbose-logging: 'false' fail-on-violation: 'true' diff --git a/build.sbt b/build.sbt index 187d6f35..999a2ac2 100644 --- a/build.sbt +++ b/build.sbt @@ -42,8 +42,8 @@ lazy val commonJacocoReportSettings: JacocoReportSettings = JacocoReportSettings ) /** - * add `za.co.absa.fadb.naming.NamingConvention` to filter a class - * or `za.co.absa.fadb.naming.NamingConvention*` to filter the class and all related objects + * add `za.co.absa.db.fadb.naming.NamingConvention` to filter a class + * or `za.co.absa.db.fadb.naming.NamingConvention*` to filter the class and all related objects */ lazy val commonJacocoExcludes: Seq[String] = Seq( ) diff --git a/core/src/main/scala/za/co/absa/db/fadb/DBSchema.scala b/core/src/main/scala/za/co/absa/db/fadb/DBSchema.scala index b77d8702..56602129 100644 --- a/core/src/main/scala/za/co/absa/db/fadb/DBSchema.scala +++ b/core/src/main/scala/za/co/absa/db/fadb/DBSchema.scala @@ -22,7 +22,7 @@ import za.co.absa.db.fadb.naming.NamingConvention * An abstract class, an ancestor to represent a database schema * The database name of the schema is derived from the class name based on the provided naming convention * @param schemaNameOverride - in case the class name would not match the database schema name, this gives the - * @param namingConvention - the [[za.co.absa.fadb.naming.NamingConvention NamingConvention]] + * @param namingConvention - the [[za.co.absa.db.fadb.naming.NamingConvention NamingConvention]] * prescribing how to convert a class name into a db object name */ abstract class DBSchema(schemaNameOverride: Option[String] = None)(implicit val namingConvention: NamingConvention) { @@ -46,7 +46,7 @@ abstract class DBSchema(schemaNameOverride: Option[String] = None)(implicit val /** * Function to convert a class to the associated DB object name, based on the class' name. For transformation from the - * class name to usual db name the schema's [[za.co.absa.fadb.naming.NamingConvention NamingConvention]] is used. + * class name to usual db name the schema's [[za.co.absa.db.fadb.naming.NamingConvention NamingConvention]] is used. * @param c - class which name to use to get the DB object name * @return - the db object name */ diff --git a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DatesTimesIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DatesTimesIntegrationTests.scala index 0532aebc..a85284d0 100644 --- a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DatesTimesIntegrationTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DatesTimesIntegrationTests.scala @@ -23,6 +23,7 @@ import org.scalatest.funsuite.AnyFunSuite import za.co.absa.db.fadb.DBSchema import za.co.absa.db.fadb.doobie.DoobieFunction.{DoobieSingleResultFunction, DoobieSingleResultFunctionWithStatus} import za.co.absa.db.fadb.status.handling.implementations.StandardStatusHandling +import za.co.absa.db.fadb.testing.classes.DoobieTest class DatesTimesIntegrationTests extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionIntegrationTests.scala index 0dfb893d..e7945fc5 100644 --- a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionIntegrationTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionIntegrationTests.scala @@ -25,6 +25,7 @@ import doobie.implicits.toSqlInterpolator import org.scalatest.funsuite.AnyFunSuite import za.co.absa.db.fadb.DBSchema import za.co.absa.db.fadb.doobie.DoobieFunction.DoobieMultipleResultFunction +import za.co.absa.db.fadb.testing.classes.DoobieTest class DoobieMultipleResultFunctionIntegrationTests extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionWithAggStatusIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionWithAggStatusIntegrationTests.scala index 8aac494f..809115c2 100644 --- a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionWithAggStatusIntegrationTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionWithAggStatusIntegrationTests.scala @@ -26,6 +26,7 @@ import za.co.absa.db.fadb.doobie.DoobieFunction.DoobieMultipleResultFunctionWith import za.co.absa.db.fadb.status.aggregation.implementations.ByMajorityErrorsStatusAggregator import za.co.absa.db.fadb.status.handling.implementations.StandardStatusHandling import za.co.absa.db.fadb.status.{FunctionStatus, Row} +import za.co.absa.db.fadb.testing.classes.DoobieTest class DoobieMultipleResultFunctionWithAggStatusIntegrationTests extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionWithStatusIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionWithStatusIntegrationTests.scala index 3c721f1d..f02046ae 100644 --- a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionWithStatusIntegrationTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieMultipleResultFunctionWithStatusIntegrationTests.scala @@ -26,6 +26,7 @@ import za.co.absa.db.fadb.doobie.DoobieFunction.DoobieMultipleResultFunctionWith import za.co.absa.db.fadb.exceptions.{DataNotFoundException, StatusException} import za.co.absa.db.fadb.status.handling.implementations.StandardStatusHandling import za.co.absa.db.fadb.status.{FunctionStatus, Row} +import za.co.absa.db.fadb.testing.classes.DoobieTest class DoobieMultipleResultFunctionWithStatusIntegrationTests extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieOptionalResultFunctionIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieOptionalResultFunctionIntegrationTests.scala index d752b8df..07f45abe 100644 --- a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieOptionalResultFunctionIntegrationTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieOptionalResultFunctionIntegrationTests.scala @@ -22,6 +22,7 @@ import doobie.implicits.toSqlInterpolator import org.scalatest.funsuite.AnyFunSuite import za.co.absa.db.fadb.DBSchema import za.co.absa.db.fadb.doobie.DoobieFunction.DoobieOptionalResultFunction +import za.co.absa.db.fadb.testing.classes.DoobieTest class DoobieOptionalResultFunctionIntegrationTests extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieOtherTypesIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieOtherTypesIntegrationTests.scala index 72cdc9f5..2d8c0bcb 100644 --- a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieOtherTypesIntegrationTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieOtherTypesIntegrationTests.scala @@ -25,6 +25,7 @@ import za.co.absa.db.fadb.doobie.DoobieFunction.{DoobieSingleResultFunction, Doo import za.co.absa.db.fadb.exceptions.DataConflictException import za.co.absa.db.fadb.status.FunctionStatus import za.co.absa.db.fadb.status.handling.implementations.StandardStatusHandling +import za.co.absa.db.fadb.testing.classes.DoobieTest import java.net.InetAddress import java.util.UUID diff --git a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieSingleResultFunctionIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieSingleResultFunctionIntegrationTests.scala index ebde2737..36eb28e4 100644 --- a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieSingleResultFunctionIntegrationTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieSingleResultFunctionIntegrationTests.scala @@ -22,6 +22,7 @@ import doobie.implicits.toSqlInterpolator import org.scalatest.funsuite.AnyFunSuite import za.co.absa.db.fadb.DBSchema import za.co.absa.db.fadb.doobie.DoobieFunction.DoobieSingleResultFunction +import za.co.absa.db.fadb.testing.classes.DoobieTest class DoobieSingleResultFunctionIntegrationTests extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieSingleResultFunctionWithStatusIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieSingleResultFunctionWithStatusIntegrationTests.scala index df5fb2ca..41e381f7 100644 --- a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieSingleResultFunctionWithStatusIntegrationTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieSingleResultFunctionWithStatusIntegrationTests.scala @@ -25,6 +25,7 @@ import za.co.absa.db.fadb.DBSchema import za.co.absa.db.fadb.doobie.DoobieFunction.DoobieSingleResultFunctionWithStatus import za.co.absa.db.fadb.exceptions.StatusException import za.co.absa.db.fadb.status.handling.implementations.StandardStatusHandling +import za.co.absa.db.fadb.testing.classes.DoobieTest class DoobieSingleResultFunctionWithStatusIntegrationTests extends AnyFunSuite with DoobieTest { diff --git a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieTest.scala b/doobie/src/test/scala/za/co/absa/db/fadb/testing/classes/DoobieTest.scala similarity index 97% rename from doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieTest.scala rename to doobie/src/test/scala/za/co/absa/db/fadb/testing/classes/DoobieTest.scala index a7975113..e6cbf5ef 100644 --- a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/DoobieTest.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/testing/classes/DoobieTest.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.db.fadb.doobie +package za.co.absa.db.fadb.testing.classes import cats.effect.IO import doobie.util.transactor.Transactor diff --git a/slick/src/test/scala/za/co/absa/db/fadb/slick/Actor.scala b/slick/src/test/scala/za/co/absa/db/fadb/testng/classes/Actor.scala similarity index 100% rename from slick/src/test/scala/za/co/absa/db/fadb/slick/Actor.scala rename to slick/src/test/scala/za/co/absa/db/fadb/testng/classes/Actor.scala diff --git a/slick/src/test/scala/za/co/absa/db/fadb/slick/ActorSlickConverter.scala b/slick/src/test/scala/za/co/absa/db/fadb/testng/classes/ActorSlickConverter.scala similarity index 100% rename from slick/src/test/scala/za/co/absa/db/fadb/slick/ActorSlickConverter.scala rename to slick/src/test/scala/za/co/absa/db/fadb/testng/classes/ActorSlickConverter.scala diff --git a/slick/src/test/scala/za/co/absa/db/fadb/slick/OptionalActorSlickConverter.scala b/slick/src/test/scala/za/co/absa/db/fadb/testng/classes/OptionalActorSlickConverter.scala similarity index 100% rename from slick/src/test/scala/za/co/absa/db/fadb/slick/OptionalActorSlickConverter.scala rename to slick/src/test/scala/za/co/absa/db/fadb/testng/classes/OptionalActorSlickConverter.scala diff --git a/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickTest.scala b/slick/src/test/scala/za/co/absa/db/fadb/testng/classes/SlickTest.scala similarity index 100% rename from slick/src/test/scala/za/co/absa/db/fadb/slick/SlickTest.scala rename to slick/src/test/scala/za/co/absa/db/fadb/testng/classes/SlickTest.scala From d12394c3ecd13fdb8dcafef3758afd5f6fa44aab Mon Sep 17 00:00:00 2001 From: David Benedeki Date: Fri, 28 Jun 2024 17:57:26 +0200 Subject: [PATCH 3/4] * fixed folder name typo --- .github/workflows/test_filenames_check.yml | 1 + .../slick/SlickMultipleResultFunctionIntegrationTests.scala | 1 + ...ickMultipleResultFunctionWithAggStatusIntegrationTests.scala | 1 + .../SlickMultipleResultFunctionWithStatusIntegrationTests.scala | 1 + .../slick/SlickOptionalResultFunctionIntegrationTests.scala | 1 + .../SlickSingleResultFunctionWithStatusIntegrationTests.scala | 1 + .../za/co/absa/db/fadb/{testng => testing}/classes/Actor.scala | 2 +- .../fadb/{testng => testing}/classes/ActorSlickConverter.scala | 2 +- .../classes/OptionalActorSlickConverter.scala | 2 +- .../co/absa/db/fadb/{testng => testing}/classes/SlickTest.scala | 2 +- 10 files changed, 10 insertions(+), 4 deletions(-) rename slick/src/test/scala/za/co/absa/db/fadb/{testng => testing}/classes/Actor.scala (93%) rename slick/src/test/scala/za/co/absa/db/fadb/{testng => testing}/classes/ActorSlickConverter.scala (95%) rename slick/src/test/scala/za/co/absa/db/fadb/{testng => testing}/classes/OptionalActorSlickConverter.scala (96%) rename slick/src/test/scala/za/co/absa/db/fadb/{testng => testing}/classes/SlickTest.scala (96%) diff --git a/.github/workflows/test_filenames_check.yml b/.github/workflows/test_filenames_check.yml index 612f3a9d..f9f84d72 100644 --- a/.github/workflows/test_filenames_check.yml +++ b/.github/workflows/test_filenames_check.yml @@ -37,5 +37,6 @@ jobs: paths: '**/src/test/scala/**' report-format: 'console' excludes: '**/src/test/scala/za/co/absa/db/fadb/testing/**' + slick/src/test/scala/za/co/absa/db/fadb/testng/classes/Actor.scala verbose-logging: 'false' fail-on-violation: 'true' diff --git a/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionIntegrationTests.scala b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionIntegrationTests.scala index 4df66450..aa9daded 100644 --- a/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionIntegrationTests.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionIntegrationTests.scala @@ -22,6 +22,7 @@ import slick.jdbc.SQLActionBuilder import za.co.absa.db.fadb.DBSchema import za.co.absa.db.fadb.slick.FaDbPostgresProfile.api._ import za.co.absa.db.fadb.slick.SlickFunction.SlickMultipleResultFunction +import za.co.absa.db.fadb.testing.classes.{Actor, ActorSlickConverter, SlickTest} import scala.concurrent.ExecutionContext.Implicits.global diff --git a/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionWithAggStatusIntegrationTests.scala b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionWithAggStatusIntegrationTests.scala index 107d0275..68f048cc 100644 --- a/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionWithAggStatusIntegrationTests.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionWithAggStatusIntegrationTests.scala @@ -25,6 +25,7 @@ import za.co.absa.db.fadb.slick.SlickFunction.SlickMultipleResultFunctionWithAgg import za.co.absa.db.fadb.status.aggregation.implementations.ByFirstErrorStatusAggregator import za.co.absa.db.fadb.status.handling.implementations.StandardStatusHandling import za.co.absa.db.fadb.status.{FunctionStatus, Row} +import za.co.absa.db.fadb.testing.classes.{Actor, OptionalActorSlickConverter, SlickTest} import scala.concurrent.ExecutionContext.Implicits.global diff --git a/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionWithStatusIntegrationTests.scala b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionWithStatusIntegrationTests.scala index 2e072805..828216b8 100644 --- a/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionWithStatusIntegrationTests.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickMultipleResultFunctionWithStatusIntegrationTests.scala @@ -24,6 +24,7 @@ import za.co.absa.db.fadb.slick.FaDbPostgresProfile.api._ import za.co.absa.db.fadb.slick.SlickFunction.SlickMultipleResultFunctionWithStatus import za.co.absa.db.fadb.status.{FunctionStatus, Row} import za.co.absa.db.fadb.status.handling.implementations.StandardStatusHandling +import za.co.absa.db.fadb.testing.classes.{Actor, OptionalActorSlickConverter, SlickTest} import scala.concurrent.ExecutionContext.Implicits.global diff --git a/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickOptionalResultFunctionIntegrationTests.scala b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickOptionalResultFunctionIntegrationTests.scala index 2be36393..559c8c03 100644 --- a/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickOptionalResultFunctionIntegrationTests.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickOptionalResultFunctionIntegrationTests.scala @@ -22,6 +22,7 @@ import slick.jdbc.SQLActionBuilder import za.co.absa.db.fadb.DBSchema import za.co.absa.db.fadb.slick.FaDbPostgresProfile.api._ import za.co.absa.db.fadb.slick.SlickFunction.SlickOptionalResultFunction +import za.co.absa.db.fadb.testing.classes.{Actor, ActorSlickConverter, SlickTest} import scala.concurrent.ExecutionContext.Implicits.global diff --git a/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickSingleResultFunctionWithStatusIntegrationTests.scala b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickSingleResultFunctionWithStatusIntegrationTests.scala index 3cfb3abd..ea7f9e61 100644 --- a/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickSingleResultFunctionWithStatusIntegrationTests.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/slick/SlickSingleResultFunctionWithStatusIntegrationTests.scala @@ -23,6 +23,7 @@ import za.co.absa.db.fadb.DBSchema import za.co.absa.db.fadb.slick.FaDbPostgresProfile.api._ import za.co.absa.db.fadb.slick.SlickFunction.SlickSingleResultFunctionWithStatus import za.co.absa.db.fadb.status.handling.implementations.StandardStatusHandling +import za.co.absa.db.fadb.testing.classes.SlickTest import scala.concurrent.ExecutionContext.Implicits.global diff --git a/slick/src/test/scala/za/co/absa/db/fadb/testng/classes/Actor.scala b/slick/src/test/scala/za/co/absa/db/fadb/testing/classes/Actor.scala similarity index 93% rename from slick/src/test/scala/za/co/absa/db/fadb/testng/classes/Actor.scala rename to slick/src/test/scala/za/co/absa/db/fadb/testing/classes/Actor.scala index e1f1fca8..2a78f7b1 100644 --- a/slick/src/test/scala/za/co/absa/db/fadb/testng/classes/Actor.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/testing/classes/Actor.scala @@ -14,6 +14,6 @@ * limitations under the License. */ -package za.co.absa.db.fadb.slick +package za.co.absa.db.fadb.testing.classes case class Actor(actorId: Int, firstName: String, lastName: String) diff --git a/slick/src/test/scala/za/co/absa/db/fadb/testng/classes/ActorSlickConverter.scala b/slick/src/test/scala/za/co/absa/db/fadb/testing/classes/ActorSlickConverter.scala similarity index 95% rename from slick/src/test/scala/za/co/absa/db/fadb/testng/classes/ActorSlickConverter.scala rename to slick/src/test/scala/za/co/absa/db/fadb/testing/classes/ActorSlickConverter.scala index 339fa7ef..4225addc 100644 --- a/slick/src/test/scala/za/co/absa/db/fadb/testng/classes/ActorSlickConverter.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/testing/classes/ActorSlickConverter.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.db.fadb.slick +package za.co.absa.db.fadb.testing.classes import slick.jdbc.{GetResult, PositionedResult} diff --git a/slick/src/test/scala/za/co/absa/db/fadb/testng/classes/OptionalActorSlickConverter.scala b/slick/src/test/scala/za/co/absa/db/fadb/testing/classes/OptionalActorSlickConverter.scala similarity index 96% rename from slick/src/test/scala/za/co/absa/db/fadb/testng/classes/OptionalActorSlickConverter.scala rename to slick/src/test/scala/za/co/absa/db/fadb/testing/classes/OptionalActorSlickConverter.scala index 7c4786cb..3a7fe4a2 100644 --- a/slick/src/test/scala/za/co/absa/db/fadb/testng/classes/OptionalActorSlickConverter.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/testing/classes/OptionalActorSlickConverter.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.db.fadb.slick +package za.co.absa.db.fadb.testing.classes import slick.jdbc.{GetResult, PositionedResult} diff --git a/slick/src/test/scala/za/co/absa/db/fadb/testng/classes/SlickTest.scala b/slick/src/test/scala/za/co/absa/db/fadb/testing/classes/SlickTest.scala similarity index 96% rename from slick/src/test/scala/za/co/absa/db/fadb/testng/classes/SlickTest.scala rename to slick/src/test/scala/za/co/absa/db/fadb/testing/classes/SlickTest.scala index 53afe77a..dd16cd63 100644 --- a/slick/src/test/scala/za/co/absa/db/fadb/testng/classes/SlickTest.scala +++ b/slick/src/test/scala/za/co/absa/db/fadb/testing/classes/SlickTest.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package za.co.absa.db.fadb.slick +package za.co.absa.db.fadb.testing.classes import slick.jdbc.JdbcBackend.Database import za.co.absa.db.fadb.DBSchema From e9b0e2ceac7f95cadf24a90367eafd7fb1aee522 Mon Sep 17 00:00:00 2001 From: David Benedeki Date: Fri, 28 Jun 2024 18:02:15 +0200 Subject: [PATCH 4/4] * workflow bug --- .github/workflows/test_filenames_check.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test_filenames_check.yml b/.github/workflows/test_filenames_check.yml index f9f84d72..612f3a9d 100644 --- a/.github/workflows/test_filenames_check.yml +++ b/.github/workflows/test_filenames_check.yml @@ -37,6 +37,5 @@ jobs: paths: '**/src/test/scala/**' report-format: 'console' excludes: '**/src/test/scala/za/co/absa/db/fadb/testing/**' - slick/src/test/scala/za/co/absa/db/fadb/testng/classes/Actor.scala verbose-logging: 'false' fail-on-violation: 'true'