1 files changed, 17 insertions, 9 deletions
diff --git a/src/main/java/nu/xss/jpa/dao/Dao.java b/src/main/java/nu/xss/jpa/dao/Dao.java
index 317e291..86444f4 100644
--- a/src/main/java/nu/xss/jpa/dao/Dao.java
+++ b/src/main/java/nu/xss/jpa/dao/Dao.java
@@ -2,20 +2,28 @@ package nu.xss.jpa.dao;
 
 import java.util.List;
 
+import nu.xss.jpa.query.Pagination;
+import nu.xss.jpa.query.Sort;
+import nu.xss.jpa.query.filter.Filter;
+
 public interface Dao<E, K> {
     void save(E entity);
     void merge(E entity);
     void delete(E entity);
+    
     E findById(K id);
+    
+    int count();
+    int count(Filter... filter);
+    
     List<E> findAll();
-    List<E> findAll(int count);
-    List<E> findAll(int count, int  offset);
+    List<E> findAll(Sort sort);
+    List<E> findAll(Pagination pagination);
+    List<E> findAll(Sort sort, Pagination pagination);
+
+    List<E> findAll(Filter... filter);
+    List<E> findAll(Sort sort, Filter... filter);
+    List<E> findAll(Pagination pagination, Filter... filter);
+    List<E> findAll(Sort sort, Pagination pagination, Filter... filter);
 
-    List<E> findAll(String sortColumn);
-    List<E> findAll(int count, String sortColumn);
-    List<E> findAll(int count, int  offset, String sortColumn);
-    
-    List<E> findAll(String sortColumn, boolean isAscending);
-    List<E> findAll(int count, String sortColumn, boolean isAscending);
-    List<E> findAll(int count, int  offset, String sortColumn, boolean isAscending);
 }