Move to Spring Boot 4

Author: reda-alaoui

core/src/main/java/com/cosium/spring/data/jpa/entity/graph/repository/EntityGraphCrudRepository.java

@@ -12,20 +12,20 @@
  */
 @NoRepositoryBean
 public interface EntityGraphCrudRepository<T, ID>
-    extends CrudRepository<T, ID>, EntityGraphRepository<T, ID> {
+    extends EntityGraphRepository<T, ID>, CrudRepository<T, ID> {
 
   /**
    * @see CrudRepository#findById(Object)
    */
   Optional<T> findById(ID id, EntityGraph entityGraph);
 
   /**
-   * @see CrudRepository#findAllById(Iterable)
+   * @see CrudRepository#findAll()
    */
-  Iterable<T> findAllById(Iterable<ID> ids, EntityGraph entityGraph);
+  Iterable<T> findAll(EntityGraph entityGraph);
 
   /**
-   * @see CrudRepository#findAll()
+   * @see CrudRepository#findAllById(Iterable)
    */
-  Iterable<T> findAll(EntityGraph entityGraph);
+  Iterable<T> findAllById(Iterable<ID> ids, EntityGraph entityGraph);
 }

core/src/main/java/com/cosium/spring/data/jpa/entity/graph/repository/EntityGraphJpaRepository.java

@@ -1,5 +1,9 @@
 package com.cosium.spring.data.jpa.entity.graph.repository;
 
+import com.cosium.spring.data.jpa.entity.graph.domain2.EntityGraph;
+import java.util.List;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.NoRepositoryBean;
 
@@ -10,6 +14,20 @@
  */
 @NoRepositoryBean
 public interface EntityGraphJpaRepository<T, ID>
-    extends JpaRepository<T, ID>,
-        EntityGraphPagingAndSortingRepository<T, ID>,
-        EntityGraphQueryByExampleExecutor<T> {}
+    extends EntityGraphListCrudRepository<T, ID>,
+        EntityGraphListPagingAndSortingRepository<T, ID>,
+        EntityGraphQueryByExampleExecutor<T>,
+        JpaRepository<T, ID> {
+
+  /**
+   * @see JpaRepository#findAll(Example)
+   */
+  @Override
+  <S extends T> List<S> findAll(Example<S> example, EntityGraph entityGraph);
+
+  /**
+   * @see JpaRepository#findAll(Example, Sort)
+   */
+  @Override
+  <S extends T> List<S> findAll(Example<S> example, Sort sort, EntityGraph entityGraph);
+}

core/src/main/java/com/cosium/spring/data/jpa/entity/graph/repository/EntityGraphJpaSpecificationExecutor.java

@@ -33,6 +33,15 @@ public interface EntityGraphJpaSpecificationExecutor<T> extends JpaSpecification
    */
   Page<T> findAll(Specification<T> spec, Pageable pageable, EntityGraph entityGraph);
 
+  /**
+   * @see JpaSpecificationExecutor#findAll(Specification, Specification, Pageable)
+   */
+  Page<T> findAll(
+      Specification<T> spec,
+      Specification<T> countSpec,
+      Pageable pageable,
+      EntityGraph entityGraph);
+
   /**
    * @see JpaSpecificationExecutor#findAll(Specification, Sort)
    */

core/src/main/java/com/cosium/spring/data/jpa/entity/graph/repository/EntityGraphListCrudRepository.java

@@ -0,0 +1,26 @@
+package com.cosium.spring.data.jpa.entity.graph.repository;
+
+import com.cosium.spring.data.jpa.entity.graph.domain2.EntityGraph;
+import java.util.List;
+import org.springframework.data.repository.ListCrudRepository;
+import org.springframework.data.repository.NoRepositoryBean;
+
+/**
+ * @author Réda Housni Alaoui
+ */
+@NoRepositoryBean
+public interface EntityGraphListCrudRepository<T, ID>
+    extends EntityGraphCrudRepository<T, ID>, ListCrudRepository<T, ID> {
+
+  /**
+   * @see ListCrudRepository#findAll()
+   */
+  @Override
+  List<T> findAll(EntityGraph entityGraph);
+
+  /**
+   * @see ListCrudRepository#findAllById(Iterable)
+   */
+  @Override
+  List<T> findAllById(Iterable<ID> ids, EntityGraph entityGraph);
+}

core/src/main/java/com/cosium/spring/data/jpa/entity/graph/repository/EntityGraphListPagingAndSortingRepository.java

@@ -0,0 +1,20 @@
+package com.cosium.spring.data.jpa.entity.graph.repository;
+
+import com.cosium.spring.data.jpa.entity.graph.domain2.EntityGraph;
+import java.util.List;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.repository.ListPagingAndSortingRepository;
+import org.springframework.data.repository.NoRepositoryBean;
+
+/**
+ * @author Réda Housni Alaoui
+ */
+@NoRepositoryBean
+public interface EntityGraphListPagingAndSortingRepository<T, ID>
+    extends EntityGraphPagingAndSortingRepository<T, ID>, ListPagingAndSortingRepository<T, ID> {
+
+  /**
+   * @see ListPagingAndSortingRepository#findAll(Sort)
+   */
+  List<T> findAll(Sort sort, EntityGraph entityGraph);
+}

core/src/main/java/com/cosium/spring/data/jpa/entity/graph/repository/EntityGraphPagingAndSortingRepository.java

@@ -14,15 +14,15 @@
  */
 @NoRepositoryBean
 public interface EntityGraphPagingAndSortingRepository<T, ID>
-    extends PagingAndSortingRepository<T, ID>, EntityGraphCrudRepository<T, ID> {
+    extends PagingAndSortingRepository<T, ID>, EntityGraphRepository<T, ID> {
 
   /**
-   * @see PagingAndSortingRepository#findAll(Pageable)
+   * @see PagingAndSortingRepository#findAll(Sort)
    */
-  Page<T> findAll(Pageable pageable, EntityGraph entityGraph);
+  Iterable<T> findAll(Sort sort, EntityGraph entityGraph);
 
   /**
-   * @see PagingAndSortingRepository#findAll(Sort)
+   * @see PagingAndSortingRepository#findAll(Pageable)
    */
-  Iterable<T> findAll(Sort sort, EntityGraph entityGraph);
+  Page<T> findAll(Pageable pageable, EntityGraph entityGraph);
 }

core/src/main/java/com/cosium/spring/data/jpa/entity/graph/repository/EntityGraphQueryByExampleExecutor.java

@@ -1,7 +1,6 @@
 package com.cosium.spring.data.jpa.entity.graph.repository;
 
 import com.cosium.spring.data.jpa.entity.graph.domain2.EntityGraph;
-import java.util.List;
 import java.util.Optional;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Page;
@@ -19,22 +18,22 @@
 public interface EntityGraphQueryByExampleExecutor<T> extends QueryByExampleExecutor<T> {
 
   /**
-   * @see QueryByExampleExecutor#findAll(Example, Pageable)
+   * @see QueryByExampleExecutor#findOne(Example)
    */
-  <S extends T> Page<S> findAll(Example<S> example, Pageable pageable, EntityGraph entityGraph);
+  <S extends T> Optional<S> findOne(Example<S> example, EntityGraph entityGraph);
 
   /**
-   * @see QueryByExampleExecutor#findOne(Example)
+   * @see QueryByExampleExecutor#findAll(Example)
    */
-  <S extends T> Optional<S> findOne(Example<S> example, EntityGraph entityGraph);
+  <S extends T> Iterable<S> findAll(Example<S> example, EntityGraph entityGraph);
 
   /**
    * @see QueryByExampleExecutor#findAll(Example, Sort)
    */
-  <S extends T> List<S> findAll(Example<S> example, Sort sort, EntityGraph entityGraph);
+  <S extends T> Iterable<S> findAll(Example<S> example, Sort sort, EntityGraph entityGraph);
 
   /**
-   * @see QueryByExampleExecutor#findAll(Example)
+   * @see QueryByExampleExecutor#findAll(Example, Pageable)
    */
-  <S extends T> List<S> findAll(Example<S> example, EntityGraph entityGraph);
+  <S extends T> Page<S> findAll(Example<S> example, Pageable pageable, EntityGraph entityGraph);
 }

core/src/main/java/com/cosium/spring/data/jpa/entity/graph/repository/EntityGraphQuerydslPredicateExecutor.java

@@ -19,69 +19,32 @@
 public interface EntityGraphQuerydslPredicateExecutor<T> extends QuerydslPredicateExecutor<T> {
 
   /**
-   * Returns a single entity matching the given {@link Predicate} or {@literal null} if none was
-   * found.
-   *
-   * @param predicate can be {@literal null}.
-   * @param entityGraph can be {@literal null}.
-   * @return a single entity matching the given {@link Predicate} or {@literal null} if none was
-   *     found.
-   * @throws org.springframework.dao.IncorrectResultSizeDataAccessException if the predicate yields
-   *     more than one result.
+   * @see QuerydslPredicateExecutor#findOne(Predicate)
    */
   Optional<T> findOne(Predicate predicate, EntityGraph entityGraph);
 
   /**
-   * Returns all entities matching the given {@link Predicate}. In case no match could be found an
-   * empty {@link Iterable} is returned.
-   *
-   * @param predicate can be {@literal null}.
-   * @param entityGraph can be {@literal null}.
-   * @return all entities matching the given {@link Predicate}.
+   * @see QuerydslPredicateExecutor#findAll(Predicate)
    */
   Iterable<T> findAll(Predicate predicate, EntityGraph entityGraph);
 
   /**
-   * Returns all entities matching the given {@link Predicate} applying the given {@link Sort}. In
-   * case no match could be found an empty {@link Iterable} is returned.
-   *
-   * @param predicate can be {@literal null}.
-   * @param sort the {@link Sort} specification to sort the results by, must not be {@literal null}.
-   * @param entityGraph can be {@literal null}.
-   * @return all entities matching the given {@link Predicate}.
-   * @since 1.10
+   * @see QuerydslPredicateExecutor#findAll(Predicate, Sort)
    */
   Iterable<T> findAll(Predicate predicate, Sort sort, EntityGraph entityGraph);
 
   /**
-   * Returns all entities matching the given {@link Predicate} applying the given {@link
-   * OrderSpecifier}s. In case no match could be found an empty {@link Iterable} is returned.
-   *
-   * @param predicate can be {@literal null}.
-   * @param entityGraph can be {@literal null}.
-   * @param orders the {@link OrderSpecifier}s to sort the results by
-   * @return all entities matching the given {@link Predicate} applying the given {@link
-   *     OrderSpecifier}s.
+   * @see QuerydslPredicateExecutor#findAll(Predicate, OrderSpecifier[])
    */
   Iterable<T> findAll(Predicate predicate, EntityGraph entityGraph, OrderSpecifier<?>... orders);
 
   /**
-   * Returns all entities ordered by the given {@link OrderSpecifier}s.
-   *
-   * @param orders the {@link OrderSpecifier}s to sort the results by.
-   * @param entityGraph can be {@literal null}.
-   * @return all entities ordered by the given {@link OrderSpecifier}s.
+   * @see QuerydslPredicateExecutor#findAll(OrderSpecifier[])
    */
   Iterable<T> findAll(EntityGraph entityGraph, OrderSpecifier<?>... orders);
 
   /**
-   * Returns a {@link Page} of entities matching the given {@link Predicate}. In case no match could
-   * be found, an empty {@link Page} is returned.
-   *
-   * @param predicate can be {@literal null}.
-   * @param pageable can be {@literal null}.
-   * @param entityGraph can be {@literal null}.
-   * @return a {@link Page} of entities matching the given {@link Predicate}.
+   * @see QuerydslPredicateExecutor#findAll(Predicate, Pageable)
    */
   Page<T> findAll(Predicate predicate, Pageable pageable, EntityGraph entityGraph);
 }

core/src/main/java/com/cosium/spring/data/jpa/entity/graph/repository/support/EntityGraphSimpleJpaRepository.java

@@ -48,6 +48,15 @@ public Page<T> findAll(Specification<T> spec, Pageable pageable, EntityGraph ent
     return findAll(spec, pageable);
   }
 
+  @Override
+  public Page<T> findAll(
+      Specification<T> spec,
+      Specification<T> countSpec,
+      Pageable pageable,
+      EntityGraph entityGraph) {
+    return findAll(spec, countSpec, pageable);
+  }
+
   @Override
   public List<T> findAll(Specification<T> spec, Sort sort, EntityGraph entityGraph) {
     return findAll(spec, sort);
@@ -90,12 +99,12 @@ public List<T> findAllById(Iterable<ID> ids, EntityGraph entityGraph) {
   }
 
   @Override
-  public Iterable<T> findAll(Sort sort, EntityGraph entityGraph) {
+  public List<T> findAll(Sort sort, EntityGraph entityGraph) {
     return findAll(sort);
   }
 
   @Override
-  public Iterable<T> findAll(EntityGraph entityGraph) {
+  public List<T> findAll(EntityGraph entityGraph) {
     return findAll();
   }
 }

core/src/test/java/com/cosium/spring/data/jpa/entity/graph/repository/EntityGraphJpaRepositoryTest.java

@@ -355,7 +355,7 @@ public interface ProductRepository
 
     @org.springframework.data.jpa.repository.EntityGraph(attributePaths = "brand")
     @Override
-    Iterable<Product> findAll(EntityGraph entityGraph);
+    List<Product> findAll(EntityGraph entityGraph);
 
     @org.springframework.data.jpa.repository.EntityGraph(attributePaths = "brand")
     List<Product> findByName(String name, EntityGraph entityGraph);