Fix introspections on overridden methods in interfaces with generic return type (micronaut-projects#3965)

* collect most specific type

* Don't include return type in the method signature. Restore changes to abstract element spec

Co-authored-by: Daniel Heinrich <dannynullzwo@gmail.com>

Author: jameskleeh

inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/AbstractTypeElementSpec.groovy

@@ -15,6 +15,7 @@
  */
 package io.micronaut.annotation.processing.test
 
+import com.google.testing.compile.JavaFileObjects
 import com.sun.tools.javac.model.JavacElements
 import com.sun.tools.javac.processing.JavacProcessingEnvironment
 import com.sun.tools.javac.util.Context

inject-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/BeanIntrospectionSpec.groovy

@@ -35,6 +35,65 @@ import java.lang.reflect.Field
 
 class BeanIntrospectionSpec extends AbstractTypeElementSpec {
 
+
+    void "test bean introspection with property of generic interface"() {
+        given:
+        BeanIntrospection introspection = buildBeanIntrospection('test.Foo', '''
+package test;
+
+@io.micronaut.core.annotation.Introspected
+class Foo implements GenBase<String> {
+    public String getName() {
+        return "test";
+    }
+}
+
+interface GenBase<T> {
+    T getName();
+}
+''')
+        when:
+        def test = introspection.instantiate()
+
+        then:
+        introspection.getRequiredProperty("name", String)
+                .get(test) == 'test'
+    }
+
+    void "test bean introspection with argument of generic interface"() {
+        given:
+        BeanIntrospection introspection = buildBeanIntrospection('test.Foo', '''
+package test;
+
+@io.micronaut.core.annotation.Introspected
+class Foo implements GenBase<Long> {
+
+    private Long value;
+
+    public Long getValue() {
+        return value;
+    }
+    
+    public void setValue(Long value) {
+        this.value = value;
+    }
+}
+
+interface GenBase<T> {
+    T getValue();
+    
+    void setValue(T t);
+}
+''')
+        when:
+        def test = introspection.instantiate()
+        BeanProperty bp = introspection.getRequiredProperty("value", Long)
+        bp.set(test, 5L)
+
+        then:
+        bp.get(test) == 5L
+    }
+
     void "test bean introspection with property with static creator method on interface"() {
         given:
         BeanIntrospection introspection = buildBeanIntrospection('test.Foo', '''

inject-java/src/main/java/io/micronaut/annotation/processing/SuperclassAwareTypeVisitor.java

@@ -64,7 +64,6 @@ public R visitDeclared(DeclaredType type, P p) {
                         ExecutableElement ee = (ExecutableElement) enclosedElement;
                         String qualifiedName = ee.getSimpleName().toString();
                         qualifiedName += "(" + ee.getParameters().stream().map(variableElement -> types.erasure(variableElement.asType()).toString()).collect(Collectors.joining(",")) + ")";
-                        qualifiedName = types.erasure(ee.getReturnType()).toString() + "." + qualifiedName;
                         // if the method has already been processed then it is overridden so ignore
                         if (!processed.contains(qualifiedName)) {
                             processed.add(qualifiedName);