Added try with resources for session

Author: dschadow

Ch05_AccessReferenceMaps/src/main/java/de/dominikschadow/webappsecurity/AccountsDAO.java

@@ -18,11 +18,13 @@
 package de.dominikschadow.webappsecurity;
 
 import de.dominikschadow.webappsecurity.domain.Account;
+import org.hibernate.HibernateException;
 import org.hibernate.Query;
 import org.hibernate.Session;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import static de.dominikschadow.webappsecurity.HibernateUtil.getSessionFactory;
@@ -45,27 +47,31 @@ public Account loadAccount(int id) {
     }
 
     private Account queryAccount(int id) {
-        Session session = getSessionFactory().openSession();
-        Query query = session.createQuery("FROM Account WHERE accountId = :id");
-        query.setParameter("id", id);
+        try (Session session = getSessionFactory().openSession()) {
+            Query query = session.createQuery("FROM Account WHERE accountId = :id");
+            query.setParameter("id", id);
 
-        Account account = (Account) query.uniqueResult();
+            return (Account) query.uniqueResult();
+        } catch (HibernateException ex) {
+            LOGGER.error(ex.getMessage(), ex);
+        }
 
-        session.close();
-
-        return account;
+        return null;
     }
 
     private List<String> queryAccounts(int userId) {
-        Session session = getSessionFactory().openSession();
-        Query query = session.createSQLQuery("SELECT accountId FROM account WHERE ownerId = :id");
-        query.setParameter("id", userId);
+        List<String> accountReferences = new ArrayList<>();
 
-        List<String> accountReferences = query.list();
+        try (Session session = getSessionFactory().openSession()) {
+            Query query = session.createSQLQuery("SELECT accountId FROM account WHERE ownerId = :id");
+            query.setParameter("id", userId);
 
-        LOGGER.info("Found {} account references", accountReferences.size());
+            accountReferences = query.list();
 
-        session.close();
+            LOGGER.info("Found {} account references", accountReferences.size());
+        } catch (HibernateException ex) {
+            LOGGER.error(ex.getMessage(), ex);
+        }
 
         return accountReferences;
     }

Ch07_XSS/src/main/java/de/dominikschadow/webappsecurity/daos/CustomerDAO.java

@@ -18,15 +18,12 @@
 package de.dominikschadow.webappsecurity.daos;
 
 import de.dominikschadow.webappsecurity.domain.Customer;
-
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
+import org.hibernate.*;
 import org.hibernate.criterion.Restrictions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import static de.dominikschadow.webappsecurity.daos.HibernateUtil.getSessionFactory;
@@ -41,37 +38,43 @@ public class CustomerDAO {
     private static final Logger LOGGER = LoggerFactory.getLogger(CustomerDAO.class);
 
     public List<Customer> getAllCustomers() {
-        Session session = getSessionFactory().openSession();
-        Query query = session.createQuery("FROM Customer");
-        @SuppressWarnings("unchecked")
-        List<Customer> customers = query.list();
+        List<Customer> customers = new ArrayList<>();
 
-        LOGGER.info("Found {} customers", customers.size());
+        try (Session session = getSessionFactory().openSession()) {
+            Query query = session.createQuery("FROM Customer");
+            customers = query.list();
 
-        session.close();
+            LOGGER.info("Found {} customers", customers.size());
+        } catch (HibernateException ex) {
+            LOGGER.error(ex.getMessage(), ex);
+        }
 
         return customers;
     }
 
     public void createCustomer(Customer customer) {
-        Session session = getSessionFactory().openSession();
-        Transaction tx = session.beginTransaction();
-        session.persist(customer);
-        tx.commit();
-        session.close();
+        try (Session session = getSessionFactory().openSession()) {
+            Transaction tx = session.beginTransaction();
+            session.persist(customer);
+            tx.commit();
+        } catch (HibernateException ex) {
+            LOGGER.error(ex.getMessage(), ex);
+        }
     }
 
     public List<Customer> findCustomers(Customer customer) {
-        Session session = getSessionFactory().openSession();
-        Criteria criteria = session.createCriteria(Customer.class);
-        criteria.add(Restrictions.like("name", "%" + customer.getName()+ "%"));
+        List<Customer> customers = new ArrayList<>();
 
-        @SuppressWarnings("unchecked")
-        List<Customer> customers = criteria.list();
+        try (Session session = getSessionFactory().openSession()) {
+            Criteria criteria = session.createCriteria(Customer.class);
+            criteria.add(Restrictions.like("name", "%" + customer.getName() + "%"));
 
-        LOGGER.info("Found {} customers", customers.size());
+            customers = criteria.list();
 
-        session.close();
+            LOGGER.info("Found {} customers", customers.size());
+        } catch (HibernateException ex) {
+            LOGGER.error(ex.getMessage(), ex);
+        }
 
         return customers;
     }