Not using SpringDependencyInjectionProvider in plugin anymore

Author: adrienlauer

core/src/main/java/org/seedstack/spring/internal/SpringDependencyInjectionProvider.java

@@ -8,6 +8,7 @@
 package org.seedstack.spring.internal;
 
 
+import com.google.inject.Module;
 import io.nuun.kernel.api.di.UnitModule;
 import io.nuun.kernel.api.plugin.PluginException;
 import io.nuun.kernel.core.internal.ModuleEmbedded;
@@ -17,24 +18,28 @@
 
 class SpringDependencyInjectionProvider implements DependencyInjectionProvider {
 
-	@Override
+    @Override
     public boolean canHandle(Class<?> injectionDefinition) {
         return ConfigurableListableBeanFactory.class.isAssignableFrom(injectionDefinition) || ConfigurableApplicationContext.class.isAssignableFrom(injectionDefinition);
     }
 
     @Override
     public UnitModule convert(Object injectionDefinition) {
-        if (injectionDefinition instanceof ConfigurableListableBeanFactory) {
-            return ModuleEmbedded.wrap(new SpringModule((ConfigurableListableBeanFactory) injectionDefinition));
-        } else if (injectionDefinition instanceof ConfigurableApplicationContext) {
-            return ModuleEmbedded.wrap(new SpringModule(((ConfigurableApplicationContext) injectionDefinition).getBeanFactory()));
-        } else {
-            throw new PluginException("Only ConfigurableListableBeanFactory or ConfigurableApplicationContext types are handled");
-        }
+        return ModuleEmbedded.wrap(buildModuleFromSpringContext(injectionDefinition));
     }
 
     @Override
     public Object kernelDIProvider() {
         return null;
     }
+
+    static Module buildModuleFromSpringContext(Object injectionDefinition) {
+        if (injectionDefinition instanceof ConfigurableListableBeanFactory) {
+            return new SpringModule((ConfigurableListableBeanFactory) injectionDefinition);
+        } else if (injectionDefinition instanceof ConfigurableApplicationContext) {
+            return new SpringModule(((ConfigurableApplicationContext) injectionDefinition).getBeanFactory());
+        } else {
+            throw new PluginException("Only ConfigurableListableBeanFactory or ConfigurableApplicationContext types are handled");
+        }
+    }
 }

core/src/main/java/org/seedstack/spring/internal/SpringPlugin.java

@@ -104,7 +104,7 @@ public Collection<ClasspathScanRequest> classpathScanRequests() {
 
     @Override
     public Object nativeUnitModule() {
-        return globalApplicationContext;
+        return SpringDependencyInjectionProvider.buildModuleFromSpringContext(globalApplicationContext);
     }
 
     @Override