Adapt to API changes in Spring Data for Apache Geode (SDG).

This commit is contained in:
John Blum
2022-09-23 11:07:36 -07:00
parent 8ee6639aa4
commit a6f515546f
3 changed files with 7 additions and 10 deletions

View File

@@ -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}

View File

@@ -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)

View File

@@ -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 -> {