handle nullable filter

vaadin · Dec 4, 2023 · f2f11f3 · f2f11f3
1 parent 2138c81
commit f2f11f3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/com/vaadin/demo/fusion/crud/ProductDtoCrudService.java b/src/main/java/com/vaadin/demo/fusion/crud/ProductDtoCrudService.java
@@ -25,7 +25,7 @@ public ProductDtoCrudService(ProductRepository productRepository, JpaFilterConve
     }
 
     @Override
-    public List<ProductDto> list(Pageable pageable, Filter filter) {
+    public List<ProductDto> list(Pageable pageable, @Nullable Filter filter) {
         // Basic list implementation that only covers pagination,
         // but not sorting or filtering
         Page<Product> products = productRepository.findAll(pageable);

diff --git a/src/main/java/com/vaadin/demo/fusion/crud/ProductDtoListService.java b/src/main/java/com/vaadin/demo/fusion/crud/ProductDtoListService.java
@@ -2,6 +2,7 @@
 
 import com.vaadin.flow.server.auth.AnonymousAllowed;
 import dev.hilla.BrowserCallable;
+import dev.hilla.Nullable;
 import dev.hilla.crud.JpaFilterConverter;
 import dev.hilla.crud.ListService;
 import dev.hilla.crud.filter.Filter;
@@ -24,9 +25,11 @@ public ProductDtoListService(ProductRepository productRepository, JpaFilterConve
     }
 
     @Override
-    public List<ProductDto> list(Pageable pageable, Filter filter) {
+    public List<ProductDto> list(Pageable pageable, @Nullable Filter filter) {
         // Use the Hilla JpaFilterConverter to create a JPA specification from the filter
-        Specification<Product> spec = jpaFilterConverter.toSpec(filter, Product.class);
+        Specification<Product> spec = filter != null
+                ? jpaFilterConverter.toSpec(filter, Product.class)
+                : Specification.anyOf();
         // Query the JPA repository
         Page<Product> products = productRepository.findAll(spec, pageable);
         // Map entities to DTOs and return result