Author: bleny Date: 2013-04-18 17:50:52 +0200 (Thu, 18 Apr 2013) New Revision: 118 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: use dao protected helper in dao impl Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedListJpaDao.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedListJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedListJpaDao.java 2013-04-18 15:32:38 UTC (rev 117) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedListJpaDao.java 2013-04-18 15:50:52 UTC (rev 118) @@ -5,11 +5,9 @@ import com.franciaflex.magalie.persistence.entity.DeliveredRequestedListStatus; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.RequestedList; -import com.google.common.collect.Iterables; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; -import java.util.List; public class DeliveredRequestedListJpaDao extends AbstractJpaDao<DeliveredRequestedList> implements DeliveredRequestedListDao { @@ -25,38 +23,26 @@ @Override public DeliveredRequestedList findByAffectedTo(MagalieUser affectedTo) { - TypedQuery<DeliveredRequestedList> query = - entityManager.createQuery( - "from DeliveredRequestedList drl where drl.status = :affected and drl.affectedTo = :affectedTo", - getEntityClass()); + TypedQuery<DeliveredRequestedList> query = createQuery( + "from DeliveredRequestedList drl where drl.status = :affected and drl.affectedTo = :affectedTo"); query.setParameter("affectedTo", affectedTo); query.setParameter("affected", DeliveredRequestedListStatus.AFFECTED); - List<DeliveredRequestedList> resultList = query.getResultList(); + return findUniqueOrNull(query); - DeliveredRequestedList onlyElement = Iterables.getOnlyElement(resultList, null); - - return onlyElement; - } @Override public DeliveredRequestedList findByRequestedList(RequestedList requestedList) { - TypedQuery<DeliveredRequestedList> query = - entityManager.createQuery( - "from DeliveredRequestedList drl where drl.requestedList = :requestedList", - getEntityClass()); + TypedQuery<DeliveredRequestedList> query = createQuery( + "from DeliveredRequestedList drl where drl.requestedList = :requestedList"); query.setParameter("requestedList", requestedList); - List<DeliveredRequestedList> resultList = query.getResultList(); + return findUniqueOrNull(query); - DeliveredRequestedList onlyElement = Iterables.getOnlyElement(resultList, null); - - return onlyElement; - } }