From 9a41d8ea7f0c18d9fce1ea0a2fb4dbcd607596c8 Mon Sep 17 00:00:00 2001
From: Michel Davit <micheld@spotify.com>
Date: Tue, 27 Feb 2024 15:13:22 +0100
Subject: [PATCH] Add layer for low priority coder conflict (#5274)

---
 .../src/main/scala/com/spotify/scio/coders/Coder.scala     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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
index 39b2f8e821..6061bfb3aa 100644
--- 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(