From d255f6e1fc5ec8c463668649fb745a945001f980 Mon Sep 17 00:00:00 2001
From: Pavel Salamon <salamonpavel@gmail.com>
Date: Thu, 11 Jul 2024 12:53:24 +0200
Subject: [PATCH] minors

---
 .../db/fadb/doobie/postgres/circe/implicits/package.scala   | 4 ++--
 .../co/absa/db/fadb/doobie/JsonArrayIntegrationTests.scala  | 5 +++++
 .../za/co/absa/db/fadb/testing/classes/DoobieTest.scala     | 6 ------
 project/Dependencies.scala                                  | 3 ++-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doobie/src/main/scala/za/co/absa/db/fadb/doobie/postgres/circe/implicits/package.scala b/doobie/src/main/scala/za/co/absa/db/fadb/doobie/postgres/circe/implicits/package.scala
index 4cb526bc..baf7ddaf 100644
--- a/doobie/src/main/scala/za/co/absa/db/fadb/doobie/postgres/circe/implicits/package.scala
+++ b/doobie/src/main/scala/za/co/absa/db/fadb/doobie/postgres/circe/implicits/package.scala
@@ -62,8 +62,8 @@ package object implicits {
       }
   }
 
-  // to be used for both json[] and jsonb[] as it handles well both and we want to avoid collision
-  // when resolving implicits
+  // to be used for both json[] and jsonb[] as it handles well both
+  // and we want to avoid collision when resolving implicits
   implicit val jsonOrJsonbArrayGet: Get[List[Json]] = {
     Get.Advanced
       .other[PgArray](
diff --git a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/JsonArrayIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/JsonArrayIntegrationTests.scala
index 237a92dc..f65e3b42 100644
--- a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/JsonArrayIntegrationTests.scala
+++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/JsonArrayIntegrationTests.scala
@@ -25,6 +25,7 @@ import org.scalatest.funsuite.AnyFunSuite
 import za.co.absa.db.fadb.DBSchema
 import za.co.absa.db.fadb.doobie.DoobieFunction.{DoobieMultipleResultFunction, DoobieSingleResultFunction}
 import za.co.absa.db.fadb.testing.classes.DoobieTest
+import io.circe.generic.auto._
 
 import za.co.absa.db.fadb.doobie.postgres.circe.implicits.jsonOrJsonbArrayGet
 
@@ -36,10 +37,14 @@ class JsonArrayIntegrationTests extends AnyFunSuite with DoobieTest {
         val actorsAsJsonList = values.map(_.asJson)
         Seq(
           {
+            // has to be imported inside separate scope to avoid conflicts with the import below
+            // as both implicits are of the same type and this would cause ambiguity
             import za.co.absa.db.fadb.doobie.postgres.circe.implicits.jsonArrayPut
             fr"$actorsAsJsonList"
           },
           {
+            // has to be imported inside separate scope to avoid conflicts with the import above
+            // as both implicits are of the same type and this would cause ambiguity
             import za.co.absa.db.fadb.doobie.postgres.circe.implicits.jsonbArrayPut
             fr"$actorsAsJsonList"
           }
diff --git a/doobie/src/test/scala/za/co/absa/db/fadb/testing/classes/DoobieTest.scala b/doobie/src/test/scala/za/co/absa/db/fadb/testing/classes/DoobieTest.scala
index fa570b53..e6cbf5ef 100644
--- a/doobie/src/test/scala/za/co/absa/db/fadb/testing/classes/DoobieTest.scala
+++ b/doobie/src/test/scala/za/co/absa/db/fadb/testing/classes/DoobieTest.scala
@@ -20,15 +20,9 @@ import cats.effect.IO
 import doobie.util.transactor.Transactor
 import doobie.util.transactor.Transactor.Aux
 import za.co.absa.db.fadb.DBSchema
-import io.circe.{Decoder, Encoder}
-import io.circe.generic.semiauto._
 
 trait DoobieTest {
   case class Actor(actorId: Int, firstName: String, lastName: String)
-  object Actor {
-    implicit val actorEncoder: Encoder[Actor] = deriveEncoder
-    implicit val actorDecoder: Decoder[Actor] = deriveDecoder
-  }
   case class GetActorsQueryParameters(firstName: Option[String], lastName: Option[String])
   case class GetActorsByLastnameQueryParameters(lastName: String, firstName: Option[String] = None)
   case class CreateActorRequestBody(firstName: String, lastName: String)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index d3b502f0..1ad183b8 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -48,7 +48,8 @@ object Dependencies {
       "org.tpolecat" %% "doobie-core" % "1.0.0-RC2",
       "org.tpolecat" %% "doobie-hikari" % "1.0.0-RC2",
       "org.tpolecat" %% "doobie-postgres" % "1.0.0-RC2",
-      "org.tpolecat" %% "doobie-postgres-circe" % "1.0.0-RC2"
+      "org.tpolecat" %% "doobie-postgres-circe" % "1.0.0-RC2",
+      "io.circe" %% "circe-generic" % "0.14.9" % Test
     )
   }