From c8c375866ca249591427b35b962464f0110e253a Mon Sep 17 00:00:00 2001
From: shtramak <shtramak@gmail.com>
Date: Wed, 28 Nov 2018 14:35:26 +0200
Subject: [PATCH] minor refactor

throw JpaUtilException instead of rethrowing caught exception
rename em to entityManager in a name of unification )
---
 .../src/main/java/com/bobocode/util/JpaUtil.java  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/jpa-hibernate-tutorial-util/src/main/java/com/bobocode/util/JpaUtil.java b/jpa-hibernate-tutorial-util/src/main/java/com/bobocode/util/JpaUtil.java
index 7563309..f443348 100644
--- a/jpa-hibernate-tutorial-util/src/main/java/com/bobocode/util/JpaUtil.java
+++ b/jpa-hibernate-tutorial-util/src/main/java/com/bobocode/util/JpaUtil.java
@@ -25,17 +25,16 @@ public static void close() {
     }
 
     public static void performWithinPersistenceContext(Consumer<EntityManager> operation) {
-        EntityManager em = emf.createEntityManager();
-        em.getTransaction().begin();
-
+        EntityManager entityManager = emf.createEntityManager();
+        entityManager.getTransaction().begin();
         try {
-            operation.accept(em);
-            em.getTransaction().commit();
+            operation.accept(entityManager);
+            entityManager.getTransaction().commit();
         } catch (Exception e) {
-            em.getTransaction().rollback();
+            entityManager.getTransaction().rollback();
             throw new JpaUtilException("Error performing JPA operation. Transaction is rolled back", e);
         } finally {
-            em.close();
+            entityManager.close();
         }
     }
 
@@ -48,7 +47,7 @@ public static <T> T performReturningWithinPersistenceContext(Function<EntityMana
             return result;
         } catch (Exception e) {
             entityManager.getTransaction().rollback();
-            throw e;
+            throw new JpaUtilException("Error performing JPA operation. Transaction is rolled back", e);
         } finally {
             entityManager.close();
         }