From f531ab6d53cd09f4ce0b7fdf8debc1ea433a40a8 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Fri, 11 Sep 2020 12:56:43 -0700
Subject: [PATCH] DATAGEODE-306 - Add overloaded
 safeDoOperation(:VoidReturningThrowableOperation, backupOperation:Runnable)
 method.

Redefine doSafeOperation(:VoidReturningThrowableOperation) in terms of the overloaded method.
---
 .../data/gemfire/util/SpringUtils.java        |  5 ++++
 .../gemfire/util/SpringUtilsUnitTests.java    | 30 +++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/SpringUtils.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/SpringUtils.java
index 8d84940a..39f511a5 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/SpringUtils.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/SpringUtils.java
@@ -323,12 +323,17 @@ public abstract class SpringUtils {
 	}
 
 	public static boolean safeDoOperation(VoidReturningThrowableOperation operation) {
+		return safeDoOperation(operation, () -> {});
+	}
+
+	public static boolean safeDoOperation(VoidReturningThrowableOperation operation, Runnable backupOperation) {
 
 		try {
 			operation.run();
 			return true;
 		}
 		catch (Throwable cause) {
+			backupOperation.run();
 			return false;
 		}
 	}
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/util/SpringUtilsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/util/SpringUtilsUnitTests.java
index 9819a11a..6fe21870 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/util/SpringUtilsUnitTests.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/util/SpringUtilsUnitTests.java
@@ -26,6 +26,8 @@ import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 import static org.springframework.data.gemfire.util.ArrayUtils.asArray;
 import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalStateException;
@@ -59,12 +61,12 @@ import org.springframework.data.gemfire.util.SpringUtils.ValueReturningThrowable
  *
  * @author John Blum
  * @see java.util.function.Function
- * @see java.util.function.Supplier
  * @see org.junit.Test
- * @see org.junit.runner.RunWith
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
  * @see org.mockito.junit.MockitoJUnitRunner
+ * @see org.springframework.beans.factory.BeanFactory
+ * @see org.springframework.beans.factory.config.BeanDefinition
  * @see org.springframework.data.gemfire.util.SpringUtils
  * @since 1.9.0
  */
@@ -448,6 +450,30 @@ public class SpringUtilsUnitTests {
 		assertThat(SpringUtils.safeDoOperation(() -> { throw new RuntimeException("TEST"); })).isFalse();
 	}
 
+	@Test
+	public void safeDoOperationWithNonThrowingOperationAndBackupOperation() {
+
+		AtomicReference<Object> operationValue = new AtomicReference<>();
+
+		Runnable mockRunnable = mock(Runnable.class);
+
+		assertThat(SpringUtils.safeDoOperation(() -> operationValue.set("MOCK"), mockRunnable)).isTrue();
+		assertThat(operationValue.get()).isEqualTo("MOCK");
+
+		verifyNoInteractions(mockRunnable);
+	}
+
+	@Test
+	public void safeDoOperationWithThrowingOperationAndBackupOperation() {
+
+		Runnable mockRunnable = mock(Runnable.class);
+
+		assertThat(SpringUtils.safeDoOperation(() -> { throw new RuntimeException("TEST"); }, mockRunnable)).isFalse();
+
+		verify(mockRunnable, times(1)).run();
+		verifyNoMoreInteractions(mockRunnable);
+	}
+
 	@Test
 	public void safeGetValueReturnsSuppliedValue() {
 		assertThat(SpringUtils.safeGetValue(() -> "test")).isEqualTo("test");