Fix TypeDef.of with overridden type arguments (#258)

* Fix `TypeDef.of` with overridden type arguments

* Checkstyle

Author: dstepanov

sourcegen-model/src/main/java/io/micronaut/sourcegen/model/TypeDef.java

@@ -341,14 +341,14 @@ private static TypeDef of(TypedElement typedElement, boolean erasure) {
             );
         }
         if (typedElement instanceof ClassElement classElement) {
-            if (classElement.getFirstTypeArgument().isPresent()) {
-                return TypeDef.parameterized(
-                    ClassTypeDef.of(classElement),
-                    classElement.getBoundGenericTypes().stream().map(TypeDef::of).toList()
-                );
-            } else {
+            Map<String, ClassElement> typeArguments = classElement.getTypeArguments();
+            if (typeArguments.isEmpty()) {
                 return ClassTypeDef.of(classElement);
             }
+            return TypeDef.parameterized(
+                ClassTypeDef.of(classElement),
+                typeArguments.values().stream().map(TypeDef::of).toList()
+            );
         }
         throw new IllegalStateException("Unknown typed element: " + typedElement);
     }

test-suite-custom-annotations/src/main/java/io/micronaut/sourcegen/custom/example/GenerateMyRepository2.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2017-2023 original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.micronaut.sourcegen.custom.example;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Documented
+@Retention(RUNTIME)
+@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+public @interface GenerateMyRepository2 {
+}

test-suite-custom-generators/src/main/java/io/micronaut/sourcegen/custom/visitor/GenerateMyRepository2Visitor.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2017-2023 original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.micronaut.sourcegen.custom.visitor;
+
+import io.micronaut.core.annotation.Internal;
+import io.micronaut.core.annotation.NonNull;
+import io.micronaut.inject.ast.ClassElement;
+import io.micronaut.inject.visitor.TypeElementVisitor;
+import io.micronaut.inject.visitor.VisitorContext;
+import io.micronaut.sourcegen.custom.example.GenerateMyRepository1;
+import io.micronaut.sourcegen.custom.example.GenerateMyRepository2;
+import io.micronaut.sourcegen.generator.SourceGenerator;
+import io.micronaut.sourcegen.generator.SourceGenerators;
+import io.micronaut.sourcegen.model.ClassDef;
+import io.micronaut.sourcegen.model.ClassTypeDef;
+import io.micronaut.sourcegen.model.InterfaceDef;
+import io.micronaut.sourcegen.model.MethodDef;
+import io.micronaut.sourcegen.model.PropertyDef;
+import io.micronaut.sourcegen.model.TypeDef;
+
+import javax.lang.model.element.Modifier;
+import java.util.List;
+import java.util.Optional;
+
+@Internal
+public final class GenerateMyRepository2Visitor implements TypeElementVisitor<GenerateMyRepository2, Object> {
+
+    @Override
+    public @NonNull VisitorKind getVisitorKind() {
+        return VisitorKind.ISOLATING;
+    }
+
+    @Override
+    public void visitClass(ClassElement element, VisitorContext context) {
+        SourceGenerator sourceGenerator = SourceGenerators.findByLanguage(context.getLanguage()).orElse(null);
+        if (sourceGenerator == null) {
+            return;
+        }
+
+        InterfaceDef myRepositoryRef = InterfaceDef.builder(element.getPackageName() + ".MyRepository2")
+            .addModifiers(Modifier.PUBLIC)
+
+            .addSuperinterface(TypeDef.of(
+                element.withTypeArguments(
+                    List.of(
+                        context.getClassElement(Integer.class).get(),
+                        context.getClassElement(String.class).get()
+                    )
+                )
+            ))
+            .build();
+
+        sourceGenerator.write(myRepositoryRef, context, element);
+    }
+
+}

test-suite-custom-generators/src/main/resources/META-INF/services/io.micronaut.inject.visitor.TypeElementVisitor

@@ -4,6 +4,7 @@ io.micronaut.sourcegen.custom.visitor.GenerateMyBean2Visitor
 io.micronaut.sourcegen.custom.visitor.GenerateMyBean3Visitor
 io.micronaut.sourcegen.custom.visitor.GenerateInterfaceBuilder
 io.micronaut.sourcegen.custom.visitor.GenerateMyRepository1Visitor
+io.micronaut.sourcegen.custom.visitor.GenerateMyRepository2Visitor
 io.micronaut.sourcegen.custom.visitor.GenerateMyRecord1Visitor
 io.micronaut.sourcegen.custom.visitor.GenerateMyRecord2Visitor
 io.micronaut.sourcegen.custom.visitor.GenerateMyRecord3Visitor

test-suite-java/src/main/java/io/micronaut/sourcegen/example/NumberRepository.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2017-2025 original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.micronaut.sourcegen.example;
+
+import io.micronaut.sourcegen.custom.example.GenerateMyRepository2;
+
+@GenerateMyRepository2
+public interface NumberRepository<N extends Number, T> {
+
+    N value(T number);
+
+}

test-suite-java/src/test/java/io/micronaut/sourcegen/example/MyRepository2Test.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2003-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.micronaut.sourcegen.example;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Optional;
+
+class MyRepository2Test {
+    @Test
+    public void test() throws Exception {
+        MyRepository2Instance myInstance = new MyRepository2Instance();
+        Assertions.assertEquals(123, myInstance.value("abc"));
+    }
+
+    static class MyRepository2Instance implements MyRepository2 {
+        @Override
+        public Integer value(String number) {
+            return 123;
+        }
+    }
+}