Progress

micronaut-projects · Nov 14, 2024 · a1d885f · a1d885f
1 parent 14da794
commit a1d885f
Show file tree

Hide file tree

Showing 11 changed files with 745 additions and 119 deletions.
diff --git a/sourcegen-bytecode-writer/build.gradle.kts b/sourcegen-bytecode-writer/build.gradle.kts
@@ -2,6 +2,12 @@ plugins {
     id("io.micronaut.build.internal.sourcegen-module")
 }
 
+repositories {
+    maven(
+        url = uri("https://www.jetbrains.com/intellij-repository/releases/")
+    )
+}
+
 dependencies {
     api(projects.sourcegenModel)
     compileOnly(mn.micronaut.core.processor)
@@ -10,6 +16,7 @@ dependencies {
     api(libs.asm.util)
     testImplementation(mn.micronaut.core.processor)
     testImplementation(libs.junit.jupiter.engine)
+    testImplementation("com.jetbrains.intellij.java:java-decompiler-engine:242.23726.103")
 }
 
 tasks.withType<Test> {

diff --git a/sourcegen-bytecode-writer/src/main/java/io/micronaut/sourcegen/ByteCodeWriter.java b/sourcegen-bytecode-writer/src/main/java/io/micronaut/sourcegen/ByteCodeWriter.java
diff --git a/sourcegen-bytecode-writer/src/main/java/io/micronaut/sourcegen/TypeUtils.java b/sourcegen-bytecode-writer/src/main/java/io/micronaut/sourcegen/TypeUtils.java
@@ -24,6 +24,7 @@
 import io.micronaut.sourcegen.model.TypeDef;
 import org.objectweb.asm.Type;
 
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -35,6 +36,7 @@
  */
 final class TypeUtils {
 
+    private static final Type OBJECT_TYPE = Type.getType(Object.class);
     private static final Pattern ARRAY_PATTERN = Pattern.compile("(\\[])+$");
 
     static Type getType(TypeDef typeDef, @Nullable ObjectDef objectDef) {
@@ -55,10 +57,10 @@ static Type getType(TypeDef typeDef, @Nullable ObjectDef objectDef) {
         }
         if (typeDef instanceof TypeDef.Wildcard wildcard) {
             if (!wildcard.lowerBounds().isEmpty()) {
-                return getType(wildcard.lowerBounds().get(0), objectDef);
+                return getBoundsType(wildcard.lowerBounds(), objectDef);
             }
             if (!wildcard.upperBounds().isEmpty()) {
-                return getType(wildcard.upperBounds().get(0), objectDef);
+                return getBoundsType(wildcard.upperBounds(), objectDef);
             }
             return Type.getType(Object.class);
         }
@@ -68,25 +70,36 @@ static Type getType(TypeDef typeDef, @Nullable ObjectDef objectDef) {
                     TypeDef.TypeVariable tvDef = classDef.getTypeVariables().stream()
                         .filter(tv -> tv.name().equals(typeVariable.name())).findFirst()
                         .orElse(null);
-                    if (tvDef != null && !tvDef.bounds().isEmpty()) {
-                        return getType(tvDef.bounds().get(0), objectDef);
+                    if (tvDef != null) {
+                        return getBoundsType(tvDef.bounds(), objectDef);
                     }
                 }
                 if (objectDef instanceof InterfaceDef interfaceDef) {
                     TypeDef.TypeVariable tvDef = interfaceDef.getTypeVariables().stream()
                         .filter(tv -> tv.name().equals(typeVariable.name())).findFirst()
                         .orElse(null);
-                    if (tvDef != null && !tvDef.bounds().isEmpty()) {
-                        return getType(tvDef.bounds().get(0), objectDef);
+                    if (tvDef != null) {
+                        return getBoundsType(tvDef.bounds(), objectDef);
                     }
                 }
                 return Type.getType(Object.class);
             }
-            return getType(typeVariable.bounds().get(0), objectDef);
+            return getBoundsType(typeVariable.bounds(), objectDef);
         }
         throw new IllegalStateException("Unsupported type: " + typeDef);
     }
 
+    private static Type getBoundsType(List<TypeDef> bounds, ObjectDef objectDef) {
+        // Select first non-object type
+        for (TypeDef bound : bounds) {
+            Type type = getType(bound, objectDef);
+            if (!type.equals(OBJECT_TYPE)) {
+                return type;
+            }
+        }
+        return OBJECT_TYPE;
+    }
+
     public static Type getType(TypeDef.Primitive primitive) {
         return Type.getType(JavaModelUtils.NAME_TO_TYPE_MAP.get(primitive.name()));
     }