From eae2022bfa58c7c5412467d0c5bb2fd24dd67404 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Fri, 15 Dec 2017 22:41:47 -0800
Subject: [PATCH] Fix Region.getEntry() for a given key by returning null if
 the Optional is empty.

---
 .../data/gemfire/tests/mock/MockGemFireObjectsSupport.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/springframework/data/gemfire/tests/mock/MockGemFireObjectsSupport.java b/src/main/java/org/springframework/data/gemfire/tests/mock/MockGemFireObjectsSupport.java
index 7d77426..7949186 100644
--- a/src/main/java/org/springframework/data/gemfire/tests/mock/MockGemFireObjectsSupport.java
+++ b/src/main/java/org/springframework/data/gemfire/tests/mock/MockGemFireObjectsSupport.java
@@ -1413,7 +1413,8 @@ public abstract class MockGemFireObjectsSupport extends MockObjectsSupport {
 			data.get(invocation.<K>getArgument(0)));
 
 		when(mockRegion.getEntry(ArgumentMatchers.<K>any())).thenAnswer(invocation ->
-			data.entrySet().stream().filter(entry -> entry.getKey().equals(invocation.getArgument(0))).findFirst());
+			data.entrySet().stream().filter(entry -> entry.getKey().equals(invocation.getArgument(0))).findFirst()
+				.orElse(null));
 
 		when(mockRegion.put(any(), any())).thenAnswer(invocation ->
 			data.put(invocation.getArgument(0), invocation.getArgument(1)));