Inject Issue in Cache modules and MVC fix #573

Author: jknack

coverage-report/src/test/java/org/jooby/issues/Issue573.java

@@ -0,0 +1,55 @@
+package org.jooby.issues;
+
+import java.util.concurrent.ExecutionException;
+
+import javax.inject.Inject;
+
+import org.jooby.guava.GuavaCache;
+import org.jooby.guava.GuavaSessionStore;
+import org.jooby.mvc.GET;
+import org.jooby.mvc.Path;
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+import com.google.common.cache.Cache;
+import com.typesafe.config.ConfigFactory;
+import com.typesafe.config.ConfigValueFactory;
+
+public class Issue573 extends ServerFeature {
+
+  @Path("/573")
+  public static class MvcRoute {
+
+    private Cache<String, Object> cache;
+
+    @Inject
+    public MvcRoute(final Cache<String, Object> cache) {
+      this.cache = cache;
+    }
+
+    @GET
+    public Object get() throws ExecutionException {
+      return cache.get("foo", () -> "bar");
+    }
+  }
+
+  {
+    use(ConfigFactory.empty()
+        .withValue("guava.cache", ConfigValueFactory.fromAnyRef("maximumSize=10"))
+        .withValue("guava.session", ConfigValueFactory.fromAnyRef("maximumSize=10")));
+
+    use(GuavaCache.newCache());
+
+    session(GuavaSessionStore.class);
+
+    use(MvcRoute.class);
+  }
+
+  @Test
+  public void shouldInjectCacheIntoMvcRoute() throws Exception {
+    request()
+        .get("/573")
+        .expect("bar");
+  }
+
+}

coverage-report/src/test/java/org/jooby/issues/Issue573b.java

@@ -0,0 +1,54 @@
+package org.jooby.issues;
+
+import java.util.concurrent.ExecutionException;
+
+import javax.inject.Inject;
+
+import org.jooby.guava.GuavaCache;
+import org.jooby.guava.GuavaSessionStore;
+import org.jooby.mvc.GET;
+import org.jooby.mvc.Path;
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+import com.google.common.cache.Cache;
+import com.typesafe.config.ConfigFactory;
+import com.typesafe.config.ConfigValueFactory;
+
+public class Issue573b extends ServerFeature {
+
+  @Path("/573")
+  public static class MvcRoute {
+
+    private Cache<String, Object> cache;
+
+    @Inject
+    public MvcRoute(final Cache<String, Object> cache) {
+      this.cache = cache;
+    }
+
+    @GET
+    public Object get() throws ExecutionException {
+      return cache.get("foo", () -> "bar");
+    }
+  }
+
+  {
+    use(ConfigFactory.empty()
+        .withValue("guava.session", ConfigValueFactory.fromAnyRef("maximumSize=10")));
+
+    use(GuavaCache.newCache());
+
+    session(GuavaSessionStore.class);
+
+    use(MvcRoute.class);
+  }
+
+  @Test
+  public void shouldInjectCacheIntoMvcRoute() throws Exception {
+    request()
+        .get("/573")
+        .expect("bar");
+  }
+
+}

jooby-caffeine/src/main/java/org/jooby/caffeine/CaffeineCache.java

@@ -242,9 +242,10 @@ public CaffeineCache<K, V> doWithAsync(final AsyncCallback<K, V> configurer) {
   @SuppressWarnings({"unchecked", "rawtypes" })
   @Override
   public void configure(final Env env, final Config conf, final Binder binder) {
-    Config gconf = conf.hasPath(name)
-        ? conf
-        : ConfigFactory.empty().withValue("caffeine.cache", ConfigValueFactory.fromAnyRef(""));
+    Config gconf = conf.hasPath(name) ? conf : ConfigFactory.empty();
+
+    gconf = gconf.withFallback(
+        ConfigFactory.empty().withValue("caffeine.cache", ConfigValueFactory.fromAnyRef("")));
 
     gconf.getObject(name).unwrapped().forEach((name, spec) -> {
       Caffeine<K, V> cb = (Caffeine<K, V>) Caffeine.from(toSpec(spec));

jooby-guava-cache/src/main/java/org/jooby/guava/GuavaCache.java

@@ -222,9 +222,10 @@ public GuavaCache<K, V> doWith(final Callback<K, V, Cache<K, V>> configurer) {
   @SuppressWarnings({"unchecked", "rawtypes" })
   @Override
   public void configure(final Env env, final Config conf, final Binder binder) {
-    Config gconf = conf.hasPath(name)
-        ? conf
-        : ConfigFactory.empty().withValue("guava.cache", ConfigValueFactory.fromAnyRef(""));
+    Config gconf = conf.hasPath(name) ? conf : ConfigFactory.empty();
+
+    gconf = gconf.withFallback(
+        ConfigFactory.empty().withValue("guava.cache", ConfigValueFactory.fromAnyRef("")));
 
     gconf.getObject(name).unwrapped().forEach((name, spec) -> {
       CacheBuilder<K, V> cb = (CacheBuilder<K, V>) CacheBuilder.from(toSpec(spec));