Merge 4024f91 into 82ecfe5

agorapulse · Dec 15, 2020 · 7cdc106 · 7cdc106
2 parents 82ecfe5 + 4024f91
commit 7cdc106
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/...ut-grails-example/src/test/groovy/micronaut/grails/example/AbstractApplicationSpec.groovy b/...ut-grails-example/src/test/groovy/micronaut/grails/example/AbstractApplicationSpec.groovy
@@ -35,6 +35,10 @@ abstract class AbstractApplicationSpec extends Specification {
 
     abstract Class<?> getApplicationClass()
 
+    boolean getMicronautBridgePackageApplied() {
+        return true
+    }
+
     void setupSpec() {
         Throwable th = null
         Thread.start {
@@ -79,7 +83,7 @@ abstract class AbstractApplicationSpec extends Specification {
     void 'package is applied'() {
         expect:
             context.getBean(DirectlyInjected).micronautContext.environment.packages.contains(ManagerService.package.name)
-            context.getBean(InjectedUsingBridge).micronautContext.environment.packages.contains(ManagerService.package.name)
+            context.getBean(InjectedUsingBridge).micronautContext.environment.packages.contains(ManagerService.package.name) == micronautBridgePackageApplied
     }
 
     void 'fetch services'() {

diff --git a/...aut-grails-example/src/test/groovy/micronaut/grails/example/DefaultApplicationSpec.groovy b/...aut-grails-example/src/test/groovy/micronaut/grails/example/DefaultApplicationSpec.groovy
@@ -24,4 +24,8 @@ class DefaultApplicationSpec extends AbstractApplicationSpec {
         return DefaultApplication
     }
 
+    @Override
+    boolean getMicronautBridgePackageApplied() {
+        return false
+    }
 }
diff --git a/...naut-grails-example/src/test/groovy/micronaut/grails/example/LegacyApplicationSpec.groovy b/...naut-grails-example/src/test/groovy/micronaut/grails/example/LegacyApplicationSpec.groovy
@@ -24,4 +24,9 @@ class LegacyApplicationSpec extends AbstractApplicationSpec {
         return LegacyApplication
     }
 
+    @Override
+    boolean getMicronautBridgePackageApplied() {
+        return false
+    }
+
 }
diff --git a/.../src/main/groovy/com/agorapulse/micronaut/grails/DefaultGrailsMicronautBeanProcessor.java b/.../src/main/groovy/com/agorapulse/micronaut/grails/DefaultGrailsMicronautBeanProcessor.java
@@ -56,9 +56,8 @@ public class DefaultGrailsMicronautBeanProcessor implements BeanFactoryPostProce
     private static final String MICRONAUT_QUALIFIER_PROPERTY_NAME = "micronautQualifier";
     private static final String MICRONAUT_SINGLETON_PROPERTY_NAME = "micronautSingleton";
 
-    protected ApplicationContext springContext;
-
     private io.micronaut.context.ApplicationContext micronautContext;
+    private ApplicationContext springContext;
     private final Map<String, TypeAndQualifier<?>> micronautBeanQualifiers;
 
     /**

diff --git a/...-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessor.java b/...-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessor.java
@@ -21,7 +21,6 @@
 import io.micronaut.context.DefaultApplicationContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.env.Environment;
 
@@ -116,13 +115,6 @@ protected ApplicationContext initializeMicronautContext() {
 
         DefaultApplicationContext micronautContext = new GrailsPropertyTranslatingApplicationContext(environment, of(collapse(customizers)), expectedMapProperties);
 
-        try {
-            MicronautContextHolder bean = springContext.getBean(MicronautContextHolder.class);
-            bean.getContext().getEnvironment().getPackages().forEach(micronautContext.getEnvironment()::addPackage);
-        } catch (NoSuchBeanDefinitionException ignored) {
-            // not using MicronautGrailsApp
-        }
-
         return micronautContext.start();
     }
 

diff --git a/...-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsConfiguration.java b/...-grails/src/main/groovy/com/agorapulse/micronaut/grails/MicronautGrailsConfiguration.java
@@ -35,13 +35,13 @@ public class MicronautGrailsConfiguration {
      * @return empty importer
      */
     @Bean
-    static MicronautBeanImporter grailsTranslatorImporter() {
+    MicronautBeanImporter grailsTranslatorImporter() {
         return MicronautBeanImporter.create().customize(PropertyTranslatingCustomizer.grails());
     }
 
     @Bean
     @Profile("!micronaut-grails-strict & !micronaut-grails-bridge")
-    static BeanFactoryPostProcessor defaultGrailsMicronautBeanProcessor(List<MicronautBeanImporter> importers, Environment env) {
+    BeanFactoryPostProcessor defaultGrailsMicronautBeanProcessor(List<MicronautBeanImporter> importers, Environment env) {
         Map<String, TypeAndQualifier<?>> qualifierMap = importers
             .stream()
             .flatMap(i -> i.getMicronautBeanQualifiers().entrySet().stream())
@@ -65,7 +65,7 @@ static BeanFactoryPostProcessor defaultGrailsMicronautBeanProcessor(List<Microna
 
     @Bean
     @Profile("micronaut-grails-bridge")
-    static BeanFactoryPostProcessor forwardingGrailsMicronautBeanProcessor(List<MicronautBeanImporter> importers, Environment env) {
+    BeanFactoryPostProcessor forwardingGrailsMicronautBeanProcessor(List<MicronautBeanImporter> importers, Environment env) {
         Map<String, TypeAndQualifier<?>> qualifierMap = importers
             .stream()
             .flatMap(i -> i.getMicronautBeanQualifiers().entrySet().stream())