apply packages to micronaut context created by postprocessor

agorapulse · Nov 30, 2020 · 1cb345a · 1cb345a
1 parent 8d27ad5
commit 1cb345a
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 53 deletions.
diff --git a/...naut-grails-example/grails-app/controllers/micronaut/grails/example/TestController.groovy b/...naut-grails-example/grails-app/controllers/micronaut/grails/example/TestController.groovy
@@ -71,8 +71,8 @@ class TestController {
 
  def managers() {
  render([
- someDirectlyInjected: someDirectlyInjected?.managers,
- injectedUsingBridge : injectedUsingBridge?.managers,
+ someDirectlyInjected: someDirectlyInjected?.managerCount,
+ injectedUsingBridge : injectedUsingBridge?.managerCount,
  ] as JSON)
  }
 

diff --git a/...cronaut-grails-example/grails-app/init/micronaut/grails/example/DefaultApplication.groovy b/...cronaut-grails-example/grails-app/init/micronaut/grails/example/DefaultApplication.groovy
@@ -34,7 +34,7 @@ class DefaultApplication extends GrailsAutoConfiguration {
  }
 
  static void main(String[] args) {
- context = CustomGrailsApp.run(Application, args) { env ->
+ context = CustomGrailsApp.run(DefaultApplication, args) { env ->
  env.addPackage(Manager.package)
  }
  }

diff --git a/...s-example/src/main/groovy/com/agorapulse/micronaut/grails/example/DirectlyInjected.groovy b/...s-example/src/main/groovy/com/agorapulse/micronaut/grails/example/DirectlyInjected.groovy
@@ -17,7 +17,6 @@
  */
 package com.agorapulse.micronaut.grails.example
 
-import com.agorapulse.micronaut.grails.domain.Manager
 import com.agorapulse.micronaut.grails.domain.ManagerService
 import grails.gorm.transactions.ReadOnly
 import groovy.transform.CompileStatic
@@ -57,8 +56,8 @@ class DirectlyInjected {
  }
 
  @ReadOnly
- List<Manager> getManagers() {
- return managerService?.list()
+ Number getManagerCount() {
+ return managerService?.count()
  }
 
  ApplicationContext getMicronautContext() {

diff --git a/...xample/src/main/groovy/com/agorapulse/micronaut/grails/example/InjectedUsingBridge.groovy b/...xample/src/main/groovy/com/agorapulse/micronaut/grails/example/InjectedUsingBridge.groovy
@@ -17,9 +17,7 @@
  */
 package com.agorapulse.micronaut.grails.example
 
-import com.agorapulse.micronaut.grails.domain.Manager
 import com.agorapulse.micronaut.grails.domain.ManagerService
-import grails.gorm.transactions.ReadOnly
 import groovy.transform.CompileStatic
 import io.micronaut.context.ApplicationContext
 import io.micronaut.context.annotation.Value
@@ -52,9 +50,8 @@ class InjectedUsingBridge {
  this.ignoredvalue = ignoredvalue
  }
 
- @ReadOnly
- List<Manager> getManagers() {
- return managerService?.list()
+ Number getManagerCount() {
+ return managerService?.count()
  }
 
  ApplicationContext getMicronautContext() {

diff --git a/...-grails-example/src/test/resources/micronaut/grails/example/ApplicationSpec/managers.json b/...-grails-example/src/test/resources/micronaut/grails/example/ApplicationSpec/managers.json
@@ -1,9 +1,4 @@
 {
- "someDirectlyInjected": [
- {
- "id": 1,
- "name": "Superuser"
- }
- ],
+ "someDirectlyInjected": 1,
  "injectedUsingBridge": null
 }
diff --git a/...s-example/src/test/resources/micronaut/grails/example/BridgeApplicationSpec/managers.json b/...s-example/src/test/resources/micronaut/grails/example/BridgeApplicationSpec/managers.json
@@ -1,14 +1,4 @@
 {
- "someDirectlyInjected": [
- {
- "id": 1,
- "name": "Superuser"
- }
- ],
- "injectedUsingBridge": [
- {
- "id": 1,
- "name": "Superuser"
- }
- ]
+ "someDirectlyInjected": 1,
+ "injectedUsingBridge": 1
 }
diff --git a/...-example/src/test/resources/micronaut/grails/example/DefaultApplicationSpec/managers.json b/...-example/src/test/resources/micronaut/grails/example/DefaultApplicationSpec/managers.json
@@ -1,14 +1,4 @@
 {
- "someDirectlyInjected": [
- {
- "id": 1,
- "name": "Superuser"
- }
- ],
- "injectedUsingBridge": [
- {
- "id": 1,
- "name": "Superuser"
- }
- ]
+ "someDirectlyInjected": 1,
+ "injectedUsingBridge": 1
 }
diff --git a/...s-example/src/test/resources/micronaut/grails/example/LegacyApplicationSpec/managers.json b/...s-example/src/test/resources/micronaut/grails/example/LegacyApplicationSpec/managers.json
@@ -1,14 +1,4 @@
 {
- "someDirectlyInjected": [
- {
- "id": 1,
- "name": "Superuser"
- }
- ],
- "injectedUsingBridge": [
- {
- "id": 1,
- "name": "Superuser"
- }
- ]
+ "someDirectlyInjected": 1,
+ "injectedUsingBridge": 1
 }
diff --git a/...-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessor.java b/...-grails/src/main/groovy/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessor.java
@@ -17,6 +17,7 @@
  */
 package com.agorapulse.micronaut.grails;
 
+import grails.boot.config.GrailsAutoConfiguration;
 import io.micronaut.context.Qualifier;
 import io.micronaut.inject.BeanDefinition;
 import org.slf4j.Logger;
@@ -147,6 +148,15 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
  if (micronautContext == null) {
  micronautContext = new GrailsPropertyTranslatingApplicationContext(environment, of(collapse(customizers)), expectedMapProperties);
 
+ try {
+ GrailsAutoConfiguration application = springContext.getBean(GrailsAutoConfiguration.class);
+ Set<String> packages = new LinkedHashSet<>(application.packageNames());
+ application.packages().forEach(p -> packages.add(p.getName()));
+ packages.forEach(micronautContext.getEnvironment()::addPackage);
+ } catch (NoSuchBeanDefinitionException e) {
+ LOGGER.info("Application class is not GrailsAutoConfiguration", e);
+ }
+
  if (configuration != null) {
  configuration.applyToEnvironment(micronautContext.getEnvironment());
  }