From 54572fcb4cfcde1a2bea0d82fa5899e98f055551 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 12 Apr 2022 17:06:43 -0700 Subject: [PATCH] Adapt to API changes in Spring Data for Apache Geode. Replace use of SDG SpringUtils with SBDG's SpringExtensions, which now extends org.springframework.data.gemfire.util.SpringExtensions (renamed from o.s.d.g.util.SpringUtils). --- ...cedGemFirePropertiesAutoConfiguration.java | 2 +- .../RegionTemplateAutoConfiguration.java | 20 ++++++------------- ...bleAnnotationConfigApplicationContext.java | 4 ++-- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/spring-geode-project/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/EnvironmentSourcedGemFirePropertiesAutoConfiguration.java b/spring-geode-project/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/EnvironmentSourcedGemFirePropertiesAutoConfiguration.java index b5397c9f..5869856e 100644 --- a/spring-geode-project/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/EnvironmentSourcedGemFirePropertiesAutoConfiguration.java +++ b/spring-geode-project/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/EnvironmentSourcedGemFirePropertiesAutoConfiguration.java @@ -72,7 +72,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings("unused") public class EnvironmentSourcedGemFirePropertiesAutoConfiguration { - private static final String GEMFIRE_PROPERTY_PREFIX = GemFireProperties.PROPERTY_NAME_PREFIX; + private static final String GEMFIRE_PROPERTY_PREFIX = GemFireProperties.GEMFIRE_PROPERTY_NAME_PREFIX; private final Logger logger = LoggerFactory.getLogger(EnvironmentSourcedGemFirePropertiesAutoConfiguration.class); diff --git a/spring-geode-project/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RegionTemplateAutoConfiguration.java b/spring-geode-project/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RegionTemplateAutoConfiguration.java index 489d096b..3bf77462 100644 --- a/spring-geode-project/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RegionTemplateAutoConfiguration.java +++ b/spring-geode-project/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RegionTemplateAutoConfiguration.java @@ -57,8 +57,8 @@ import org.springframework.data.gemfire.ResolvableRegionFactoryBean; import org.springframework.data.gemfire.config.xml.GemfireConstants; import org.springframework.data.gemfire.util.ArrayUtils; import org.springframework.data.gemfire.util.CollectionUtils; -import org.springframework.data.gemfire.util.SpringUtils; import org.springframework.geode.config.annotation.support.TypelessAnnotationConfigSupport; +import org.springframework.geode.core.util.SpringExtensions; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; import org.springframework.util.StringUtils; @@ -110,9 +110,7 @@ public class RegionTemplateAutoConfiguration extends TypelessAnnotationConfigSup return beanFactory -> { - if (beanFactory instanceof BeanDefinitionRegistry) { - - BeanDefinitionRegistry registry = (BeanDefinitionRegistry) beanFactory; + if (beanFactory instanceof BeanDefinitionRegistry registry) { List beanDefinitionNames = Arrays.asList(ArrayUtils.nullSafeArray(registry.getBeanDefinitionNames(), String.class)); @@ -136,7 +134,7 @@ public class RegionTemplateAutoConfiguration extends TypelessAnnotationConfigSup userRegionTemplateNames.add(beanName); } else if (isBeanWithGemfireTemplateDependency(beanFactory, beanDefinition)) { - SpringUtils.addDependsOn(beanDefinition, GemfireConstants.DEFAULT_GEMFIRE_CACHE_NAME); + SpringExtensions.addDependsOn(beanDefinition, GemfireConstants.DEFAULT_GEMFIRE_CACHE_NAME); } } } @@ -212,7 +210,7 @@ public class RegionTemplateAutoConfiguration extends TypelessAnnotationConfigSup this.autoConfiguredRegionTemplateBeanNames.stream() .map(registry::getBeanDefinition) - .forEach(beanDefinition -> SpringUtils.addDependsOn(beanDefinition, dependencyBeanNamesArray)); + .forEach(beanDefinition -> SpringExtensions.addDependsOn(beanDefinition, dependencyBeanNamesArray)); } // Required by @EnableClusterDefinedRegions & Native-Defined Regions (e.g. Regions defined in "cache.xml"). @@ -251,10 +249,7 @@ public class RegionTemplateAutoConfiguration extends TypelessAnnotationConfigSup @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { - if (bean instanceof GemFireCache) { - - GemFireCache cache = (GemFireCache) bean; - + if (bean instanceof GemFireCache cache) { registerRegionTemplatesForCacheRegions(applicationContext, cache); } @@ -278,10 +273,7 @@ public class RegionTemplateAutoConfiguration extends TypelessAnnotationConfigSup ApplicationContext applicationContext = event.getApplicationContext(); - if (applicationContext instanceof ConfigurableApplicationContext) { - - ConfigurableApplicationContext configurableApplicationContext = - (ConfigurableApplicationContext) applicationContext; + if (applicationContext instanceof ConfigurableApplicationContext configurableApplicationContext) { GemFireCache cache = configurableApplicationContext.getBean(GemFireCache.class); diff --git a/spring-geode-project/spring-geode/src/main/java/org/springframework/geode/context/annotation/RefreshableAnnotationConfigApplicationContext.java b/spring-geode-project/spring-geode/src/main/java/org/springframework/geode/context/annotation/RefreshableAnnotationConfigApplicationContext.java index 60030c95..1985a235 100644 --- a/spring-geode-project/spring-geode/src/main/java/org/springframework/geode/context/annotation/RefreshableAnnotationConfigApplicationContext.java +++ b/spring-geode-project/spring-geode/src/main/java/org/springframework/geode/context/annotation/RefreshableAnnotationConfigApplicationContext.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.ScopeMetadataResolver; import org.springframework.context.support.AbstractRefreshableConfigApplicationContext; import org.springframework.data.gemfire.config.annotation.PeerCacheApplication; import org.springframework.data.gemfire.util.ArrayUtils; -import org.springframework.data.gemfire.util.SpringUtils; +import org.springframework.geode.core.util.SpringExtensions; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; import org.springframework.util.ClassUtils; @@ -314,7 +314,7 @@ public class RefreshableAnnotationConfigApplicationContext extends AbstractRefre */ @Override protected void prepareRefresh() { - this.beanFactory = (DefaultListableBeanFactory) SpringUtils.safeGetValue(this::getBeanFactory); + this.beanFactory = (DefaultListableBeanFactory) SpringExtensions.safeGetValue(this::getBeanFactory); super.prepareRefresh(); }