Revert "Add count()"

This reverts commit c16124f.
vaadin · Jan 13, 2025 · ce450df · ce450df
1 parent c16124f
commit ce450df
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/data/CountService.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/data/CountService.java
@@ -1,6 +1,5 @@
 package com.vaadin.flow.spring.data;
 
-import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
 import com.vaadin.flow.spring.data.filter.Filter;
@@ -10,22 +9,14 @@
  */
 public interface CountService {
 
-    /**
-     * Counts the number of items.
-     *
-     * @return
-     *           the number of items in the service
-     */
-    public long count();
-
     /**
      * Counts the number of items that match the given filter.
      *
      * @param filter
-     *            the filter, never {@code null}
+     *            the filter, or {@code null} to use no filter
      * @return
      *           the number of items in the service that match the filter
      */
-    public long count(Filter filter);
+    public long count(@Nullable Filter filter);
 
 }
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/data/jpa/ListRepositoryService.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/data/jpa/ListRepositoryService.java
@@ -75,13 +75,15 @@ public boolean exists(ID id) {
         return getRepository().existsById(id);
     }
 
+    /**
+     * Counts the number of entities that match the given filter.
+     *
+     * @param filter
+     *            the filter, or {@code null} to use no filter
+     * @return
+     */
     @Override
-    public long count() {
-        return getRepository().count();
-    }
-
-    @Override
-    public long count(Filter filter) {
+    public long count(@Nullable Filter filter) {
         return getRepository().count(toSpec(filter));
     }
 

diff --git a/vaadin-spring/src/test/java/com/vaadin/flow/spring/data/jpa/TestCrudRepositoryService.java b/vaadin-spring/src/test/java/com/vaadin/flow/spring/data/jpa/TestCrudRepositoryService.java
@@ -2,6 +2,8 @@
 
 import org.springframework.stereotype.Service;
 
+import com.vaadin.flow.spring.data.jpa.CrudRepositoryService;
+
 @Service
 public class TestCrudRepositoryService
         extends CrudRepositoryService<TestObject, Integer, TestRepository> {