Support constructor injection in Kotlin Panache repositories

Fixes: quarkusio#22014
geoand · Dec 8, 2021 · ab30ef5 · ab30ef5
1 parent 7ac7d02
commit ab30ef5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/...rkus/panache/common/deployment/visitors/KotlinPanacheClassOperationGenerationVisitor.java b/...rkus/panache/common/deployment/visitors/KotlinPanacheClassOperationGenerationVisitor.java
@@ -64,6 +64,7 @@ public class KotlinPanacheClassOperationGenerationVisitor extends ClassVisitor {
     public static final String NULLABLE_DESCRIPTOR = "Lorg/jetbrains/annotations/Nullable;";
     public static final ByteCodeType OBJECT = new ByteCodeType(Object.class);
     protected static final ByteCodeType CLASS = new ByteCodeType(Class.class);
+    private static final String CTOR_METHOD_NAME = "<init>";
     protected final Function<String, String> argMapper;
     protected final ClassInfo classInfo;
     protected final ByteCodeType entityUpperBound;
@@ -291,7 +292,7 @@ private void emitNullCheck(MethodVisitor mv, Type returnType) {
                 .replace("java.util.List", "kotlin.collections.List")));
 
         mv.visitMethodInsn(INVOKESPECIAL, "java/lang/NullPointerException",
-                "<init>", "(Ljava/lang/String;)V", false);
+                CTOR_METHOD_NAME, "(Ljava/lang/String;)V", false);
         mv.visitInsn(ATHROW);
         mv.visitLabel(label);
         mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] { "java/lang/Object" });
@@ -538,6 +539,9 @@ public MethodVisitor visitMethod(int access, String name, String descriptor, Str
         } else if (name.contains("$")) {
             //some agents such as jacoco add new methods, they generally have $ in the name
             return super.visitMethod(access, name, descriptor, signature, exceptions);
+        } else if (name.equals(CTOR_METHOD_NAME)) {
+            //Arc can add no-args constructors to support intercepted beans
+            return super.visitMethod(access, name, descriptor, signature, exceptions);
         }
         return null;
     }

diff --git a/...ngodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookRepository.kt b/...ngodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookRepository.kt
@@ -4,4 +4,4 @@ import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepository
 import javax.enterprise.context.ApplicationScoped
 
 @ApplicationScoped
-class BookRepository : PanacheMongoRepository<Book>
+class BookRepository(private val dummyService: DummyService) : PanacheMongoRepository<Book>
diff --git a/...mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/DummyService.kt b/...mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/DummyService.kt
@@ -0,0 +1,8 @@
+package io.quarkus.it.mongodb.panache.book
+
+import javax.enterprise.context.ApplicationScoped
+
+// used only to validate that we can inject CDI beans into Panache repositories written in Kotlin
+@ApplicationScoped
+class DummyService {
+}