Rename Spring extension + support for application resources

Author: jknack

docs/asciidoc/dependency-injection.adoc

@@ -336,7 +336,7 @@ The lifecycle of `MyController` is now managed by Guice. Also:
 package myapp;                                       <1>
 
 import static io.jooby.Jooby.runApp;
-import io.jooby.di.Springby;
+import io.jooby.di.Spring;
 
 public class App extends Jooby {
 
@@ -361,7 +361,7 @@ public class App extends Jooby {
 package myapp                                        <1>
 
 import io.jooby.runApp
-import io.jooby.di.Springby
+import io.jooby.di.Spring
 
 fun main(args: Array<String>) {
   runApp(args) {

jooby/src/main/java/io/jooby/internal/RouterImpl.java

@@ -438,8 +438,6 @@ private Route defineRoute(@Nonnull String method, @Nonnull String pattern,
     routeExecutor = null;
     source.destroy();
     source = null;
-    resources.clear();
-    resources = null;
     return this;
   }
 

modules/jooby-spring/pom.xml

@@ -25,7 +25,7 @@
       <version>${jooby.version}</version>
     </dependency>
 
-    <!-- Springby -->
+    <!-- Spring -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>

…/src/main/java/io/jooby/di/Springby.java …ng/src/main/java/io/jooby/di/Spring.javamodules/jooby-spring/src/main/java/io/jooby/di/Springby.java renamed to modules/jooby-spring/src/main/java/io/jooby/di/Spring.java modules/jooby-spring/src/main/java/io/jooby/di/Springby.java renamed to modules/jooby-spring/src/main/java/io/jooby/di/Spring.java

@@ -27,8 +27,9 @@
 import org.springframework.stereotype.Controller;
 
 import javax.annotation.Nonnull;
+import java.util.Optional;
 
-public class Springby implements Extension {
+public class Spring implements Extension {
 
   private AnnotationConfigApplicationContext applicationContext;
 
@@ -38,25 +39,25 @@ public class Springby implements Extension {
 
   private String[] packages;
 
-  public Springby(@Nonnull AnnotationConfigApplicationContext applicationContext) {
+  public Spring(@Nonnull AnnotationConfigApplicationContext applicationContext) {
     this.applicationContext = applicationContext;
   }
 
-  public Springby() {
+  public Spring() {
     this.applicationContext = null;
   }
 
-  public Springby(String... packages) {
+  public Spring(String... packages) {
     this.applicationContext = null;
     this.packages = packages;
   }
 
-  public Springby noRefresh() {
+  public Spring noRefresh() {
     this.refresh = false;
     return this;
   }
 
-  public Springby noMvcRoutes() {
+  public Spring noMvcRoutes() {
     this.registerMvcRoutes = false;
     return this;
   }
@@ -68,7 +69,7 @@ public Springby noMvcRoutes() {
         String basePackage = application.getBasePackage();
         if (basePackage == null) {
           throw new IllegalArgumentException(
-              "Springby application context requires at least one package to scan.");
+              "Spring application context requires at least one package to scan.");
         }
         packages = new String[]{basePackage};
       }
@@ -89,6 +90,15 @@ public Springby noMvcRoutes() {
       beanFactory.registerSingleton("config", config);
       beanFactory.registerSingleton("environment", environment);
 
+      application.onStart(() -> {
+        // Add resources:
+        application.getResources().forEach((key, resource) -> {
+          String name = Optional.ofNullable(key.getName())
+              .orElseGet(() -> beanName(key.getType()));
+          beanFactory.registerSingleton(name, resource);
+        });
+      });
+
       application.onStop(applicationContext);
     }
     if (refresh) {
@@ -116,4 +126,10 @@ public static AnnotationConfigApplicationContext defaultApplicationContext(
     context.scan(packages);
     return context;
   }
+
+  private String beanName(Class type) {
+    StringBuilder name = new StringBuilder(type.getSimpleName());
+    name.setCharAt(0, Character.toLowerCase(name.charAt(0)));
+    return name.toString();
+  }
 }