From 44b839ff88bd457412ab2885dcad7df06ee51f81 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Tue, 21 May 2019 10:37:27 +0200
Subject: [PATCH] DATAJPA-1535 - Polishing.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use isNew(…) check in delete(T) instead of just relying on Id nullability. Formatting.

Original pull request: #378.
---
 .../data/jpa/repository/support/SimpleJpaRepository.java   | 6 ++----
 .../EclipseLinkNamespaceUserRepositoryTests.java           | 7 ++++---
 .../data/jpa/repository/UserRepositoryTests.java           | 5 +++--
 .../repository/support/SimpleJpaRepositoryUnitTests.java   | 2 +-
 4 files changed, 10 insertions(+), 10 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 e330f037c..93bf0dd6f 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
@@ -169,13 +169,11 @@ public class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
 
 		Assert.notNull(entity, "The entity must not be null!");
 
-		Object id = entityInformation.getId(entity);
-		if (id == null) {
+		if (entityInformation.isNew(entity)) {
 			return;
 		}
 
-		T existing = em.find(entityInformation.getJavaType(), id);
-
+		T existing = em.find(entityInformation.getJavaType(), entityInformation.getId(entity));
 		// if the entity to be deleted doesn't exist, delete is a NOOP
 		if (existing == null) {
 			return;
diff --git a/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java
index c77048f50..074ff3427 100644
--- a/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java
@@ -174,12 +174,13 @@ public class EclipseLinkNamespaceUserRepositoryTests extends NamespaceUserReposi
 		super.findByEmptyCollectionOfStrings();
 	}
 
+	/**
+	 * Ignores the test for EclipseLink.
+	 */
 	@Override
 	@Test
 	@Ignore
-	public void savingUserThrowsAnException() {
-		super.savingUserThrowsAnException();
-	}
+	public void savingUserThrowsAnException() {}
 
 	private void assumeNotEclipseLink2_7_2plus() {
 
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 2b56b0605..7ac95f204 100644
--- a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java
@@ -2211,9 +2211,10 @@ public class UserRepositoryTests {
 		assertThat(repository.findByEmailNativeAddressJdbcStyleParameter("gierke@synyx.de")).isEqualTo(firstUser);
 	}
 
-	@Test() // DATAJPA-1535
+	@Test // DATAJPA-1535
 	public void savingUserThrowsAnException() {
-		// if this test fails this means deleteNewInstanceSucceedsByDoingNothing() might actually save the user without the test failing, which would be a bad thing.
+		// if this test fails this means deleteNewInstanceSucceedsByDoingNothing() might actually save the user without the
+		// test failing, which would be a bad thing.
 		assertThatThrownBy(() -> repository.save(new User())).isInstanceOf(DataIntegrityViolationException.class);
 	}
 
diff --git a/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java
index 32167b669..5c6dbcc88 100644
--- a/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java
@@ -171,7 +171,7 @@ public class SimpleJpaRepositoryUnitTests {
 	}
 
 	@Test // DATAJPA-1535
-	public void doNothingWhenNonExistantInstanceGetsDeleted() {
+	public void doNothingWhenNonExistentInstanceGetsDeleted() {
 
 		User newUser = new User();
 		newUser.setId(23);