Ensure Panache class transformers run before Arc's static method tran…

…sformers Fixes quarkusio#34005 Because static method transformers end up essentially changing the name of static methods (renaming them to *_orig and generating another method in their place), which can cause issues when Panache looks up the new name of transformed methods in Jandex (*_orig methods won't be in the index).
yrodiere · Jun 13, 2023 · 9981677 · 9981677
1 parent 33d742b
commit 9981677
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/...n/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java b/...n/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java
@@ -21,6 +21,7 @@
 
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.arc.deployment.ValidationPhaseBuildItem;
+import io.quarkus.arc.deployment.staticmethods.InterceptedStaticMethodsTransformersRegisteredBuildItem;
 import io.quarkus.builder.BuildException;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
@@ -92,6 +93,7 @@ void collectEntityClasses(CombinedIndexBuildItem index, BuildProducer<PanacheEnt
 
     @BuildStep
     @Consume(HibernateEnhancersRegisteredBuildItem.class)
+    @Consume(InterceptedStaticMethodsTransformersRegisteredBuildItem.class)
     void build(
             CombinedIndexBuildItem index,
             BuildProducer<BytecodeTransformerBuildItem> transformers,

diff --git a/...arkus/hibernate/reactive/panache/common/deployment/PanacheHibernateResourceProcessor.java b/...arkus/hibernate/reactive/panache/common/deployment/PanacheHibernateResourceProcessor.java
@@ -6,6 +6,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import io.quarkus.arc.deployment.staticmethods.InterceptedStaticMethodsTransformersRegisteredBuildItem;
 import jakarta.persistence.Id;
 
 import org.hibernate.reactive.mutiny.Mutiny;
@@ -90,6 +91,7 @@ void collectEntityClasses(CombinedIndexBuildItem index, BuildProducer<PanacheEnt
 
     @BuildStep
     @Consume(HibernateEnhancersRegisteredBuildItem.class)
+    @Consume(InterceptedStaticMethodsTransformersRegisteredBuildItem.class)
     void build(CombinedIndexBuildItem index,
             BuildProducer<BytecodeTransformerBuildItem> transformers,
             List<PanacheEntityClassBuildItem> entityClasses,

diff --git a/...rc/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java b/...rc/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java
@@ -15,6 +15,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
+import io.quarkus.arc.deployment.staticmethods.InterceptedStaticMethodsTransformersRegisteredBuildItem;
+import io.quarkus.deployment.annotations.Consume;
 import org.bson.codecs.pojo.annotations.BsonId;
 import org.bson.codecs.pojo.annotations.BsonIgnore;
 import org.bson.codecs.pojo.annotations.BsonProperty;
@@ -76,6 +78,7 @@ public abstract class BasePanacheMongoResourceProcessor {
     public static final String BSON_PACKAGE = "org.bson.";
 
     @BuildStep
+    @Consume(InterceptedStaticMethodsTransformersRegisteredBuildItem.class)
     public void buildImperative(CombinedIndexBuildItem index,
             BuildProducer<BytecodeTransformerBuildItem> transformers,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
@@ -94,6 +97,7 @@ public void buildImperative(CombinedIndexBuildItem index,
     }
 
     @BuildStep
+    @Consume(InterceptedStaticMethodsTransformersRegisteredBuildItem.class)
     public void buildReactive(CombinedIndexBuildItem index,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
             BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy,

diff --git a/...in/java/io/quarkus/panache/common/deployment/PanacheHibernateCommonResourceProcessor.java b/...in/java/io/quarkus/panache/common/deployment/PanacheHibernateCommonResourceProcessor.java
@@ -8,6 +8,7 @@
 import java.util.Optional;
 import java.util.Set;
 
+import io.quarkus.arc.deployment.staticmethods.InterceptedStaticMethodsTransformersRegisteredBuildItem;
 import jakarta.persistence.Transient;
 
 import org.jboss.jandex.ClassInfo;
@@ -81,6 +82,7 @@ void findEntityClasses(CombinedIndexBuildItem index,
 
     @BuildStep
     @Consume(HibernateEnhancersRegisteredBuildItem.class)
+    @Consume(InterceptedStaticMethodsTransformersRegisteredBuildItem.class)
     void replaceFieldAccesses(CombinedIndexBuildItem index,
             ApplicationArchivesBuildItem applicationArchivesBuildItem,
             Optional<HibernateMetamodelForFieldAccessBuildItem> modelInfoBuildItem,