From 512e9eacadb56bc7199c59781c0ae797eb481f45 Mon Sep 17 00:00:00 2001
From: Michael Wirth <michael.wirth@mimacom.com>
Date: Sat, 24 Jun 2017 01:08:38 +0200
Subject: [PATCH] =?UTF-8?q?DATAES-363=20-=20Fixed=20CrudRepository.existsB?=
 =?UTF-8?q?yId(=E2=80=A6)=20implementation.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Properly use Optional.isPresent() over a null check.

Original pull request: #183.
---
 .../support/AbstractElasticsearchRepository.java    |  3 ++-
 .../support/SimpleElasticsearchRepositoryTests.java | 13 +++++++++++++
 .../support/UUIDElasticsearchRepositoryTests.java   | 13 +++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/support/AbstractElasticsearchRepository.java b/src/main/java/org/springframework/data/elasticsearch/repository/support/AbstractElasticsearchRepository.java
index 065d85f8e..92d0ae0c5 100644
--- a/src/main/java/org/springframework/data/elasticsearch/repository/support/AbstractElasticsearchRepository.java
+++ b/src/main/java/org/springframework/data/elasticsearch/repository/support/AbstractElasticsearchRepository.java
@@ -55,6 +55,7 @@ import org.springframework.util.Assert;
  * @author Kevin Leturc
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Michael Wirth
  */
 public abstract class AbstractElasticsearchRepository<T, ID extends Serializable>
 		implements ElasticsearchRepository<T, ID> {
@@ -188,7 +189,7 @@ public abstract class AbstractElasticsearchRepository<T, ID extends Serializable
 
 	@Override
 	public boolean existsById(ID id) {
-		return findById(id) != null;
+		return findById(id).isPresent();
 	}
 
 	@Override
diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java
index 4d131518f..9be7f9b26 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java
@@ -47,6 +47,7 @@ import static org.springframework.data.domain.Sort.Direction.*;
  * @author Mohsin Husen
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Michael Wirth
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("classpath:/simple-repository-test.xml")
@@ -274,6 +275,18 @@ public class SimpleElasticsearchRepositoryTests {
 		assertEquals(exist, true);
 	}
 
+	@Test // DATAES-363
+	public void shouldReturnFalseGivenDocumentWithIdDoesNotExist() {
+		// given
+		String documentId = randomNumeric(5);
+
+		// when
+		boolean exist = repository.existsById(documentId);
+
+		// then
+		assertEquals(exist, false);
+	}
+
 	@Test
 	public void shouldReturnResultsForGivenSearchQuery() {
 		// given
diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/UUIDElasticsearchRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/UUIDElasticsearchRepositoryTests.java
index 02fc6e95e..8e3a3f2b1 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repository/support/UUIDElasticsearchRepositoryTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/UUIDElasticsearchRepositoryTests.java
@@ -45,6 +45,7 @@ import static org.junit.Assert.*;
  * @author Mohsin Husen
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Michael Wirth
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("classpath:/simple-repository-test.xml")
@@ -262,6 +263,18 @@ public class UUIDElasticsearchRepositoryTests {
 		assertEquals(exist, true);
 	}
 
+	@Test // DATAES-363
+	public void shouldReturnFalseGivenDocumentWithIdDoesNotExist() {
+		// given
+		UUID documentId = UUID.randomUUID();
+
+		// when
+		boolean exist = repository.existsById(documentId);
+
+		// then
+		assertEquals(exist, false);
+	}
+
 	@Test
 	public void shouldDeleteAll() {
 		// when