diff --git a/ass1-jpa/src/main/java/dst/ass1/jpa/dao/impl/GenericDAO.java b/ass1-jpa/src/main/java/dst/ass1/jpa/dao/impl/GenericDAO.java index 7ea4434..c339143 100644 --- a/ass1-jpa/src/main/java/dst/ass1/jpa/dao/impl/GenericDAO.java +++ b/ass1-jpa/src/main/java/dst/ass1/jpa/dao/impl/GenericDAO.java @@ -7,22 +7,22 @@ import java.util.List; public class GenericDAO implements dst.ass1.jpa.dao.GenericDAO { private final EntityManager entityManager; - private final Class aClass; + private final Class type; - public GenericDAO(EntityManager entityManager, Class aClass) { + public GenericDAO(EntityManager entityManager, Class type) { this.entityManager = entityManager; - this.aClass = aClass; + this.type = type; } @Override public T findById(Long id) { - return (T) entityManager.find(aClass, id); + return (T) entityManager.find(type, id); } @Override public List findAll() { - CriteriaQuery criteriaQuery = entityManager.getCriteriaBuilder().createQuery(aClass); - Root root = criteriaQuery.from(aClass); + CriteriaQuery criteriaQuery = entityManager.getCriteriaBuilder().createQuery(type); + Root root = criteriaQuery.from(type); criteriaQuery.select(root); return entityManager.createQuery(criteriaQuery).getResultList();