refactor: moved json conversion to own package

QuadStingray · QuadStingray · commit bc44de26c16f · 2025-01-28T13:17:15.000+01:00
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/MongoDAO.scala b/src/main/scala/dev/mongocamp/driver/mongodb/MongoDAO.scala
@@ -11,14 +11,14 @@ import org.mongodb.scala.model.Aggregates._
 import org.mongodb.scala.model.Filters._
 import org.mongodb.scala.model.Projections
 import org.mongodb.scala.{ BulkWriteResult, Document, MongoCollection, Observable, SingleObservable }
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
+import dev.mongocamp.driver.mongodb.json._
 import io.circe.generic.auto._
 
 import java.nio.charset.Charset
 import java.util.Date
 import scala.collection.mutable.ArrayBuffer
 import scala.reflect.ClassTag
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
+import dev.mongocamp.driver.mongodb.json._
 /** Created by tom on 20.01.17.
   */
 abstract class MongoDAO[A](provider: DatabaseProvider, collectionName: String)(implicit ct: ClassTag[A], decoder: Decoder[A]) extends Crud[A] {
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/database/DatabaseProvider.scala b/src/main/scala/dev/mongocamp/driver/mongodb/database/DatabaseProvider.scala
@@ -1,7 +1,7 @@
 package dev.mongocamp.driver.mongodb.database
 
 import dev.mongocamp.driver.mongodb._
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
+import dev.mongocamp.driver.mongodb.json._
 import org.mongodb.scala._
 import org.mongodb.scala.gridfs.GridFSBucket
 
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/gridfs/Metadata.scala b/src/main/scala/dev/mongocamp/driver/mongodb/gridfs/Metadata.scala
@@ -10,7 +10,7 @@ import org.mongodb.scala.model.Filters.equal
 import org.mongodb.scala.model.Updates._
 import org.mongodb.scala.result.UpdateResult
 import org.mongodb.scala.{ Document, Observable }
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
+import dev.mongocamp.driver.mongodb.json._
 
 abstract class Metadata(provider: DatabaseProvider, bucketName: String) extends Crud {
 
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/resultSet/MongoDbResultSet.scala b/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/resultSet/MongoDbResultSet.scala
@@ -17,7 +17,7 @@ import java.nio.charset.StandardCharsets
 import javax.sql.rowset.serial.SerialBlob
 import scala.util.Try
 import org.mongodb.scala.documentToUntypedDocument
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
+import dev.mongocamp.driver.mongodb.json._
 
 class MongoDbResultSet(collectionDao: MongoDAO[Document], data: List[Document], queryTimeOut: Int) extends ResultSet with MongoJdbcCloseable {
   private var currentRow: Document = _
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/resultSet/MongoDbResultSetMetaData.scala b/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/resultSet/MongoDbResultSetMetaData.scala
@@ -1,7 +1,7 @@
 package dev.mongocamp.driver.mongodb.jdbc.resultSet
 
-import dev.mongocamp.driver.mongodb.{ MongoDAO, _ }
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
+import dev.mongocamp.driver.mongodb.*
+import dev.mongocamp.driver.mongodb.json._
 import org.mongodb.scala.Document
 import org.mongodb.scala.bson.{ BsonBoolean, BsonInt32, BsonInt64, BsonNumber, BsonString }
 
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/json/CirceProductSchema.scala b/src/main/scala/dev/mongocamp/driver/mongodb/json/CirceProductSchema.scala
@@ -1,4 +1,4 @@
-package dev.mongocamp.driver.mongodb.schema
+package dev.mongocamp.driver.mongodb.json
 
 import io.circe.Decoder.Result
 import io.circe.{ Decoder, Encoder, HCursor, Json }
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/json/CirceSchema.scala b/src/main/scala/dev/mongocamp/driver/mongodb/json/CirceSchema.scala
@@ -1,7 +1,7 @@
-package dev.mongocamp.driver.mongodb.schema
+package dev.mongocamp.driver.mongodb.json
 
 import io.circe.Decoder.Result
-import io.circe.{Decoder, Encoder, HCursor, Json}
+import io.circe.{ Decoder, Encoder, HCursor, Json }
 import org.bson.types.ObjectId
 import org.joda.time.DateTime
 import org.mongodb.scala.Document
@@ -11,19 +11,13 @@ import java.util.Date
 trait CirceSchema extends CirceProductSchema {
 
   implicit lazy val DocumentOneFormat: io.circe.Decoder[org.mongodb.scala.Document] = { (c: HCursor) =>
-    ???
+    // not really needed only for decoder must exists
+  ???
   }
 
   implicit lazy val DocumentTowFormat: io.circe.Decoder[org.bson.Document] = { (c: HCursor) =>
-    ???
-  }
-
-  implicit lazy val ThrowableFormat: io.circe.Decoder[Throwable] = { (c: HCursor) =>
-    ???
-  }
-
-  implicit lazy val ExceptionFormat: io.circe.Decoder[Exception] = { (c: HCursor) =>
-    ???
+    // not really needed only for decoder must exists
+  ???
   }
 
   implicit val DateFormat: Encoder[Date] with io.circe.Decoder[Date] = new io.circe.Encoder[Date] with io.circe.Decoder[Date] {
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/json/JsonConverter.scala b/src/main/scala/dev/mongocamp/driver/mongodb/json/JsonConverter.scala
@@ -1,10 +1,10 @@
-package dev.mongocamp.driver.mongodb.schema
+package dev.mongocamp.driver.mongodb.json
 
 import better.files.Resource
-import io.circe.{ Decoder, HCursor }
+import io.circe.generic.auto.*
 import io.circe.jawn.decode
-import io.circe.syntax._
-import io.circe.generic.auto._
+import io.circe.syntax.*
+import io.circe.{ Decoder, HCursor }
 import org.bson.Document
 
 import scala.collection.mutable
@@ -30,5 +30,3 @@ class JsonConverter extends CirceSchema {
   }
 
 }
-
-object JsonConverter extends CirceSchema {}
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/json/package.scala b/src/main/scala/dev/mongocamp/driver/mongodb/json/package.scala
@@ -0,0 +1,3 @@
+package dev.mongocamp.driver.mongodb
+
+package object json extends CirceSchema
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/operation/Base.scala b/src/main/scala/dev/mongocamp/driver/mongodb/operation/Base.scala
@@ -3,8 +3,7 @@ package dev.mongocamp.driver.mongodb.operation
 import com.typesafe.scalalogging.LazyLogging
 import dev.mongocamp.driver.mongodb.bson.BsonConverter
 import dev.mongocamp.driver.mongodb.database.MongoIndex
-import dev.mongocamp.driver.mongodb.schema.CirceSchema
-import dev.mongocamp.driver.mongodb.schema.JsonConverter.*
+import dev.mongocamp.driver.mongodb.json.*
 import io.circe.Decoder
 import io.circe.syntax.*
 import org.mongodb.scala.bson.conversions.Bson
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/pagination/MongoPaginatedAggregation.scala b/src/main/scala/dev/mongocamp/driver/mongodb/pagination/MongoPaginatedAggregation.scala
@@ -2,13 +2,13 @@ package dev.mongocamp.driver.mongodb.pagination
 
 import com.mongodb.client.model.Facet
 import dev.mongocamp.driver.mongodb.exception.MongoCampPaginationException
-import dev.mongocamp.driver.mongodb.{ MongoDAO, _ }
+import dev.mongocamp.driver.mongodb.*
 import org.mongodb.scala.bson.Document
 import org.mongodb.scala.bson.conversions.Bson
 import org.mongodb.scala.model.Aggregates
 
 import scala.jdk.CollectionConverters._
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
+import dev.mongocamp.driver.mongodb.json._
 
 case class MongoPaginatedAggregation[A <: Any](
     dao: MongoDAO[A],
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/schema/JsonSchema.scala b/src/main/scala/dev/mongocamp/driver/mongodb/schema/JsonSchema.scala
@@ -1,5 +1,7 @@
 package dev.mongocamp.driver.mongodb.schema
 
+import dev.mongocamp.driver.mongodb.json.JsonConverter
+
 case class JsonSchema(`$schema`: String, `$ref`: String, definitions: Map[String, JsonSchemaDefinition]) {
   def toJson: String = {
     new JsonConverter().toJson(this)
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/schema/SchemaExplorer.scala b/src/main/scala/dev/mongocamp/driver/mongodb/schema/SchemaExplorer.scala
@@ -1,7 +1,8 @@
 package dev.mongocamp.driver.mongodb.schema
 
 import better.files.Resource
-import dev.mongocamp.driver.mongodb._
+import dev.mongocamp.driver.mongodb.*
+import dev.mongocamp.driver.mongodb.json.JsonConverter
 import org.bson.conversions.Bson
 import org.mongodb.scala.Document
 
@@ -10,8 +11,9 @@ import scala.collection.mutable.ArrayBuffer
 import scala.concurrent.duration.DurationInt
 import io.circe.parser.decode
 import org.mongodb.scala.documentToUntypedDocument
-import io.circe.generic.auto._, io.circe.syntax._
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
+import io.circe.generic.auto.*
+import io.circe.syntax.*
+import dev.mongocamp.driver.mongodb.json.*
 
 class SchemaExplorer {
   private val NameSeparator: String = "."
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/sql/MongoSqlQueryHolder.scala b/src/main/scala/dev/mongocamp/driver/mongodb/sql/MongoSqlQueryHolder.scala
@@ -37,7 +37,7 @@ import scala.jdk.CollectionConverters._
 import scala.util.Try
 import net.sf.jsqlparser.statement.Statement
 import io.circe.generic.auto._, io.circe.syntax._
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
+import dev.mongocamp.driver.mongodb.json._
 
 class MongoSqlQueryHolder {
   private val aggregatePipeline: ArrayBuffer[Document]       = ArrayBuffer()
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/sync/MongoSyncOperation.scala b/src/main/scala/dev/mongocamp/driver/mongodb/sync/MongoSyncOperation.scala
@@ -3,7 +3,7 @@ package dev.mongocamp.driver.mongodb.sync
 import com.typesafe.scalalogging.LazyLogging
 import dev.mongocamp.driver.mongodb._
 import dev.mongocamp.driver.mongodb.database.{ ConfigHelper, DatabaseProvider }
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
+import dev.mongocamp.driver.mongodb.json._
 import dev.mongocamp.driver.mongodb.sync.SyncDirection.SyncDirection
 import dev.mongocamp.driver.mongodb.sync.SyncStrategy.SyncStrategy
 import org.mongodb.scala.Document
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/sync/MongoSyncResult.scala b/src/main/scala/dev/mongocamp/driver/mongodb/sync/MongoSyncResult.scala
@@ -11,4 +11,4 @@ case class MongoSyncResult(
     countAfter: Int = -1,
     syncTime: Long = -1,
     exception: Option[Exception] = None
-)
+)
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/sync/MongoSyncer.scala b/src/main/scala/dev/mongocamp/driver/mongodb/sync/MongoSyncer.scala
@@ -1,20 +1,31 @@
 package dev.mongocamp.driver.mongodb.sync
 
-import dev.mongocamp.driver.mongodb._
-import dev.mongocamp.driver.mongodb.database.{ DatabaseProvider, MongoConfig }
+import dev.mongocamp.driver.mongodb.*
+import dev.mongocamp.driver.mongodb.database.{DatabaseProvider, MongoConfig}
 import org.bson.codecs.configuration.CodecRegistries.fromProviders
-import org.mongodb.scala.bson.codecs.Macros._
+import org.mongodb.scala.bson.codecs.Macros.*
 
 import scala.collection.mutable
-import io.circe.generic.auto._
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
-
-import io.circe.syntax._
+import io.circe.generic.auto.*
+import dev.mongocamp.driver.mongodb.json.*
+import io.circe.HCursor
+import io.circe.syntax.*
 case class MongoSyncer(
     sourceConfig: MongoConfig,
     targetConfig: MongoConfig,
     syncOperations: List[MongoSyncOperation] = List()
 ) {
+
+  implicit private lazy val ThrowableFormat: io.circe.Decoder[Throwable] = { (c: HCursor) =>
+    // not really needed only for decoder must exists
+    ???
+  }
+
+  implicit private lazy val ExceptionFormat: io.circe.Decoder[Exception] = { (c: HCursor) =>
+    // not really needed only for decoder must exists
+    ???
+  }
+
   // todo: check if this is correct
 //  private val registry     = fromProviders(classOf[MongoSyncResult])
   private val operationMap = new mutable.HashMap[String, MongoSyncOperation]()
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/operation/CrudSpec.scala b/src/test/scala/dev/mongocamp/driver/mongodb/operation/CrudSpec.scala
@@ -10,7 +10,7 @@ import org.mongodb.scala.bson.ObjectId
 import org.mongodb.scala.model.Filters.equal
 import org.mongodb.scala.model.Updates._
 import org.mongodb.scala.result.DeleteResult
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
+import dev.mongocamp.driver.mongodb.json._
 import io.circe.syntax._
 import io.circe.generic.auto._
 
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/relation/RelationDemoDatabase.scala b/src/test/scala/dev/mongocamp/driver/mongodb/relation/RelationDemoDatabase.scala
@@ -1,12 +1,12 @@
 package dev.mongocamp.driver.mongodb.relation
 
 import dev.mongocamp.driver.mongodb.database.DatabaseProvider
-import dev.mongocamp.driver.mongodb.{ MongoDAO, _ }
+import dev.mongocamp.driver.mongodb.*
 import org.bson.codecs.configuration.CodecRegistries.fromProviders
 import org.mongodb.scala.bson.ObjectId
 import org.mongodb.scala.bson.codecs.Macros._
 import org.mongodb.scala.result.UpdateResult
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
+import dev.mongocamp.driver.mongodb.json._
 import io.circe.syntax._
 import io.circe.generic.auto._
 
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/sql/DeleteSqlSpec.scala b/src/test/scala/dev/mongocamp/driver/mongodb/sql/DeleteSqlSpec.scala
@@ -6,7 +6,7 @@ import dev.mongocamp.driver.mongodb.{ GenericObservable, MongoDAO }
 import org.bson.types.ObjectId
 import org.specs2.mutable.Specification
 import org.specs2.specification.BeforeEach
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
+import dev.mongocamp.driver.mongodb.json._
 import io.circe.syntax._
 import io.circe.generic.auto._
 
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/sql/OtherSqlSpec.scala b/src/test/scala/dev/mongocamp/driver/mongodb/sql/OtherSqlSpec.scala
@@ -10,7 +10,7 @@ import org.mongodb.scala.model.Sorts.ascending
 import org.specs2.specification.BeforeEach
 
 import java.sql.SQLException
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
+import dev.mongocamp.driver.mongodb.json._
 import io.circe.syntax._
 import io.circe.generic.auto._
 
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/sql/UpdateSqlSpec.scala b/src/test/scala/dev/mongocamp/driver/mongodb/sql/UpdateSqlSpec.scala
@@ -6,7 +6,7 @@ import dev.mongocamp.driver.mongodb._
 import org.bson.types.ObjectId
 import org.specs2.mutable.Specification
 import org.specs2.specification.BeforeEach
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
+import dev.mongocamp.driver.mongodb.json._
 import io.circe.syntax._
 import io.circe.generic.auto._
 
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/test/TestDatabase.scala b/src/test/scala/dev/mongocamp/driver/mongodb/test/TestDatabase.scala
@@ -5,7 +5,7 @@ import com.mongodb.client.model.changestream.OperationType
 import com.typesafe.scalalogging.LazyLogging
 import dev.mongocamp.driver.mongodb.database.DatabaseProvider
 import dev.mongocamp.driver.mongodb.model._
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
+import dev.mongocamp.driver.mongodb.json._
 import dev.mongocamp.driver.mongodb.{ GridFSDAO, MongoDAO }
 import io.circe.generic.auto._
 import org.mongodb.scala.Document
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/test/UniversityDatabase.scala b/src/test/scala/dev/mongocamp/driver/mongodb/test/UniversityDatabase.scala
@@ -5,7 +5,7 @@ import dev.mongocamp.driver.mongodb.model._
 import dev.mongocamp.driver.mongodb.server.LocalServer
 import dev.mongocamp.driver.mongodb.{GridFSDAO, MongoDAO}
 
-import dev.mongocamp.driver.mongodb.schema.JsonConverter._
+import dev.mongocamp.driver.mongodb.json._
 import io.circe.syntax._
 import io.circe.generic.auto._
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package dev.mongocamp.driver.mongodb.schema`
	`1`	`+package dev.mongocamp.driver.mongodb.json`
`2`	`2`
`3`	`3`	`import io.circe.Decoder.Result`
`4`	`4`	`import io.circe.{ Decoder, Encoder, HCursor, Json }`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package dev.mongocamp.driver.mongodb`
	`2`	`+`
	`3`	`+package object json extends CirceSchema`