Add layer for low priority coder conflict (#5274)

Michel Davit · web-flow · commit 9a41d8ea7f0c · 2024-02-27T09:13:22.000-05:00
diff --git a/scio-core/src/main/scala/com/spotify/scio/coders/Coder.scala b/scio-core/src/main/scala/com/spotify/scio/coders/Coder.scala
@@ -223,11 +223,14 @@ object Coder
 
 }
 
-trait LowPriorityCoders { self: CoderDerivation with JavaBeanCoders =>
-  implicit override def javaBeanCoder[T: IsJavaBean: ClassTag]: Coder[T] = JavaCoders.javaBeanCoder
+trait LowPriorityCoders extends LowPriorityCoders1 { self: CoderDerivation with JavaBeanCoders =>
   implicit override def gen[T]: Coder[T] = macro MagnoliaMacros.genWithoutAnnotations[T]
 }
 
+trait LowPriorityCoders1 { self: JavaBeanCoders =>
+  implicit override def javaBeanCoder[T: IsJavaBean: ClassTag]: Coder[T] = JavaCoders.javaBeanCoder
+}
+
 private[coders] object CoderStackTrace {
 
   val CoderStackElemMarker = new StackTraceElement(

Original file line number	Diff line number	Diff line change
`@@ -223,11 +223,14 @@ object Coder`
`223`	`223`
`224`	`224`	`}`
`225`	`225`
`226`		`-trait LowPriorityCoders { self: CoderDerivation with JavaBeanCoders =>`
`227`		`- implicit override def javaBeanCoder[T: IsJavaBean: ClassTag]: Coder[T] = JavaCoders.javaBeanCoder`
	`226`	`+trait LowPriorityCoders extends LowPriorityCoders1 { self: CoderDerivation with JavaBeanCoders =>`
`228`	`227`	`implicit override def gen[T]: Coder[T] = macro MagnoliaMacros.genWithoutAnnotations[T]`
`229`	`228`	`}`
`230`	`229`
	`230`	`+trait LowPriorityCoders1 { self: JavaBeanCoders =>`
	`231`	`+ implicit override def javaBeanCoder[T: IsJavaBean: ClassTag]: Coder[T] = JavaCoders.javaBeanCoder`
	`232`	`+}`
	`233`	`+`
`231`	`234`	`private[coders] object CoderStackTrace {`
`232`	`235`
`233`	`236`	`val CoderStackElemMarker = new StackTraceElement(`