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

This commit is contained in:
John Blum
2022-05-16 14:30:55 -07:00
parent 3d5f42c78a
commit c0cd73dc1e
3 changed files with 6 additions and 6 deletions

View File

@@ -26,8 +26,8 @@ import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.annotation.AnnotationUtils; 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.ArrayUtils;
import org.springframework.data.gemfire.util.SpringUtils;
import org.springframework.lang.NonNull; import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;

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.integration.config.ClientServerIntegrationTestsConfiguration;
import org.springframework.data.gemfire.tests.process.JavaProcessRunner; import org.springframework.data.gemfire.tests.process.JavaProcessRunner;
import org.springframework.data.gemfire.tests.process.ProcessWrapper; 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.ArrayUtils;
import org.springframework.data.gemfire.util.SpringUtils;
import org.springframework.lang.NonNull; import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
@@ -241,13 +241,13 @@ public abstract class ForkingClientServerIntegrationTestsSupport extends ClientS
} }
@EnablePdx @EnablePdx
@ClientCacheApplication(logLevel = GEMFIRE_LOG_LEVEL) @ClientCacheApplication
public static class BaseGemFireClientConfiguration extends ClientServerIntegrationTestsConfiguration { public static class BaseGemFireClientConfiguration extends ClientServerIntegrationTestsConfiguration {
} }
@EnablePdx @EnablePdx
@CacheServerApplication(name = "ForkingClientServerIntegrationTestsSupport", logLevel = GEMFIRE_LOG_LEVEL) @CacheServerApplication(name = "ForkingClientServerIntegrationTestsSupport")
public static class BaseGemFireServerConfiguration extends ClientServerIntegrationTestsConfiguration { public static class BaseGemFireServerConfiguration extends ClientServerIntegrationTestsConfiguration {
public static void main(String[] args) { public static void main(String[] args) {

View File

@@ -29,11 +29,11 @@ import org.springframework.lang.Nullable;
* @see java.util.function.Function * @see java.util.function.Function
* @see org.springframework.context.ApplicationContext * @see org.springframework.context.ApplicationContext
* @see org.springframework.context.ConfigurableApplicationContext * @see org.springframework.context.ConfigurableApplicationContext
* @see org.springframework.data.gemfire.util.SpringUtils * @see org.springframework.data.gemfire.util.SpringExtensions
* @since 1.0.0 * @since 1.0.0
*/ */
@SuppressWarnings("unused") @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 = public static final Function<ConfigurableApplicationContext, Boolean> APPLICATION_CONTEXT_CLOSING_FUNCTION =
applicationContext -> { applicationContext -> {