Test AvroName annotation in scala 3, fix

fd4s · Mar 9, 2022 · 0114a25 · 0114a25
1 parent 6f4dba0
commit 0114a25
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 48 deletions.
diff --git a/build.sbt b/build.sbt
@@ -209,48 +209,50 @@ lazy val buildInfoSettings = Seq(
   buildInfoPackage := "vulcan.build",
   buildInfoObject := "info",
   buildInfoKeys := {
-  val magnolia: String = if (scalaVersion.value.startsWith("3")) magnolia3Version else magnolia2Version
-  Seq[BuildInfoKey](
-    scalaVersion,
-    scalacOptions,
-    sourceDirectory,
-    ThisBuild / latestVersion,
-    BuildInfoKey.map(ThisBuild / version) {
-      case (_, v) => "latestSnapshotVersion" -> v
-    },
-    BuildInfoKey.map(core / moduleName) {
-      case (k, v) => "core" ++ k.capitalize -> v
-    },
-    BuildInfoKey.map(core / crossScalaVersions) {
-      case (k, v) => "core" ++ k.capitalize -> v
-    },
-    BuildInfoKey.map(enumeratum / moduleName) {
-      case (k, v) => "enumeratum" ++ k.capitalize -> v
-    },
-    BuildInfoKey.map(enumeratum / crossScalaVersions) {
-      case (k, v) => "enumeratum" ++ k.capitalize -> v
-    },
-    BuildInfoKey.map(generic / moduleName) {
-      case (k, v) => "generic" ++ k.capitalize -> v
-    },
-    BuildInfoKey.map(generic / crossScalaVersions) {
-      case (k, v) => "generic" ++ k.capitalize -> v
-    },
-    BuildInfoKey.map(refined / moduleName) {
-      case (k, v) => "refined" ++ k.capitalize -> v
-    },
-    BuildInfoKey.map(refined / crossScalaVersions) {
-      case (k, v) => "refined" ++ k.capitalize -> v
-    },
-    LocalRootProject / organization,
-    core / crossScalaVersions,
-    BuildInfoKey("avroVersion" -> avroVersion),
-    BuildInfoKey("catsVersion" -> catsVersion),
-    BuildInfoKey("enumeratumVersion" -> enumeratumVersion),
-    BuildInfoKey("magnoliaVersion" -> magnolia),
-    BuildInfoKey("refinedVersion" -> refinedVersion),
-    BuildInfoKey("shapelessVersion" -> shapelessVersion)
-  )}
+    val magnolia: String =
+      if (scalaVersion.value.startsWith("3")) magnolia3Version else magnolia2Version
+    Seq[BuildInfoKey](
+      scalaVersion,
+      scalacOptions,
+      sourceDirectory,
+      ThisBuild / latestVersion,
+      BuildInfoKey.map(ThisBuild / version) {
+        case (_, v) => "latestSnapshotVersion" -> v
+      },
+      BuildInfoKey.map(core / moduleName) {
+        case (k, v) => "core" ++ k.capitalize -> v
+      },
+      BuildInfoKey.map(core / crossScalaVersions) {
+        case (k, v) => "core" ++ k.capitalize -> v
+      },
+      BuildInfoKey.map(enumeratum / moduleName) {
+        case (k, v) => "enumeratum" ++ k.capitalize -> v
+      },
+      BuildInfoKey.map(enumeratum / crossScalaVersions) {
+        case (k, v) => "enumeratum" ++ k.capitalize -> v
+      },
+      BuildInfoKey.map(generic / moduleName) {
+        case (k, v) => "generic" ++ k.capitalize -> v
+      },
+      BuildInfoKey.map(generic / crossScalaVersions) {
+        case (k, v) => "generic" ++ k.capitalize -> v
+      },
+      BuildInfoKey.map(refined / moduleName) {
+        case (k, v) => "refined" ++ k.capitalize -> v
+      },
+      BuildInfoKey.map(refined / crossScalaVersions) {
+        case (k, v) => "refined" ++ k.capitalize -> v
+      },
+      LocalRootProject / organization,
+      core / crossScalaVersions,
+      BuildInfoKey("avroVersion" -> avroVersion),
+      BuildInfoKey("catsVersion" -> catsVersion),
+      BuildInfoKey("enumeratumVersion" -> enumeratumVersion),
+      BuildInfoKey("magnoliaVersion" -> magnolia),
+      BuildInfoKey("refinedVersion" -> refinedVersion),
+      BuildInfoKey("shapelessVersion" -> shapelessVersion)
+    )
+  }
 )
 
 lazy val metadataSettings = Seq(

diff --git a/modules/generic/src/main/scala-2/vulcan/generic/package.scala b/modules/generic/src/main/scala-2/vulcan/generic/package.scala
@@ -118,8 +118,14 @@ package object generic {
           .collectFirst { case AvroNamespace(namespace) => namespace }
           .getOrElse(caseClass.typeName.owner)
 
+      val shortName =
+        caseClass.annotations
+          .collectFirst { case AvroName(namespace) => namespace }
+          .getOrElse(caseClass.typeName.short)
+
       val typeName =
-        s"$namespace.${caseClass.typeName.short}"
+        s"$namespace.$shortName"
+
       val schema =
         if (caseClass.isValueClass) {
           caseClass.parameters.head.typeclass.schema

diff --git a/modules/generic/src/main/scala-3/vulcan/generic/package.scala b/modules/generic/src/main/scala-3/vulcan/generic/package.scala
@@ -32,8 +32,14 @@ package object generic {
           .collectFirst { case AvroNamespace(namespace) => namespace }
           .getOrElse(caseClass.typeInfo.owner)
 
-      val typeName =
-        s"$namespace.${caseClass.typeInfo.short}"
+      val shortName =
+        caseClass.annotations
+          .collectFirst { case AvroName(namespace) => namespace }
+          .getOrElse(caseClass.typeInfo.short)
+
+      val typeName = 
+        s"$namespace.$shortName"
+
       val schema =
         if (caseClass.isValueClass) {
           caseClass.params.head.typeclass.schema
@@ -67,7 +73,7 @@ package object generic {
 
             fields.map { fields =>
               Schema.createRecord(
-                caseClass.typeInfo.short,
+                shortName,
                 caseClass.annotations.collectFirst {
                   case AvroDoc(doc) => doc
                 }.orNull,

diff --git a/...scala-2/vulcan/generic/AvroNameSpec.scala → ...t/scala/vulcan/generic/AvroNameSpec.scala b/...scala-2/vulcan/generic/AvroNameSpec.scala → ...t/scala/vulcan/generic/AvroNameSpec.scala
diff --git a/.../generic/examples/CaseClassAvroName.scala → .../generic/examples/CaseClassAvroName.scala b/.../generic/examples/CaseClassAvroName.scala → .../generic/examples/CaseClassAvroName.scala
diff --git a/...es/generic/src/test/scala/vulcan/generic/examples/SealedTraitCaseClassAvroNamespace.scala b/...es/generic/src/test/scala/vulcan/generic/examples/SealedTraitCaseClassAvroNamespace.scala
@@ -20,8 +20,8 @@ object SealedTraitCaseClassAvroNamespace {
     : Arbitrary[SealedTraitCaseClassAvroNamespace] =
     Arbitrary(
       Gen.oneOf(
-        arbitrary[Int].map(FirstInSealedTraitCaseClassAvroNamespace),
-        arbitrary[String].map(SecondInSealedTraitCaseClassAvroNamespace)
+        arbitrary[Int].map(FirstInSealedTraitCaseClassAvroNamespace(_)),
+        arbitrary[String].map(SecondInSealedTraitCaseClassAvroNamespace(_))
       )
     )