From db8aebe4d7633c4cf5b1ef7efd2d57c456495cbd Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 12 Oct 2011 11:36:33 +0200 Subject: [PATCH] DATAJPA-111 - Removed unnecessary em.clear() from mass delete methods. --- .../data/jpa/repository/support/SimpleJpaRepository.java | 2 -- .../data/jpa/repository/UserRepositoryTests.java | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) 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 c73dabef3..82b761d48 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 @@ -159,7 +159,6 @@ public class SimpleJpaRepository implements JpaRepos applyAndBind(getQueryString(DELETE_ALL_QUERY_STRING, entityInformation.getEntityName()), entities, em) .executeUpdate(); - em.clear(); } /* @@ -171,7 +170,6 @@ public class SimpleJpaRepository implements JpaRepos public void deleteAll() { em.createQuery(getDeleteAllQueryString()).executeUpdate(); - em.clear(); } /* 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 8ce15d0b9..8549fa2d1 100644 --- a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java @@ -184,16 +184,14 @@ public class UserRepositoryTests { assertNull(repository.findOne(firstUser.getId())); } - /** - * Tests deleting a user. - */ @Test public void testDelete() { flushTestUsers(); repository.delete(firstUser); - assertNull(repository.findOne(id)); + assertThat(repository.exists(id), is(false)); + assertThat(repository.findOne(id), is(nullValue())); } @Test @@ -330,7 +328,7 @@ public class UserRepositoryTests { repository.deleteAll(); - assertEquals(0L, repository.count()); + assertThat(repository.count(), is(0L)); } /**