diff --git a/spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java b/spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java index ed620c15a..3d6c266b8 100755 --- a/spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java +++ b/spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java @@ -81,8 +81,10 @@ public class EnversRevisionRepositoryImpl entityInformation, - RevisionEntityInformation revisionEntityInformation, EntityManager entityManager) { + RevisionEntityInformation revisionEntityInformation, EntityManager entityManager) { + Assert.notNull(entityInformation, "JpaEntityInformation must not be null!"); + Assert.notNull(entityManager, "EntityManager must not be null!"); Assert.notNull(revisionEntityInformation, "RevisionEntityInformation must not be null!"); this.entityInformation = entityInformation; @@ -171,7 +173,7 @@ public class EnversRevisionRepositoryImpl orderMapped = (pageable.getSort()instanceof RevisionSort revisionSort) + List orderMapped = (pageable.getSort() instanceof RevisionSort revisionSort) ? List.of(mapRevisionSort(revisionSort)) : mapPropertySort(pageable.getSort()); @@ -190,7 +192,6 @@ public class EnversRevisionRepositoryImpl(singleResult))); } - return new PageImpl<>(revisions, pageable, count); }