refactoring #1012: Remove deprecated method to ease Hibernate upgrade (#2125)

* refactoring #1012: Remove deprecated method to ease Hibernate upgrade later on

* refactoring #1012: Fix checkstyle violation
This commit is contained in:
kongleong86
2022-10-26 18:33:57 +01:00
committed by GitHub
parent 7331a1dbca
commit 6e9ea39275
5 changed files with 58 additions and 30 deletions
@@ -27,10 +27,12 @@ package com.iluwatar.servicelayer.common;
import com.iluwatar.servicelayer.hibernate.HibernateUtil;
import java.lang.reflect.ParameterizedType;
import java.util.List;
import org.hibernate.Criteria;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
/**
* Base class for Dao implementations.
@@ -57,9 +59,12 @@ public abstract class DaoBaseImpl<E extends BaseEntity> implements Dao<E> {
E result;
try (var session = getSessionFactory().openSession()) {
tx = session.beginTransaction();
var criteria = session.createCriteria(persistentClass);
criteria.add(Restrictions.idEq(id));
result = (E) criteria.uniqueResult();
CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder();
CriteriaQuery<E> builderQuery = criteriaBuilder.createQuery(persistentClass);
Root<E> root = builderQuery.from(persistentClass);
builderQuery.select(root).where(criteriaBuilder.equal(root.get("id"), id));
Query<E> query = session.createQuery(builderQuery);
result = query.uniqueResult();
tx.commit();
} catch (Exception e) {
if (tx != null) {
@@ -123,8 +128,12 @@ public abstract class DaoBaseImpl<E extends BaseEntity> implements Dao<E> {
List<E> result;
try (var session = getSessionFactory().openSession()) {
tx = session.beginTransaction();
Criteria criteria = session.createCriteria(persistentClass);
result = criteria.list();
CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder();
CriteriaQuery<E> builderQuery = criteriaBuilder.createQuery(persistentClass);
Root<E> root = builderQuery.from(persistentClass);
builderQuery.select(root);
Query<E> query = session.createQuery(builderQuery);
result = query.getResultList();
} catch (Exception e) {
if (tx != null) {
tx.rollback();