From a6f515546fda7270e23871bd2e3e22d9a7cffb14 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Fri, 23 Sep 2022 11:07:36 -0700
Subject: [PATCH] Adapt to API changes in Spring Data for Apache Geode (SDG).

---
 .../annotation/DependencyOfBeanFactoryPostProcessor.java  | 5 ++---
 .../ForkingClientServerIntegrationTestsSupport.java       | 8 +++-----
 .../data/gemfire/tests/util/SpringUtils.java              | 4 ++--
 3 files changed, 7 insertions(+), 10 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..fd39fa3 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
@@ -18,18 +18,17 @@ package org.springframework.data.gemfire.tests.extensions.spring.context.annotat
 import java.lang.annotation.Annotation;
 import java.util.Optional;
 
-import org.apache.shiro.util.StringUtils;
-
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanDefinition;
 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;
+import org.springframework.util.StringUtils;
 
 /**
  * Spring {@link BeanFactoryPostProcessor} implementation used to post process {@link BeanDefinition BeanDefinitions}
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..dd0888b 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,10 +241,8 @@ public abstract class ForkingClientServerIntegrationTestsSupport extends ClientS
 	}
 
 	@EnablePdx
-	@ClientCacheApplication(logLevel = GEMFIRE_LOG_LEVEL)
-	public static class BaseGemFireClientConfiguration extends ClientServerIntegrationTestsConfiguration {
-
-	}
+	@ClientCacheApplication
+	public static class BaseGemFireClientConfiguration extends ClientServerIntegrationTestsConfiguration { }
 
 	@EnablePdx
 	@CacheServerApplication(name = "ForkingClientServerIntegrationTestsSupport", logLevel = GEMFIRE_LOG_LEVEL)
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 -> {