Integrate registry with Guice + bug fixes from env refactor

Author: jknack

jooby/pom.xml

@@ -172,7 +172,6 @@
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
-      <scope>provided</scope>
     </dependency>
 
     <!-- Logging System -->
@@ -210,7 +209,6 @@
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
-      <version>1</version>
     </dependency>
 
     <!-- netty-buffer -->
@@ -252,6 +250,12 @@
       <optional>true</optional>
     </dependency>
 
+    <!-- Guice -->
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <optional>true</optional>
+    </dependency>
 
     <!-- Test dependencies -->
     <dependency>

jooby/src/main/java/io/jooby/Jooby.java

@@ -15,6 +15,7 @@
  */
 package io.jooby;
 
+import io.jooby.internal.RegistryImpl;
 import io.jooby.internal.RouteAnalyzer;
 import io.jooby.internal.RouterImpl;
 import org.slf4j.Logger;
@@ -26,7 +27,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -62,7 +62,7 @@ public class Jooby implements Router, Registry {
 
   private LinkedList<Throwing.Runnable> stopCallbacks;
 
-  private Env environment;
+  private Env env;
 
   private Registry registry;
 
@@ -71,14 +71,11 @@ public Jooby() {
   }
 
   public @Nonnull Env environment() {
-    return environment;
+    return env;
   }
 
   public @Nonnull Jooby environment(@Nonnull Env environment) {
-    this.environment = environment;
-    if (tmpdir == null) {
-      tmpdir = Paths.get(environment.get("application.tmpdir").value()).toAbsolutePath();
-    }
+    this.env = environment;
     return this;
   }
 
@@ -285,8 +282,8 @@ public Jooby errorCode(@Nonnull Class<? extends Throwable> type,
     return require(new AttributeKey<>(type));
   }
 
-  public @Nonnull Jooby registry(@Nonnull Registry registry) {
-    this.registry = registry;
+  public @Nonnull Jooby registry(@Nonnull Object registry) {
+    this.registry = RegistryImpl.wrap(getClass().getClassLoader(), registry);
     return this;
   }
 
@@ -326,20 +323,21 @@ private <T> T require(AttributeKey<T> key) {
     if (serverConfigurer != null) {
       serverConfigurer.accept(server);
     }
-    if (environment == null) {
-      environment = Env.defaultEnvironment(getClass().getClassLoader());
-    }
-    if (tmpdir == null) {
-      tmpdir = Paths.get(environment.get("application.tmpdir").value()).toAbsolutePath();
-    }
     return server.start(this);
   }
 
   public @Nonnull Jooby start(@Nonnull Server server) {
+    if (env == null) {
+      env = Env.defaultEnvironment(getClass().getClassLoader());
+    }
+    if (tmpdir == null) {
+      tmpdir = Paths.get(env.get("application.tmpdir").value()).toAbsolutePath();
+    }
+
     /** Start router: */
     ensureTmpdir(tmpdir);
 
-    log().debug("environment:\n{}", environment);
+    log().debug("environment:\n{}", env);
 
     if (mode == null) {
       mode = ExecutionMode.DEFAULT;
@@ -361,7 +359,7 @@ private <T> T require(AttributeKey<T> key) {
     log.info("    PID: {}", System.getProperty("PID"));
     log.info("    port: {}", server.port());
     log.info("    server: {}", server.getClass().getSimpleName().toLowerCase());
-    log.info("    env: {}", environment.name());
+    log.info("    env: {}", env.name());
     log.info("    thread mode: {}", mode.name().toLowerCase());
     log.info("    user: {}", System.getProperty("user.name"));
     log.info("    app dir: {}", System.getProperty("user.dir"));

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

@@ -0,0 +1,39 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2014 Edgar Espina
+ */
+package io.jooby.internal;
+
+import io.jooby.Registry;
+import io.jooby.internal.registry.GuiceAdapter;
+
+public class RegistryImpl {
+  public static Registry wrap(ClassLoader loader, Object candidate) {
+    if (candidate instanceof Registry) {
+      return (Registry) candidate;
+    }
+    if (isInstanceOf(loader, "com.google.inject.Injector", candidate)) {
+      return new GuiceAdapter(candidate);
+    }
+    throw new IllegalArgumentException("No registry adapter for: " + candidate);
+  }
+
+  private static boolean isInstanceOf(ClassLoader loader, String klass, Object candidate) {
+    try {
+      return loader.loadClass(klass).isInstance(candidate);
+    } catch (ClassNotFoundException x) {
+      return false;
+    }
+  }
+}

jooby/src/main/java/io/jooby/internal/registry/GuiceAdapter.java

@@ -0,0 +1,39 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2014 Edgar Espina
+ */
+package io.jooby.internal.registry;
+
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.name.Names;
+import io.jooby.Registry;
+
+import javax.annotation.Nonnull;
+
+public class GuiceAdapter implements Registry {
+  private final Injector injector;
+
+  public GuiceAdapter(Object candidate) {
+    this.injector = (Injector) candidate;
+  }
+
+  @Nonnull @Override public <T> T require(@Nonnull Class<T> type) {
+    return injector.getInstance(type);
+  }
+
+  @Nonnull @Override public <T> T require(@Nonnull Class<T> type, @Nonnull String name) {
+    return injector.getInstance(Key.get(type, Names.named(name)));
+  }
+}

pom.xml

@@ -47,6 +47,9 @@
     <rxjava.version>2.2.5</rxjava.version>
     <reactor.version>3.2.5.RELEASE</reactor.version>
 
+    <!-- Guice -->
+    <guice.version>4.2.2</guice.version>
+
     <!-- Misc -->
     <okhttp.version>3.11.0</okhttp.version>
 
@@ -344,6 +347,12 @@
         <version>${h2.version}</version>
       </dependency>
 
+      <!-- javax.inject -->
+      <dependency>
+        <groupId>javax.inject</groupId>
+        <artifactId>javax.inject</artifactId>
+        <version>${javax.inject.version}</version>
+      </dependency>
 
       <!-- OKHttp -->
       <dependency>
@@ -436,6 +445,13 @@
         <version>${reactor.version}</version>
       </dependency>
 
+      <!-- Guice -->
+      <dependency>
+        <groupId>com.google.inject</groupId>
+        <artifactId>guice</artifactId>
+        <version>${guice.version}</version>
+      </dependency>
+
       <!-- Kotlin -->
       <dependency>
         <groupId>org.jetbrains.kotlin</groupId>