more unit tests for hbm

Author: jknack

jooby-hbm/src/main/java/org/jooby/hbm/Hbm.java

@@ -201,17 +201,17 @@ public void configure(final Env mode, final Config config, final Binder binder)
     emf = new HbmProvider(descriptor, config(config, classes));
     keys(EntityManagerFactory.class, key -> binder.bind(key).toProvider(emf).asEagerSingleton());
 
-    Multibinder<Route.Definition> routes = Multibinder.newSetBinder(binder, Route.Definition.class);
-
     List<Key<EntityManager>> emkeys = new ArrayList<>();
 
     keys(EntityManager.class, key -> {
-      binder.bind(key).toProvider(() -> {
+      Provider<EntityManager> em = () -> {
         throw new OutOfScopeException("Cannot access " + key + " outside of a scoping block");
-      }).in(RequestScoped.class);
+      };
+      binder.bind(key).toProvider(em).in(RequestScoped.class);
       emkeys.add(key);
     });
 
+    Multibinder<Route.Definition> routes = Multibinder.newSetBinder(binder, Route.Definition.class);
     routes.addBinding().toInstance(
         new Route.Definition("*", "*", new OpenSessionInView(emf, emkeys)).name("hbm")
         );

jooby-hbm/src/main/java/org/jooby/hbm/OpenSessionInView.java

@@ -1,7 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
 package org.jooby.hbm;
 
 import java.util.List;
 
+import javax.inject.Provider;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 
@@ -14,7 +33,6 @@
 import org.jooby.Response;
 import org.jooby.Route;
 import org.jooby.Route.Chain;
-import org.jooby.internal.hbm.HbmProvider;
 import org.jooby.internal.hbm.TrxResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,11 +44,12 @@ public class OpenSessionInView implements Route.Filter {
   /** The logging system. */
   private final Logger log = LoggerFactory.getLogger(getClass());
 
-  private HbmProvider emf;
+  private Provider<HibernateEntityManagerFactory> emf;
 
   private List<Key<EntityManager>> keys;
 
-  public OpenSessionInView(final HbmProvider emf, final List<Key<EntityManager>> keys) {
+  public OpenSessionInView(final Provider<HibernateEntityManagerFactory> emf,
+      final List<Key<EntityManager>> keys) {
     this.emf = emf;
     this.keys = keys;
   }
@@ -43,39 +62,37 @@ public void handle(final Request req, final Response rsp, final Chain chain) thr
     EntityManager em = hemf.createEntityManager();
     Session session = (Session) em.getDelegate();
     String sessionId = Integer.toHexString(System.identityHashCode(session));
+    keys.forEach(key -> req.set(key, em));
 
     log.debug("session opened: {}", sessionId);
-    log.debug("  [{}] binding", sessionId);
-
-    ManagedSessionContext.bind(session);
-
-    keys.forEach(key -> req.set(key, em));
-    FlushMode flushMode = FlushMode.AUTO;
-    log.debug("  [{}] flush mode: {}", sessionId, flushMode);
-    session.setFlushMode(flushMode);
     EntityTransaction trx = em.getTransaction();
     try {
+      log.debug("  [{}] binding", sessionId);
+      ManagedSessionContext.bind(session);
+
+      FlushMode flushMode = FlushMode.AUTO;
+      log.debug("  [{}] flush mode: {}", sessionId, flushMode);
+      session.setFlushMode(flushMode);
+
       log.debug("  [{}] starting transation: {}", sessionId, trx);
       trx.begin();
 
       // invoke next handler
       chain.next(req, new TrxResponse(rsp, em));
     } finally {
-      try {
-        if (trx.isActive()) {
-          log.debug("  [{}] rolling back transation: {}", sessionId, trx);
-          trx.rollback();
-        }
-      } finally {
-        try {
-          log.debug("  [{}] closing", sessionId);
-          em.close();
-        } finally {
-          log.debug("  [{}] unbinding", sessionId);
-          ManagedSessionContext.unbind(sf);
-          log.debug("session released: [{}]", sessionId);
-        }
-      }
+      closeUnbind(sf, em, sessionId);
+    }
+  }
+
+  private void closeUnbind(final SessionFactory sf, final EntityManager em,
+      final String sessionId) {
+    try {
+      log.debug("  [{}] closing", sessionId);
+      em.close();
+    } finally {
+      log.debug("  [{}] unbinding", sessionId);
+      ManagedSessionContext.unbind(sf);
+      log.debug("session released: [{}]", sessionId);
     }
   }
 

jooby-hbm/src/main/java/org/jooby/internal/hbm/TrxResponse.java

@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
 package org.jooby.internal.hbm;
 
 import java.sql.Connection;
@@ -38,7 +56,7 @@ private void trxSend(final Object result) throws Exception {
       } catch (Exception ex) {
         log.trace("  [" + sessionId + "] unable to setReadOnly " + readOnly, ex);
       }
-      session.setDefaultReadOnly(true);
+      session.setDefaultReadOnly(readOnly);
     };
 
     EntityTransaction trx = em.getTransaction();
@@ -51,30 +69,37 @@ private void trxSend(final Object result) throws Exception {
         trx.commit();
       }
 
-      // start new transaction
-      log.debug("  [{}] setting connection to read only", sessionId);
-      setReadOnly.accept(true);
-      session.setFlushMode(FlushMode.MANUAL);
-      EntityTransaction readOnlyTrx = em.getTransaction();
-      log.debug("  [{}] starting readonly transaction: {}", sessionId, readOnlyTrx);
-      readOnlyTrx.begin();
-
+      EntityTransaction readOnlyTrx = null;
       try {
+        // start new transaction
+        log.debug("  [{}] setting connection to read only", sessionId);
+        setReadOnly.accept(true);
+        session.setFlushMode(FlushMode.MANUAL);
+        readOnlyTrx = em.getTransaction();
+        log.debug("  [{}] starting readonly transaction: {}", sessionId, readOnlyTrx);
+        readOnlyTrx.begin();
+
         // send it!
         super.send(result);
 
         log.debug("  [{}] commiting readonly transaction: {}", sessionId, readOnlyTrx);
         readOnlyTrx.commit();
       } catch (Exception ex) {
-        if (readOnlyTrx.isActive()) {
+        if (readOnlyTrx != null && readOnlyTrx.isActive()) {
           log.debug("  [{}] rolling back readonly transaction: {}", sessionId, readOnlyTrx);
           readOnlyTrx.rollback();
         }
         throw ex;
+      } finally {
+        log.debug("  [{}] removing readonly mode from connection", sessionId);
+        setReadOnly.accept(false);
+      }
+    } catch (Exception ex) {
+      if (trx.isActive()) {
+        log.debug("  [{}] rolling back transation: {}", sessionId, trx);
+        trx.rollback();
       }
-    } finally {
-      log.debug("  [{}] removing readonly mode from connection", sessionId);
-      setReadOnly.accept(false);
+      throw ex;
     }
   }