[2.8.6] Unable to create Guice injector at startup

jknack · jknack · commit 588fb96cdac9 · 2020-06-19T09:49:24.000-03:00
- Fixed for Guice, Spring and Weld fix jooby-project#1799
diff --git a/modules/jooby-guice/src/main/java/io/jooby/di/JoobyModule.java b/modules/jooby-guice/src/main/java/io/jooby/di/JoobyModule.java
@@ -67,8 +67,6 @@ private void configureResources(ServiceRegistry registry) {
 
   /*package*/ void configureEnv(Environment env) {
     Config config = env.getConfig();
-    bind(Config.class).toInstance(config);
-    bind(Environment.class).toInstance(env);
 
     // configuration properties
     for (Map.Entry<String, ConfigValue> entry : config.entrySet()) {
diff --git a/modules/jooby-spring/src/main/java/io/jooby/di/SpringModule.java b/modules/jooby-spring/src/main/java/io/jooby/di/SpringModule.java
@@ -139,8 +139,10 @@ public SpringModule noMvcRoutes() {
       ServiceRegistry registry = application.getServices();
       for (Map.Entry<ServiceKey<?>, Provider<?>> entry : registry.entrySet()) {
         ServiceKey key = entry.getKey();
-        Provider provider = entry.getValue();
-        applicationContext.registerBean(key.getName(), key.getType(), () -> provider.get());
+        if (!ignoreEntry(key.getType())) {
+          Provider provider = entry.getValue();
+          applicationContext.registerBean(key.getName(), key.getType(), () -> provider.get());
+        }
       }
 
       application.onStop(applicationContext);
@@ -163,4 +165,8 @@ public SpringModule noMvcRoutes() {
       }
     }
   }
+
+  private boolean ignoreEntry(Class type) {
+    return type == Environment.class || type == Config.class;
+  }
 }
diff --git a/modules/jooby-weld/src/main/java/io/jooby/di/JoobyExtension.java b/modules/jooby-weld/src/main/java/io/jooby/di/JoobyExtension.java
@@ -89,9 +89,6 @@ public void configureEnv(@Observes AfterBeanDiscovery abd, BeanManager bm) {
     Environment environment = app.getEnvironment();
     Config config = environment.getConfig();
 
-    registerSingleton(abd, bm, Config.class, null, config);
-    registerSingleton(abd, bm, Environment.class, null, environment);
-
     for (Map.Entry<String, ConfigValue> configEntry : config.entrySet()) {
       final String configKey = configEntry.getKey();
       final Object configValue = configEntry.getValue().unwrapped();

Original file line number	Diff line number	Diff line change
`@@ -139,8 +139,10 @@ public SpringModule noMvcRoutes() {`
`139`	`139`	`ServiceRegistry registry = application.getServices();`
`140`	`140`	`for (Map.Entry<ServiceKey<?>, Provider<?>> entry : registry.entrySet()) {`
`141`	`141`	`ServiceKey key = entry.getKey();`
`142`		`- Provider provider = entry.getValue();`
`143`		`- applicationContext.registerBean(key.getName(), key.getType(), () -> provider.get());`
	`142`	`+ if (!ignoreEntry(key.getType())) {`
	`143`	`+ Provider provider = entry.getValue();`
	`144`	`+ applicationContext.registerBean(key.getName(), key.getType(), () -> provider.get());`
	`145`	`+ }`
`144`	`146`	`}`
`145`	`147`
`146`	`148`	`application.onStop(applicationContext);`
`@@ -163,4 +165,8 @@ public SpringModule noMvcRoutes() {`
`163`	`165`	`}`
`164`	`166`	`}`
`165`	`167`	`}`
	`168`	`+`
	`169`	`+ private boolean ignoreEntry(Class type) {`
	`170`	`+ return type == Environment.class \|\| type == Config.class;`
	`171`	`+ }`
`166`	`172`	`}`