tiennm99/java-design-patterns
1
0
Fork 0
mirror of https://github.com/tiennm99/java-design-patterns.git synced 2026-05-14 14:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
service-layer/src/main/java/com/iluwatar/servicelayer/common/DaoBaseImpl.java
+16 -7
View File
@@ -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();
service-layer/src/main/java/com/iluwatar/servicelayer/spell/SpellDaoImpl.java
+11 -4
View File
@@ -25,8 +25,12 @@
package com.iluwatar.servicelayer.spell;
import com.iluwatar.servicelayer.common.DaoBaseImpl;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import org.hibernate.Transaction;
import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
/**
* SpellDao implementation.
@@ -39,9 +43,12 @@ public class SpellDaoImpl extends DaoBaseImpl<Spell> implements SpellDao {
Spell result;
try (var session = getSessionFactory().openSession()) {
tx = session.beginTransaction();
var criteria = session.createCriteria(persistentClass);
criteria.add(Restrictions.eq("name", name));
result = (Spell) criteria.uniqueResult();
CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder();
CriteriaQuery<Spell> builderQuery = criteriaBuilder.createQuery(Spell.class);
Root<Spell> root = builderQuery.from(Spell.class);
builderQuery.select(root).where(criteriaBuilder.equal(root.get("name"), name));
Query<Spell> query = session.createQuery(builderQuery);
result = query.uniqueResult();
tx.commit();
} catch (Exception e) {
if (tx != null) {
service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/SpellbookDaoImpl.java
+11 -4
View File
@@ -25,8 +25,12 @@
package com.iluwatar.servicelayer.spellbook;
import com.iluwatar.servicelayer.common.DaoBaseImpl;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import org.hibernate.Transaction;
import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
/**
* SpellbookDao implementation.
@@ -39,9 +43,12 @@ public class SpellbookDaoImpl extends DaoBaseImpl<Spellbook> implements Spellboo
Spellbook result;
try (var session = getSessionFactory().openSession()) {
tx = session.beginTransaction();
var criteria = session.createCriteria(persistentClass);
criteria.add(Restrictions.eq("name", name));
result = (Spellbook) criteria.uniqueResult();
CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder();
CriteriaQuery<Spellbook> builderQuery = criteriaBuilder.createQuery(Spellbook.class);
Root<Spellbook> root = builderQuery.from(Spellbook.class);
builderQuery.select(root).where(criteriaBuilder.equal(root.get("name"), name));
Query<Spellbook> query = session.createQuery(builderQuery);
result = query.uniqueResult();
tx.commit();
} catch (Exception e) {
if (tx != null) {
service-layer/src/main/java/com/iluwatar/servicelayer/wizard/WizardDaoImpl.java
+10 -4
View File
@@ -25,8 +25,11 @@
package com.iluwatar.servicelayer.wizard;
import com.iluwatar.servicelayer.common.DaoBaseImpl;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import org.hibernate.Transaction;
import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
/**
* WizardDao implementation.
@@ -39,9 +42,12 @@ public class WizardDaoImpl extends DaoBaseImpl<Wizard> implements WizardDao {
Wizard result;
try (var session = getSessionFactory().openSession()) {
tx = session.beginTransaction();
var criteria = session.createCriteria(persistentClass);
criteria.add(Restrictions.eq("name", name));
result = (Wizard) criteria.uniqueResult();
CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder();
CriteriaQuery<Wizard> builderQuery = criteriaBuilder.createQuery(Wizard.class);
Root<Wizard> root = builderQuery.from(Wizard.class);
builderQuery.select(root).where(criteriaBuilder.equal(root.get("name"), name));
Query<Wizard> query = session.createQuery(builderQuery);
result = query.uniqueResult();
tx.commit();
} catch (Exception e) {
if (tx != null) {