Extract common code for annotation based information (zio#650)

987Nabil · Jan 30, 2024 · 9a2345d · 9a2345d
1 parent 130dcfe
commit 9a2345d
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 610 deletions.
diff --git a/zio-schema-bson/src/main/scala/zio/schema/codec/BsonSchemaCodec.scala b/zio-schema-bson/src/main/scala/zio/schema/codec/BsonSchemaCodec.scala
@@ -30,7 +30,6 @@ import zio.schema.annotation.{
  caseNameAliases,
  directDynamicMapping,
  discriminatorName,
- fieldDefaultValue,
  fieldNameAliases,
  noDiscriminator,
  rejectExtraFields,
@@ -605,12 +604,12 @@ object BsonSchemaCodec {
  // if all cases are CaseClass0, encode as a String
  if (cases.forall(_.schema.isInstanceOf[Schema.CaseClass0[_]])) {
  val caseMap: Map[Z, String] = cases
- .filterNot(_.annotations.exists(_.isInstanceOf[transientCase]))
+ .filterNot(_.transient)
  .map { case_ =>
  val manualBsonHint = case_.annotations.collectFirst { case bsonHint(name) => name }
- val manualCaseName = case_.annotations.collectFirst { case caseName(name) => name }
+ val caseName = case_.caseName
  case_.schema.asInstanceOf[Schema.CaseClass0[Z]].defaultConstruct() ->
- manualBsonHint.orElse(manualCaseName).getOrElse(case_.id)
+ manualBsonHint.getOrElse(caseName)
  }
  .toMap
  BsonEncoder.string.contramap(caseMap(_))
@@ -621,8 +620,8 @@ object BsonSchemaCodec {
 
  def getCaseName(case_ : Schema.Case[Z, _]) = {
  val manualBsonHint = case_.annotations.collectFirst { case bsonHint(name) => name }
- val manualCaseName = case_.annotations.collectFirst { case caseName(name) => name }
- manualBsonHint.orElse(manualCaseName).getOrElse(case_.id)
+ val caseName = case_.caseName
+ manualBsonHint.getOrElse(caseName)
  }
 
  val noDiscriminators = parentSchema.annotations.exists {
@@ -1208,7 +1207,7 @@ object BsonSchemaCodec {
  case _: bsonNoExtraFields => ()
  }.isDefined
  lazy val tcs: Array[BsonDecoder[Any]] = schemas.map(s => schemaDecoder(s).asInstanceOf[BsonDecoder[Any]])
- lazy val defaults: Array[Option[Any]] = fields.map(_.annotations.collectFirst { case a: fieldDefaultValue[_] => a.value }).toArray
+ lazy val defaults: Array[Option[Any]] = fields.map(_.defaultValue).toArray
 
  new BsonDecoder[Z] {
  def decodeUnsafe(reader: BsonReader, trace: List[BsonTrace], ctx: BsonDecoder.BsonDecoderContext): Z = unsafeCall(trace) {