From 33a3c8f5ae440ce0a142d262430a49f15648d658 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Thu, 21 Apr 2011 10:02:10 +0200 Subject: [PATCH] DATACMNS-33 - Adapted API changes for Repository.count(). Also changed return types for count() methods on JpaSpecificationExecutore and QueryDslPredicateExecutor. --- .../data/jpa/repository/JpaRepository.java | 3 +-- .../jpa/repository/JpaSpecificationExecutor.java | 2 +- .../jpa/repository/QueryDslPredicateExecutor.java | 2 +- .../repository/support/QueryDslJpaRepository.java | 2 +- .../repository/support/SimpleJpaRepository.java | 4 ++-- .../data/jpa/repository/UserRepositoryTests.java | 14 +++++++------- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java b/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java index fda8f6231..82cd65284 100644 --- a/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java +++ b/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java @@ -23,7 +23,6 @@ import javax.persistence.EntityManager; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import org.springframework.data.jpa.domain.Specification; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.Repository; import org.springframework.transaction.annotation.Transactional; @@ -96,7 +95,7 @@ public interface JpaRepository extends * * @see org.springframework.data.repository.Repository#count() */ - Long count(); + long count(); /* diff --git a/src/main/java/org/springframework/data/jpa/repository/JpaSpecificationExecutor.java b/src/main/java/org/springframework/data/jpa/repository/JpaSpecificationExecutor.java index 76a46736e..633c84f4e 100644 --- a/src/main/java/org/springframework/data/jpa/repository/JpaSpecificationExecutor.java +++ b/src/main/java/org/springframework/data/jpa/repository/JpaSpecificationExecutor.java @@ -78,5 +78,5 @@ public interface JpaSpecificationExecutor { * @param spec the {@link Specification} to count instances for * @return the number of instances */ - Long count(Specification spec); + long count(Specification spec); } diff --git a/src/main/java/org/springframework/data/jpa/repository/QueryDslPredicateExecutor.java b/src/main/java/org/springframework/data/jpa/repository/QueryDslPredicateExecutor.java index 3c2b9394b..7fd3d8294 100644 --- a/src/main/java/org/springframework/data/jpa/repository/QueryDslPredicateExecutor.java +++ b/src/main/java/org/springframework/data/jpa/repository/QueryDslPredicateExecutor.java @@ -77,5 +77,5 @@ public interface QueryDslPredicateExecutor { * @param predicate the {@link Predicate} to count instances for * @return the number of instances */ - Long count(Predicate predicate); + long count(Predicate predicate); } diff --git a/src/main/java/org/springframework/data/jpa/repository/support/QueryDslJpaRepository.java b/src/main/java/org/springframework/data/jpa/repository/support/QueryDslJpaRepository.java index 8ede79a12..25001695e 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/QueryDslJpaRepository.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/QueryDslJpaRepository.java @@ -146,7 +146,7 @@ public class QueryDslJpaRepository extends * @see org.springframework.data.jpa.repository.querydsl. * QueryDslSpecificationExecutor#count(com.mysema.query.types.Predicate) */ - public Long count(Predicate predicate) { + public long count(Predicate predicate) { return createQuery(predicate).count(); } diff --git a/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java b/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java index 62a971cca..f00a8292e 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java @@ -304,7 +304,7 @@ public class SimpleJpaRepository implements * * @see org.springframework.data.repository.Repository#count() */ - public Long count() { + public long count() { return em.createQuery(getCountQueryString(), Long.class) .getSingleResult(); @@ -318,7 +318,7 @@ public class SimpleJpaRepository implements * org.springframework.data.jpa.repository.JpaSpecificationExecutor#count * (org.springframework.data.jpa.domain.Specification) */ - public Long count(Specification spec) { + public long count(Specification spec) { return getCountQuery(spec).getSingleResult(); } diff --git a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java index f46886349..b72083d58 100644 --- a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java @@ -254,7 +254,7 @@ public class UserRepositoryTests { private void assertDeleteCallDoesNotDeleteAnything(List collection) { flushTestUsers(); - Long count = repository.count(); + long count = repository.count(); repository.delete(collection); assertEquals(count, repository.count()); @@ -267,9 +267,9 @@ public class UserRepositoryTests { flushTestUsers(); repository.renameAllUsersTo("newLastname"); - Integer expected = repository.count().intValue(); - assertThat(repository.findByLastname("newLastname").size(), - is(expected)); + long expected = repository.count(); + assertThat(repository.findByLastname("newLastname").size(), is(Long + .valueOf(expected).intValue())); } @@ -349,7 +349,7 @@ public class UserRepositoryTests { repository.deleteAll(); - assertEquals((Long) 0L, repository.count()); + assertEquals(0L, repository.count()); } @@ -415,13 +415,13 @@ public class UserRepositoryTests { @Test public void testCountsCorrectly() { - Long count = repository.count(); + long count = repository.count(); User user = new User(); user.setEmailAddress("gierke@synyx.de"); repository.save(user); - assertTrue(repository.count().equals(count + 1)); + assertTrue(repository.count() == count + 1); }