Hazlecast Caching Problem fix #604

Author: jknack

jooby-hazelcast/pom.xml

@@ -85,6 +85,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.jooby</groupId>
+      <artifactId>jooby-netty</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
 </project>

jooby-hazelcast/src/main/java/org/jooby/hazelcast/Hcast.java

@@ -26,9 +26,9 @@
 
 import org.jooby.Env;
 import org.jooby.Jooby.Module;
-import org.jooby.internal.hazelcast.HcastManaged;
 
 import com.google.inject.Binder;
+import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
@@ -112,9 +112,11 @@ public void configure(final Env env, final Config conf, final Binder binder) {
       configurer.accept(config, conf);
     }
 
+    HazelcastInstance hcast = Hazelcast.newHazelcastInstance(config);
+
     binder.bind(com.hazelcast.config.Config.class).toInstance(config);
-    binder.bind(HazelcastInstance.class).toProvider(HcastManaged.class).asEagerSingleton();
-    env.lifeCycle(HcastManaged.class);
+    binder.bind(HazelcastInstance.class).toInstance(hcast);
+    env.onStop(hcast::shutdown);
   }
 
   @Override

jooby-hazelcast/src/main/java/org/jooby/internal/hazelcast/HcastManaged.java

@@ -0,0 +1,17 @@
+package hazelcast;
+
+import org.jooby.Jooby;
+import org.jooby.hazelcast.Hcast;
+import org.jooby.hazelcast.HcastSessionStore;
+
+public class HcastApp extends Jooby {
+
+  {
+    use(new Hcast());
+    session(HcastSessionStore.class);
+  }
+
+  public static void main(final String[] args) {
+    run(HcastApp::new, args);
+  }
+}

jooby-hazelcast/src/test/java/hazelcast/HcastApp.java

@@ -6,7 +6,6 @@
 import java.util.function.Consumer;
 
 import org.jooby.Env;
-import org.jooby.internal.hazelcast.HcastManaged;
 import org.jooby.test.MockUnit;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -15,13 +14,14 @@
 
 import com.google.inject.Binder;
 import com.google.inject.binder.AnnotatedBindingBuilder;
-import com.google.inject.binder.ScopedBindingBuilder;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
 import com.typesafe.config.Config;
 
+import javaslang.control.Try.CheckedRunnable;
+
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({Hcast.class, Hazelcast.class, com.hazelcast.config.Config.class })
+@PrepareForTest({Hcast.class, Hazelcast.class, com.hazelcast.config.Config.class, Hazelcast.class })
 public class HcastTest {
 
   @SuppressWarnings("unchecked")
@@ -41,12 +41,15 @@ public class HcastTest {
         .mock(AnnotatedBindingBuilder.class);
     abbConfig.toInstance(config);
 
-    ScopedBindingBuilder sbbHI = unit.mock(ScopedBindingBuilder.class);
-    sbbHI.asEagerSingleton();
+    HazelcastInstance hcast = unit.mock(HazelcastInstance.class);
+    unit.mockStatic(Hazelcast.class);
+    hcast.shutdown();
 
+    expect(Hazelcast.newHazelcastInstance(config)).andReturn(hcast);
     AnnotatedBindingBuilder<HazelcastInstance> abbHI = unit
         .mock(AnnotatedBindingBuilder.class);
-    expect(abbHI.toProvider(HcastManaged.class)).andReturn(sbbHI);
+    abbHI.toInstance(hcast);
+    unit.registerMock(HazelcastInstance.class, hcast);
 
     Binder binder = unit.get(Binder.class);
     expect(binder.bind(com.hazelcast.config.Config.class)).andReturn(abbConfig);
@@ -56,7 +59,7 @@ public class HcastTest {
 
   private MockUnit.Block onStop = unit -> {
     Env env = unit.get(Env.class);
-    expect(env.lifeCycle(HcastManaged.class)).andReturn(env);
+    expect(env.onStop(unit.capture(CheckedRunnable.class))).andReturn(env);
   };
 
   @Test
@@ -67,6 +70,8 @@ public void defaults() throws Exception {
         .run(unit -> {
           new Hcast()
               .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class));
+        }, unit -> {
+          unit.captured(CheckedRunnable.class).iterator().next().run();
         });
   }
 
@@ -84,6 +89,8 @@ public void withConfigurer() throws Exception {
           new Hcast()
               .doWith(unit.get(Consumer.class))
               .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class));
+        }, unit -> {
+          unit.captured(CheckedRunnable.class).iterator().next().run();
         });
   }