From c0cd73dc1e7de99e153012b2a2f4a39f5e83e4a3 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Mon, 16 May 2022 14:30:55 -0700
Subject: [PATCH] Adapt to API changes in Spring Data for Apache Geode (SDG)
 3.0.

---
 .../annotation/DependencyOfBeanFactoryPostProcessor.java    | 2 +-
 .../ForkingClientServerIntegrationTestsSupport.java         | 6 +++---
 .../data/gemfire/tests/util/SpringUtils.java                | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/extensions/spring/context/annotation/DependencyOfBeanFactoryPostProcessor.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/extensions/spring/context/annotation/DependencyOfBeanFactoryPostProcessor.java
index 0e0a1c4..ac82fc7 100644
--- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/extensions/spring/context/annotation/DependencyOfBeanFactoryPostProcessor.java
+++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/extensions/spring/context/annotation/DependencyOfBeanFactoryPostProcessor.java
@@ -26,8 +26,8 @@ import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.data.gemfire.tests.util.SpringUtils;
 import org.springframework.data.gemfire.util.ArrayUtils;
-import org.springframework.data.gemfire.util.SpringUtils;
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 
diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java
index 202a8f8..edff237 100644
--- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java
+++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java
@@ -45,8 +45,8 @@ import org.springframework.data.gemfire.config.annotation.EnablePdx;
 import org.springframework.data.gemfire.tests.integration.config.ClientServerIntegrationTestsConfiguration;
 import org.springframework.data.gemfire.tests.process.JavaProcessRunner;
 import org.springframework.data.gemfire.tests.process.ProcessWrapper;
+import org.springframework.data.gemfire.tests.util.SpringUtils;
 import org.springframework.data.gemfire.util.ArrayUtils;
-import org.springframework.data.gemfire.util.SpringUtils;
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 
@@ -241,13 +241,13 @@ public abstract class ForkingClientServerIntegrationTestsSupport extends ClientS
 	}
 
 	@EnablePdx
-	@ClientCacheApplication(logLevel = GEMFIRE_LOG_LEVEL)
+	@ClientCacheApplication
 	public static class BaseGemFireClientConfiguration extends ClientServerIntegrationTestsConfiguration {
 
 	}
 
 	@EnablePdx
-	@CacheServerApplication(name = "ForkingClientServerIntegrationTestsSupport", logLevel = GEMFIRE_LOG_LEVEL)
+	@CacheServerApplication(name = "ForkingClientServerIntegrationTestsSupport")
 	public static class BaseGemFireServerConfiguration extends ClientServerIntegrationTestsConfiguration {
 
 		public static void main(String[] args) {
diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/SpringUtils.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/SpringUtils.java
index 8b2fa82..c620a97 100644
--- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/SpringUtils.java
+++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/SpringUtils.java
@@ -29,11 +29,11 @@ import org.springframework.lang.Nullable;
  * @see java.util.function.Function
  * @see org.springframework.context.ApplicationContext
  * @see org.springframework.context.ConfigurableApplicationContext
- * @see org.springframework.data.gemfire.util.SpringUtils
+ * @see org.springframework.data.gemfire.util.SpringExtensions
  * @since 1.0.0
  */
 @SuppressWarnings("unused")
-public abstract class SpringUtils extends org.springframework.data.gemfire.util.SpringUtils {
+public abstract class SpringUtils extends org.springframework.data.gemfire.util.SpringExtensions {
 
 	public static final Function<ConfigurableApplicationContext, Boolean> APPLICATION_CONTEXT_CLOSING_FUNCTION =
 		applicationContext -> {