Panache: do not create findById bridge for abstract entity repositories

If the entity type is not fixed in the hierarchy yet, don't generate the bridge Fix quarkusio#5274
FroMage · Nov 7, 2019 · d2a645d · d2a645d
1 parent 37bdc97
commit d2a645d
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/...c/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheJpaRepositoryEnhancer.java b/...c/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheJpaRepositoryEnhancer.java
@@ -51,24 +51,26 @@ protected String getPanacheOperationsBinaryName() {
 
         @Override
         public void visitEnd() {
-            // Bridge for findById
-            MethodVisitor mv = super.visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_BRIDGE,
-                    "findById",
-                    "(Ljava/lang/Object;)Ljava/lang/Object;",
-                    null,
-                    null);
-            mv.visitParameter("id", 0);
-            mv.visitCode();
-            mv.visitIntInsn(Opcodes.ALOAD, 0);
-            mv.visitIntInsn(Opcodes.ALOAD, 1);
-            mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
-                    daoBinaryName,
-                    "findById",
-                    "(Ljava/lang/Object;)" + entitySignature, false);
-            mv.visitInsn(Opcodes.ARETURN);
-            mv.visitMaxs(0, 0);
-            mv.visitEnd();
-
+            // Bridge for findById, but only if we actually know the end entity (which we don't for intermediate
+            // abstract repositories that haven't fixed their entity type yet
+            if (!"Ljava/lang/Object;".equals(entitySignature)) {
+                MethodVisitor mv = super.visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_BRIDGE,
+                        "findById",
+                        "(Ljava/lang/Object;)Ljava/lang/Object;",
+                        null,
+                        null);
+                mv.visitParameter("id", 0);
+                mv.visitCode();
+                mv.visitIntInsn(Opcodes.ALOAD, 0);
+                mv.visitIntInsn(Opcodes.ALOAD, 1);
+                mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
+                        daoBinaryName,
+                        "findById",
+                        "(Ljava/lang/Object;)" + entitySignature, false);
+                mv.visitInsn(Opcodes.ARETURN);
+                mv.visitMaxs(0, 0);
+                mv.visitEnd();
+            }
             super.visitEnd();
         }