Query: throw if filter is used with count().

Author: greenrobot-team

objectbox-java/src/main/java/io/objectbox/query/Query.java

@@ -157,17 +157,21 @@ public T call() {
     }
 
     private void ensureNoFilterNoComparator() {
+        ensureNoFilter();
+        ensureNoComparator();
+    }
+
+    private void ensureNoFilter() {
         if (filter != null) {
-            throw new UnsupportedOperationException("Does not yet work with a filter yet. " +
-                    "At this point, only find() and forEach() are supported with filters.");
+            throw new UnsupportedOperationException("Does not work with a filter. " +
+                    "Only find() and forEach() support filters.");
         }
-        ensureNoComparator();
     }
 
     private void ensureNoComparator() {
         if (comparator != null) {
-            throw new UnsupportedOperationException("Does not yet work with a sorting comparator yet. " +
-                    "At this point, only find() is supported with sorting comparators.");
+            throw new UnsupportedOperationException("Does not work with a sorting comparator. " +
+                    "Only find() supports sorting with a comparator.");
         }
     }
 
@@ -385,6 +389,7 @@ void resolveEagerRelation(@Nonnull T entity, EagerRelation eagerRelation) {
 
     /** Returns the count of Objects matching the query. */
     public long count() {
+        ensureNoFilter();
         return box.internalCallWithReaderHandle(new CallWithHandle<Long>() {
             @Override
             public Long call(long cursorHandle) {

tests/objectbox-java-test/src/test/java/io/objectbox/query/QueryFilterComparatorTest.java

@@ -67,6 +67,14 @@ public void comparator_find() {
         assertEquals("apple", entities.get(4).getSimpleString());
     }
 
+    @Test(expected = UnsupportedOperationException.class)
+    public void filter_count_unsupported() {
+        box.query()
+                .filter(createTestFilter())
+                .build()
+                .count();
+    }
+
     @Test(expected = UnsupportedOperationException.class)
     public void filter_findFirst_unsupported() {
         box.query()