Revert "add Configuration"

This reverts commit 43eee84.
fd4s · May 19, 2022 · 13d5363 · 13d5363
1 parent c4b14c1
commit 13d5363
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 32 deletions.
diff --git a/modules/generic/src/main/scala-2/vulcan/generic/package.scala b/modules/generic/src/main/scala-2/vulcan/generic/package.scala
@@ -51,12 +51,7 @@ package object generic {
   implicit final class MagnoliaCodec private[generic] (
     private val codec: Codec.type
   ) extends AnyVal {
-    final def combine[A](caseClass: CaseClass[Codec, A])(implicit config: Configuration = Configuration.default): Codec[A] = {
-      def extractName(typeName: TypeName, genSep: String, typeSep: String): String = {
-        if (typeName.typeArguments.isEmpty) typeName.short
-        else typeName.short + genSep + typeName.typeArguments.map(extractName(_, genSep, typeSep)).mkString(typeSep)
-      }
-
+    final def combine[A](caseClass: CaseClass[Codec, A]): Codec[A] =
       if (caseClass.isValueClass) {
         val param = caseClass.parameters.head
         param.typeclass.imap(value => caseClass.rawConstruct(List(value)))(param.dereference)
@@ -66,10 +61,7 @@ package object generic {
           .record[A](
             name = caseClass.annotations
               .collectFirst { case AvroName(namespace) => namespace }
-              .getOrElse(config.typeSeparators match {
-                case Some((genSep, typeSep)) => extractName(caseClass.typeName, genSep, typeSep)
-                case None => caseClass.typeName.short
-              }),
+              .getOrElse(extractName(caseClass.typeName)),
             namespace = caseClass.annotations
               .collectFirst { case AvroNamespace(namespace) => namespace }
               .getOrElse(caseClass.typeName.owner),
@@ -105,7 +97,10 @@ package object generic {
               .map(caseClass.rawConstruct(_))
           }
       }
-    }
+
+    private def extractName(typeName: TypeName): String =
+      if (typeName.typeArguments.isEmpty) typeName.short
+      else typeName.short + "__" + typeName.typeArguments.map(extractName).mkString("_")
 
     /**
       * Returns a `Codec` instance for the specified type,

diff --git a/modules/generic/src/main/scala/vulcan/generic/Configuration.scala b/modules/generic/src/main/scala/vulcan/generic/Configuration.scala
diff --git a/modules/generic/src/test/scala/vulcan/generic/examples/CaseClassTypeParameterField.scala b/modules/generic/src/test/scala/vulcan/generic/examples/CaseClassTypeParameterField.scala
@@ -10,8 +10,6 @@ final case class CaseClassTypeParameterField[T](s: String, value: T)
 final case class CaseClassInner[T](inner: T)
 
 object CaseClassTypeParameterField {
-  implicit val configuration: Configuration = avro4s.avro4sGenericConfiguration
-
   implicit val intCodec: Codec[CaseClassTypeParameterField[Int]] =
     Codec.derive