Fix:

- getSessionFactory() - добавлена проверка на null SessionFactory; - убраны rollback с DDL операций
shpali4 · Dec 15, 2022 · 73078f6 · 73078f6
1 parent 441ce18
commit 73078f6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -47,6 +47,8 @@
             <artifactId>hibernate-core</artifactId>
             <version>5.6.3.Final</version>
         </dependency>
-     </dependencies>
+
+
+    </dependencies>
 
 </project>
diff --git a/src/main/java/jm/task/core/jdbc/dao/UserDaoHibernateImpl.java b/src/main/java/jm/task/core/jdbc/dao/UserDaoHibernateImpl.java
@@ -4,7 +4,6 @@
 import jm.task.core.jdbc.util.Util;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,7 +16,6 @@ public UserDaoHibernateImpl() {
 
     @Override
     public void createUsersTable() {
-        Transaction transaction = null;
         try (Session session = sessionFactory.openSession()) {
             session.beginTransaction();
             session.createNativeQuery("CREATE TABLE IF NOT EXISTS users (" +
@@ -28,39 +26,36 @@ public void createUsersTable() {
                     .executeUpdate();
             session.getTransaction().commit();
         } catch (Exception e) {
-            transaction.rollback();
+            e.printStackTrace();
         }
     }
 
     @Override
     public void dropUsersTable() {
-        Transaction transaction = null;
         try (Session session = sessionFactory.openSession()) {
             session.beginTransaction();
             session.createNativeQuery("DROP TABLE IF EXISTS users").executeUpdate();
             session.getTransaction().commit();
         } catch (Exception e) {
-            transaction.rollback();
+            e.printStackTrace();
         }
     }
 
     @Override
     public void saveUser(String name, String lastName, byte age) {
-        Transaction transaction = null;
         try (Session session = sessionFactory.openSession()) {
             session.beginTransaction();
             User user = new User(name, lastName, age);
             session.save(user);
             session.getTransaction().commit();
             System.out.println("User с именем - " + user.getName() + " добавлен в базу данных");
         } catch (Exception e) {
-            transaction.rollback();
+            e.printStackTrace();
         }
     }
 
     @Override
     public void removeUserById(long id) {
-        Transaction transaction = null;
         try (Session session = sessionFactory.openSession()) {
             session.beginTransaction();
             User user = session.get(User.class, id);
@@ -69,33 +64,31 @@ public void removeUserById(long id) {
             }
             session.getTransaction().commit();
         } catch (Exception e) {
-            transaction.rollback();
+            e.printStackTrace();
         }
     }
 
     @Override
     public List<User> getAllUsers() {
-        Transaction transaction = null;
         List<User> users = new ArrayList<>();
         try (Session session = sessionFactory.openSession()) {
             session.beginTransaction();
             users = session.createQuery("SELECT x FROM User x", User.class).list();
             session.getTransaction().commit();
         } catch (Exception e) {
-            transaction.rollback();
+            e.printStackTrace();
         }
         return users;
     }
 
     @Override
     public void cleanUsersTable() {
-        Transaction transaction = null;
         try (Session session = sessionFactory.openSession()) {
             session.beginTransaction();
             session.createNativeQuery("DELETE FROM users").executeUpdate();
             session.getTransaction().commit();
         } catch (Exception e) {
-            transaction.rollback();
+            e.printStackTrace();
         }
     }
 }
diff --git a/src/main/java/jm/task/core/jdbc/util/Util.java b/src/main/java/jm/task/core/jdbc/util/Util.java
@@ -18,6 +18,7 @@ public class Util {
     public static final String DIALECT = "org.hibernate.dialect.MySQL8Dialect";
 
     private static SessionFactory sessionFactory;
+    private static Configuration configuration;
     public static Connection getConnection() {
         Connection connection = null;
         try {
@@ -34,13 +35,21 @@ public static Connection getConnection() {
     }
 
     public static SessionFactory getSessionFactory() {
-        Configuration configuration = new Configuration()
-                .setProperty("hibernate.connection.url", URL)
-                .setProperty("hibernate.connection.username", USER)
-                .setProperty("hibernate.connection.password", PASSWORD)
-                .setProperty("hibernate.connection.driver_class", DRIVER)
-                .setProperty("hibernate.dialect", DIALECT);
-        sessionFactory = configuration.addAnnotatedClass(User.class).buildSessionFactory();
+        if (sessionFactory != null) {
+            if (!sessionFactory.isClosed()) {
+                return sessionFactory;
+            }
+        }
+        if (configuration == null) {
+           configuration = new Configuration()
+                    .setProperty("hibernate.connection.url", URL)
+                    .setProperty("hibernate.connection.username", USER)
+                    .setProperty("hibernate.connection.password", PASSWORD)
+                    .setProperty("hibernate.connection.driver_class", DRIVER)
+                    .setProperty("hibernate.dialect", DIALECT);
+            configuration.addAnnotatedClass(User.class);
+        }
+        sessionFactory = configuration.buildSessionFactory();
         return sessionFactory;
     }