From 935cdd031e70c080bdff3571b8ec35aaf1d9c211 Mon Sep 17 00:00:00 2001 From: Ilkka Seppala Date: Thu, 16 Apr 2015 07:44:07 +0300 Subject: [PATCH] Replace deprecated Hibernate Expression with Restrictions. --- .../src/main/java/com/iluwatar/spell/SpellDaoImpl.java | 4 ++-- .../main/java/com/iluwatar/spellbook/SpellbookDaoImpl.java | 4 ++-- .../src/main/java/com/iluwatar/wizard/WizardDaoImpl.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/service-layer/src/main/java/com/iluwatar/spell/SpellDaoImpl.java b/service-layer/src/main/java/com/iluwatar/spell/SpellDaoImpl.java index ac6391421..f8fb425c3 100644 --- a/service-layer/src/main/java/com/iluwatar/spell/SpellDaoImpl.java +++ b/service-layer/src/main/java/com/iluwatar/spell/SpellDaoImpl.java @@ -3,7 +3,7 @@ package com.iluwatar.spell; import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.criterion.Expression; +import org.hibernate.criterion.Restrictions; import com.iluwatar.common.DaoBaseImpl; @@ -22,7 +22,7 @@ public class SpellDaoImpl extends DaoBaseImpl implements SpellDao { try { tx = session.beginTransaction(); Criteria criteria = session.createCriteria(persistentClass); - criteria.add(Expression.eq("name", name)); + criteria.add(Restrictions.eq("name", name)); result = (Spell) criteria.uniqueResult(); result.getSpellbook().getWizards().size(); tx.commit(); diff --git a/service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDaoImpl.java b/service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDaoImpl.java index ba3de6ed2..a1b0ff36d 100644 --- a/service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDaoImpl.java +++ b/service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDaoImpl.java @@ -3,7 +3,7 @@ package com.iluwatar.spellbook; import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.criterion.Expression; +import org.hibernate.criterion.Restrictions; import com.iluwatar.common.DaoBaseImpl; @@ -22,7 +22,7 @@ public class SpellbookDaoImpl extends DaoBaseImpl implements Spellboo try { tx = session.beginTransaction(); Criteria criteria = session.createCriteria(persistentClass); - criteria.add(Expression.eq("name", name)); + criteria.add(Restrictions.eq("name", name)); result = (Spellbook) criteria.uniqueResult(); result.getSpells().size(); result.getWizards().size(); diff --git a/service-layer/src/main/java/com/iluwatar/wizard/WizardDaoImpl.java b/service-layer/src/main/java/com/iluwatar/wizard/WizardDaoImpl.java index c5cef69a5..d6029b0fc 100644 --- a/service-layer/src/main/java/com/iluwatar/wizard/WizardDaoImpl.java +++ b/service-layer/src/main/java/com/iluwatar/wizard/WizardDaoImpl.java @@ -3,7 +3,7 @@ package com.iluwatar.wizard; import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.criterion.Expression; +import org.hibernate.criterion.Restrictions; import com.iluwatar.common.DaoBaseImpl; import com.iluwatar.spellbook.Spellbook; @@ -23,7 +23,7 @@ public class WizardDaoImpl extends DaoBaseImpl implements WizardDao { try { tx = session.beginTransaction(); Criteria criteria = session.createCriteria(persistentClass); - criteria.add(Expression.eq("name", name)); + criteria.add(Restrictions.eq("name", name)); result = (Wizard) criteria.uniqueResult(); for (Spellbook s: result.getSpellbooks()) { s.getSpells().size();