Requires bean property with default interface method fix (#7200)

closes #7188
micronaut-projects · Apr 11, 2022 · f30b095 · f30b095
1 parent f1f49b4
commit f30b095
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 2 deletions.
diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/requires/RequiresBeanPropertiesSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/requires/RequiresBeanPropertiesSpec.groovy
@@ -598,4 +598,45 @@ class TestBeanFactory
         cleanup:
         context.close()
     }
+
+    void "test requires with default interface methods"() {
+        given:
+        ApplicationContext context = buildContext('''
+package test;
+import io.micronaut.context.annotation.Bean;
+import io.micronaut.context.annotation.Property;
+import io.micronaut.context.annotation.Requires;
+import io.micronaut.core.util.Toggleable;
+import jakarta.inject.Singleton;
+
+interface Configuration extends Toggleable {}
+
+@Singleton
+class ConfigurationImpl implements Configuration
+{
+    boolean enabled = false;
+    
+    @Override
+    boolean isEnabled() {
+        return enabled;
+    }
+}
+
+@Requires(bean = Configuration.class, beanProperty = "enabled", value = "true")
+@Singleton
+class TestBean {
+}
+''')
+        def type = context.classLoader.loadClass('test.TestBean')
+
+        when:
+        context.getBean(type)
+
+        then:
+        thrown(NoSuchBeanException.class)
+
+        cleanup:
+        context.close()
+
+    }
 }
diff --git a/inject-java/src/test/groovy/io/micronaut/inject/requires/RequiresBeanPropertiesSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/requires/RequiresBeanPropertiesSpec.groovy
@@ -899,4 +899,45 @@ class TestBeanFactory
         cleanup:
         context.close()
     }
+
+    void "test requires with default interface methods"() {
+        given:
+        ApplicationContext context = buildContext('test.TestBean', '''
+package test;
+import io.micronaut.context.annotation.Bean;
+import io.micronaut.context.annotation.ConfigurationProperties;import io.micronaut.context.annotation.Factory;
+import io.micronaut.context.annotation.Property;import io.micronaut.context.annotation.Requires;
+import io.micronaut.core.util.Toggleable;
+import jakarta.inject.Singleton;
+
+interface Configuration extends Toggleable {}
+
+@Singleton
+class ConfigurationImpl implements Configuration
+{
+    private boolean enabled = false;
+    
+    @Override 
+    public boolean isEnabled() {
+        return this.enabled;
+    }
+}
+
+@Requires(bean = Configuration.class, beanProperty = "enabled", value = "true")
+@Singleton
+class TestBean {
+}
+''')
+        def type = context.classLoader.loadClass('test.TestBean')
+
+        when:
+        context.getBean(type)
+
+        then:
+        thrown(NoSuchBeanException.class)
+
+        cleanup:
+        context.close()
+
+    }
 }
diff --git a/inject/src/main/java/io/micronaut/inject/writer/BeanDefinitionWriter.java b/inject/src/main/java/io/micronaut/inject/writer/BeanDefinitionWriter.java
@@ -1217,7 +1217,7 @@ private void buildCheckIfShouldLoadMethod(GeneratorAdapter adapter, Map<Type, Li
 
                 org.objectweb.asm.commons.Method propertyGetterMethod = org.objectweb.asm.commons.Method.getMethod(propertyGetter.getDescription(false));
                 // getter might be an interface method
-                if (propertyGetter.isAbstract()) {
+                if (visitData.memberBeanType.getType().isInterface()) {
                     adapter.invokeInterface(injectedType, propertyGetterMethod);
                 } else {
                     adapter.invokeVirtual(injectedType, propertyGetterMethod);
@@ -1816,7 +1816,7 @@ public void visitAnnotationMemberPropertyInjectionPoint(TypedElement annotationM
                     ElementQuery.ALL_METHODS
                             .onlyAccessible(beanTypeElement)
                             .onlyInstance()
-                            .named((name) -> name.equals(NameUtils.getterNameFor(annotationMemberProperty, readPrefixes)))
+                            .named((name) -> annotationMemberProperty.equals(NameUtils.getPropertyNameForGetter(name, readPrefixes)))
                             .filter((e) -> !e.hasParameters())
             ).orElse(null);
         }