ability to declare beans to be injected into grails by name of interface

agorapulse · Oct 2, 2018 · 36dbb31 · 36dbb31
1 parent 3165af9
commit 36dbb31
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 allprojects {
     group 'com.agorapulse'
-    version micronautVersion
+    version "${micronautVersion}.1"
 
     repositories {
         jcenter()

diff --git a/...-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessor.java b/...-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessor.java
@@ -95,8 +95,11 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
                                 beanDefinitionBuilder.addPropertyValue(MICRONAUT_BEAN_TYPE_PROPERTY_NAME, definition.getBeanType());
                                 beanDefinitionBuilder.addPropertyValue(MICRONAUT_CONTEXT_PROPERTY_NAME, micronautContext);
                                 beanDefinitionBuilder.addPropertyValue(MICRONAUT_SINGLETON_PROPERTY_NAME, definition.isSingleton());
+
                                 String name = definition.getName();
-                                if (name.equals(definition.getBeanType().getName())) {
+                                if (!micronautBeanQualifierType.isAnnotation() && micronautBeanQualifierType.isInterface()) {
+                                    name = NameUtils.decapitalize(micronautBeanQualifierType.getSimpleName());
+                                } else if (name.equals(definition.getBeanType().getName())) {
                                     name = NameUtils.decapitalize(definition.getBeanType().getSimpleName());
                                 }
                                 ((DefaultListableBeanFactory) beanFactory).registerBeanDefinition(name, beanDefinitionBuilder.getBeanDefinition());

diff --git a/...s/src/test/groovy/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessorSpec.groovy b/...s/src/test/groovy/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessorSpec.groovy
@@ -32,6 +32,8 @@ class GrailsMicronautBeanProcessorSpec extends Specification {
         expect:
             applicationContext.getBean('widget') instanceof Widget
             applicationContext.getBean('prototypeBean') instanceof PrototypeBean
+            applicationContext.getBean('someInterface') instanceof SomeInterface
+            applicationContext.getBean('someInterface') instanceof SomeImplementation
         when:
             PrototypeBean prototypeBean = applicationContext.getBean(PrototypeBean)
         then:
@@ -61,11 +63,16 @@ class GrailsConfig {
 
     @Bean
     GrailsMicronautBeanProcessor widgetProcessor() {
-        new GrailsMicronautBeanProcessor(Widget, Prototype)
+        new GrailsMicronautBeanProcessor(Widget, SomeInterface, Prototype)
     }
 
 }
 
+interface SomeInterface { }
+
+@Singleton
+class SomeImplementation implements SomeInterface { }
+
 @Singleton
 class Widget {}