code cleanup + more

* remove .named option from some module (useless)
* cleanup code around mongodb
* simplify morphia integration
* more unit tests
* going better and better ;)

Author: jknack

jooby-akka/src/main/java/org/jooby/akka/Akka.java

@@ -24,8 +24,6 @@
 import org.jooby.Jooby.Module;
 
 import com.google.inject.Binder;
-import com.google.inject.Key;
-import com.google.inject.name.Names;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
@@ -62,8 +60,6 @@
  */
 public class Akka implements Module {
 
-  private boolean named;
-
   private String name;
 
   /**
@@ -82,25 +78,13 @@ public Akka() {
     this("default");
   }
 
-  /**
-   * Bind the {@link ActorSystem} system using it's name.
-   *
-   * @return This module.
-   */
-  public Akka named() {
-    named = true;
-    return this;
-  }
-
   @Override
   public void configure(final Env env, final Config conf, final Binder binder) {
     ActorSystem sys = ActorSystem.create(name, conf);
 
-    Key<ActorSystem> syskey = Key.get(ActorSystem.class);
-    if (named) {
-      syskey = Key.get(ActorSystem.class, Names.named(name));
-    }
-    binder.bind(syskey).toInstance(sys);
+    env.serviceKey().generate(ActorSystem.class, name, syskey -> {
+      binder.bind(syskey).toInstance(sys);
+    });
   }
 
   @Override

jooby-akka/src/test/java/org/jooby/akka/AkkaTest.java

@@ -32,13 +32,18 @@ public void defaults() throws Exception {
               .andReturn(unit.get(ActorSystem.class));
         })
         .expect(unit -> {
+          Env env = unit.get(Env.class);
+          expect(env.serviceKey()).andReturn(new Env.ServiceKey());
+
           ActorSystem sys = unit.get(ActorSystem.class);
 
           LinkedBindingBuilder<ActorSystem> lbbSys = unit.mock(LinkedBindingBuilder.class);
           lbbSys.toInstance(sys);
+          lbbSys.toInstance(sys);
 
           Binder binder = unit.get(Binder.class);
 
+          expect(binder.bind(Key.get(ActorSystem.class, Names.named("default")))).andReturn(lbbSys);
           expect(binder.bind(Key.get(ActorSystem.class))).andReturn(lbbSys);
         })
         .run(unit -> {
@@ -47,33 +52,6 @@ public void defaults() throws Exception {
         });
   }
 
-  @SuppressWarnings("unchecked")
-  @Test
-  public void named() throws Exception {
-    new MockUnit(Env.class, Config.class, Binder.class, ActorSystem.class)
-        .expect(unit -> {
-          unit.mockStatic(ActorSystem.class);
-          expect(ActorSystem.create("default", unit.get(Config.class)))
-              .andReturn(unit.get(ActorSystem.class));
-        })
-        .expect(unit -> {
-
-          ActorSystem sys = unit.get(ActorSystem.class);
-
-          LinkedBindingBuilder<ActorSystem> lbbSys = unit.mock(LinkedBindingBuilder.class);
-          lbbSys.toInstance(sys);
-
-          Binder binder = unit.get(Binder.class);
-
-          expect(binder.bind(Key.get(ActorSystem.class, Names.named("default"))))
-              .andReturn(lbbSys);
-        })
-        .run(unit -> {
-          new Akka().named().configure(unit.get(Env.class), unit.get(Config.class),
-              unit.get(Binder.class));
-        });
-  }
-
   @Test
   public void config() {
     Config config = new Akka().config();

jooby-cassandra/src/main/java/org/jooby/cassandra/Cassandra.java

@@ -22,11 +22,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 import org.jooby.Env;
+import org.jooby.Env.ServiceKey;
 import org.jooby.Jooby.Module;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,8 +42,6 @@
 import com.datastax.driver.mapping.MappingManager;
 import com.datastax.driver.mapping.annotations.Accessor;
 import com.google.inject.Binder;
-import com.google.inject.Key;
-import com.google.inject.name.Names;
 import com.typesafe.config.Config;
 
 import javaslang.Function3;
@@ -268,8 +266,6 @@
  */
 public class Cassandra implements Module {
 
-  static final AtomicInteger COUNTER = new AtomicInteger(0);
-
   /** The logging system. */
   private final Logger log = LoggerFactory.getLogger(getClass());
 
@@ -377,12 +373,12 @@ public void configure(final Env env, final Config conf, final Binder binder) {
     ConnectionString cstr = Try.of(() -> ConnectionString.parse(db))
         .getOrElse(() -> ConnectionString.parse(conf.getString(db)));
 
-    boolean first = COUNTER.getAndIncrement() == 0;
+    ServiceKey serviceKey = env.serviceKey();
+
     Function3<Class, String, Object, Void> bind = (type, name, value) -> {
-      binder.bind(Key.get(type, Names.named(name))).toInstance(value);
-      if (first) {
-        binder.bind(Key.get(type)).toInstance(value);
-      }
+      serviceKey.generate(type, name, k -> {
+        binder.bind(k).toInstance(value);
+      });
       return null;
     };
 

jooby-cassandra/src/test/java/org/jooby/cassandra/CassandraSessionStoreTest.java

@@ -139,7 +139,7 @@ public void create() throws Exception {
     new MockUnit(Session.class, org.jooby.Session.class)
         .expect(createTable)
         .expect(session("sid", 5, 6, 7, ImmutableMap.of("foo", "bar")))
-        .expect(insertInto(30))
+        .expect(insertInto(0))
         .expect(boundStatement)
         .expect(unit -> {
           BoundStatement statement = unit.get(BoundStatement.class);
@@ -151,8 +151,8 @@ public void create() throws Exception {
           expect(session.execute(statement)).andReturn(null);
         })
         .run(unit -> {
-          new CassandraSessionStore(unit.get(Session.class), "30")
-              .save(unit.get(org.jooby.Session.class));
+          new CassandraSessionStore(unit.get(Session.class), 0)
+              .create(unit.get(org.jooby.Session.class));
         });
   }
 
@@ -307,9 +307,10 @@ private Block insertInto(final int ttl) {
       unit.registerMock(PreparedStatement.class, statement);
 
       Session session = unit.get(Session.class);
+      String suffix = ttl > 0 ? " USING TTL " + ttl : "";
       expect(session.prepare(
-          "INSERT INTO session (id,createdAt,accessedAt,savedAt,attributes) VALUES (?,?,?,?,?) USING TTL "
-              + ttl + ";"))
+          "INSERT INTO session (id,createdAt,accessedAt,savedAt,attributes) VALUES (?,?,?,?,?)"
+              + suffix + ";"))
                   .andReturn(statement);
     };
   }

jooby-cassandra/src/test/java/org/jooby/cassandra/CassandraTest.java

@@ -4,6 +4,7 @@
 import static org.easymock.EasyMock.expectLastCall;
 
 import org.jooby.Env;
+import org.jooby.Env.ServiceKey;
 import org.jooby.Routes;
 import org.jooby.test.MockUnit;
 import org.jooby.test.MockUnit.Block;
@@ -94,13 +95,13 @@ public class CassandraTest {
 
   @Test
   public void connectViaProperty() throws Exception {
-    Cassandra.COUNTER.set(0);
     new MockUnit(Env.class, Config.class, Binder.class, Cluster.class, Cluster.Builder.class,
         Configuration.class, Session.class)
             .expect(unit -> {
               Config conf = unit.get(Config.class);
               expect(conf.getString("db")).andReturn("cassandra://localhost/beers");
             })
+            .expect(serviceKey(new Env.ServiceKey()))
             .expect(clusterBuilder)
             .expect(contactPoints("localhost"))
             .expect(port(9042))
@@ -123,12 +124,19 @@ public void connectViaProperty() throws Exception {
             });
   }
 
+  private Block serviceKey(final ServiceKey serviceKey) {
+    return unit -> {
+      Env env = unit.get(Env.class);
+      expect(env.serviceKey()).andReturn(serviceKey);
+    };
+  }
+
   @Test
   public void connectViaConnectionString() throws Exception {
-    Cassandra.COUNTER.set(0);
     new MockUnit(Env.class, Config.class, Binder.class, Cluster.class, Cluster.Builder.class,
         Configuration.class, Session.class)
             .expect(clusterBuilder)
+            .expect(serviceKey(new Env.ServiceKey()))
             .expect(contactPoints("localhost"))
             .expect(port(9042))
             .expect(codecRegistry)
@@ -152,10 +160,10 @@ public void connectViaConnectionString() throws Exception {
 
   @Test
   public void onStop() throws Exception {
-    Cassandra.COUNTER.set(0);
     new MockUnit(Env.class, Config.class, Binder.class, Cluster.class, Cluster.Builder.class,
         Configuration.class, Session.class)
             .expect(clusterBuilder)
+            .expect(serviceKey(new Env.ServiceKey()))
             .expect(contactPoints("localhost"))
             .expect(port(9042))
             .expect(codecRegistry)
@@ -188,10 +196,10 @@ public void onStop() throws Exception {
 
   @Test
   public void onStopSessionerr() throws Exception {
-    Cassandra.COUNTER.set(0);
     new MockUnit(Env.class, Config.class, Binder.class, Cluster.class, Cluster.Builder.class,
         Configuration.class, Session.class)
             .expect(clusterBuilder)
+            .expect(serviceKey(new Env.ServiceKey()))
             .expect(contactPoints("localhost"))
             .expect(port(9042))
             .expect(codecRegistry)
@@ -226,11 +234,11 @@ public void onStopSessionerr() throws Exception {
   @SuppressWarnings("unchecked")
   @Test
   public void withAccessor() throws Exception {
-    Cassandra.COUNTER.set(0);
     Object value = new Object();
     new MockUnit(Env.class, Config.class, Binder.class, Cluster.class, Cluster.Builder.class,
         Configuration.class, Session.class)
             .expect(clusterBuilder)
+            .expect(serviceKey(new Env.ServiceKey()))
             .expect(contactPoints("localhost"))
             .expect(port(9042))
             .expect(codecRegistry)
@@ -265,10 +273,10 @@ public void withAccessor() throws Exception {
 
   @Test
   public void doWithCluster() throws Exception {
-    Cassandra.COUNTER.set(0);
     new MockUnit(Env.class, Config.class, Binder.class, Cluster.class, Cluster.Builder.class,
         Configuration.class, Session.class, StateListener.class)
             .expect(clusterBuilder)
+            .expect(serviceKey(new Env.ServiceKey()))
             .expect(contactPoints("localhost"))
             .expect(port(9042))
             .expect(codecRegistry)
@@ -297,10 +305,10 @@ public void doWithCluster() throws Exception {
 
   @Test
   public void doWithClusterBuilder() throws Exception {
-    Cassandra.COUNTER.set(0);
     new MockUnit(Env.class, Config.class, Binder.class, Cluster.class, Cluster.Builder.class,
         Configuration.class, Session.class)
             .expect(clusterBuilder)
+            .expect(serviceKey(new Env.ServiceKey()))
             .expect(contactPoints("localhost"))
             .expect(port(9042))
             .expect(codecRegistry)
@@ -329,29 +337,6 @@ public void doWithClusterBuilder() throws Exception {
             });
   }
 
-  @Test
-  public void secondInstance() throws Exception {
-    Cassandra.COUNTER.set(1);
-    new MockUnit(Env.class, Config.class, Binder.class, Cluster.class, Cluster.Builder.class,
-        Configuration.class, Session.class)
-            .expect(clusterBuilder)
-            .expect(contactPoints("localhost"))
-            .expect(port(9042))
-            .expect(codecRegistry)
-            .expect(bind("beers", Cluster.class))
-            .expect(bind("beers", Session.class))
-            .expect(connect("beers"))
-            .expect(mapper)
-            .expect(bind("beers", MappingManager.class))
-            .expect(datastore)
-            .expect(bind("beers", Datastore.class))
-            .expect(routeMapper).expect(onStop)
-            .run(unit -> {
-              new Cassandra("cassandra://localhost/beers")
-                  .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class));
-            });
-  }
-
   private Block connect(final String keyspace) {
     return unit -> {
       Cluster cluster = unit.get(Cluster.class);

jooby-commons-email/src/main/java/org/jooby/mail/CommonsEmail.java

@@ -26,15 +26,14 @@
 import org.apache.commons.mail.MultiPartEmail;
 import org.apache.commons.mail.SimpleEmail;
 import org.jooby.Env;
+import org.jooby.Env.ServiceKey;
 import org.jooby.Jooby;
 import org.jooby.internal.mail.HtmlEmailProvider;
 import org.jooby.internal.mail.ImageHtmlEmailProvider;
 import org.jooby.internal.mail.MultiPartEmailProvider;
 import org.jooby.internal.mail.SimpleEmailProvider;
 
 import com.google.inject.Binder;
-import com.google.inject.Key;
-import com.google.inject.name.Names;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
@@ -83,8 +82,6 @@ public class CommonsEmail implements Jooby.Module {
 
   private String name;
 
-  private boolean named;
-
   /**
    * Creates a {@link CommonsEmail}.
    *
@@ -101,29 +98,23 @@ public CommonsEmail() {
     this("mail");
   }
 
-  /**
-   * Call this method if you need two or more mail configuration. This method will bind email
-   * instances using the provided name.
-   *
-   * @return This module.
-   */
-  public CommonsEmail named() {
-    named = true;
-    return this;
-  }
-
   @Override
   public void configure(final Env env, final Config config, final Binder binder) {
     Config mail = config.getConfig(name).withFallback(config.getConfig("mail"));
 
-    binder.bind(key(SimpleEmail.class)).toProvider(new SimpleEmailProvider(mail));
-    binder.bind(key(HtmlEmail.class)).toProvider(new HtmlEmailProvider(mail));
-    binder.bind(key(MultiPartEmail.class)).toProvider(new MultiPartEmailProvider(mail));
-    binder.bind(key(ImageHtmlEmail.class)).toProvider(new ImageHtmlEmailProvider(mail));
-  }
-
-  private <T> Key<T> key(final Class<T> type) {
-    return named ? Key.get(type, Names.named(name)) : Key.get(type);
+    ServiceKey serviceKey = env.serviceKey();
+    serviceKey.generate(SimpleEmail.class, name, k -> {
+      binder.bind(k).toProvider(new SimpleEmailProvider(mail));
+    });
+    serviceKey.generate(HtmlEmail.class, name, k -> {
+      binder.bind(k).toProvider(new HtmlEmailProvider(mail));
+    });
+    serviceKey.generate(MultiPartEmail.class, name, k -> {
+      binder.bind(k).toProvider(new MultiPartEmailProvider(mail));
+    });
+    serviceKey.generate(ImageHtmlEmail.class, name, k -> {
+      binder.bind(k).toProvider(new ImageHtmlEmailProvider(mail));
+    });
   }
 
   @Override