diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/dao/AbstractCRUDDAO.java b/wizard-server/src/main/java/org/cobbzilla/wizard/dao/AbstractCRUDDAO.java index 973a9d4..0e2fc36 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/dao/AbstractCRUDDAO.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/dao/AbstractCRUDDAO.java @@ -66,6 +66,9 @@ public abstract class AbstractCRUDDAO @Transactional(readOnly=true) @Override public List findAll() { return list(criteria()); } + @Transactional(readOnly=true) + @Override @NonNull public List findAll(@NonNull final Order order) { return list(criteria().addOrder(order)); } + @Transactional(readOnly=true) @Override public E findByUuid(String uuid) { return findByUniqueField(Identifiable.UUID, uuid); } diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/dao/DAO.java b/wizard-server/src/main/java/org/cobbzilla/wizard/dao/DAO.java index 86d35d8..70b82d5 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/dao/DAO.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/dao/DAO.java @@ -1,5 +1,6 @@ package org.cobbzilla.wizard.dao; +import lombok.NonNull; import org.cobbzilla.wizard.model.Identifiable; import org.cobbzilla.wizard.model.search.SearchQuery; import org.hibernate.criterion.Order; @@ -21,6 +22,8 @@ public interface DAO { E get(Serializable id); List findAll(); + @NonNull List findAll(@NonNull final Order order); + default Integer countAll() { return findAll().size(); } E findByUuid(String uuid); E findByUniqueField(String field, Object value);