Skip to content

Commit 68c087e

Browse files
jxblumjxblum
committed
Adapt to API changes in Spring Data for Apache Geode.
1 parent e30e9e6 commit 68c087e

File tree

6 files changed

+24
-24
lines changed

6 files changed

+24
-24
lines changed

‎spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
import org.apache.geode.cache.GemFireCache;
2424
import org.apache.geode.cache.client.ClientCache;
25-
25+
import org.slf4j.Logger;
26+
import org.slf4j.LoggerFactory;
2627
import org.springframework.boot.SpringApplication;
2728
import org.springframework.boot.SpringBootConfiguration;
2829
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -36,22 +37,17 @@
3637
import org.springframework.boot.cloud.CloudPlatform;
3738
import org.springframework.boot.env.EnvironmentPostProcessor;
3839
import org.springframework.context.annotation.Conditional;
39-
import org.springframework.context.annotation.Configuration;
4040
import org.springframework.core.env.ConfigurableEnvironment;
4141
import org.springframework.core.env.Environment;
4242
import org.springframework.core.env.PropertySource;
4343
import org.springframework.data.gemfire.client.ClientCacheFactoryBean;
4444
import org.springframework.data.gemfire.config.annotation.EnableSecurity;
45-
import org.springframework.data.gemfire.config.annotation.support.AutoConfiguredAuthenticationInitializer;
4645
import org.springframework.geode.core.env.VcapPropertySource;
4746
import org.springframework.geode.core.env.support.CloudCacheService;
4847
import org.springframework.geode.core.env.support.User;
4948
import org.springframework.lang.Nullable;
5049
import org.springframework.util.StringUtils;
5150

52-
import org.slf4j.Logger;
53-
import org.slf4j.LoggerFactory;
54-
5551
/**
5652
* Spring Boot {@link EnableAutoConfiguration auto-configuration} enabling Apache Geode's Security functionality,
5753
* and specifically Authentication between a client and server using Spring Data Geode Security annotations.
@@ -113,11 +109,8 @@ public class ClientSecurityAutoConfiguration {
113109

114110
private static final String POOL_LOCATORS_PROPERTY = "spring.data.gemfire.pool.locators";
115111

116-
private static final String SECURITY_USERNAME_PROPERTY =
117-
AutoConfiguredAuthenticationInitializer.SDG_SECURITY_USERNAME_PROPERTY;
118-
119-
private static final String SECURITY_PASSWORD_PROPERTY =
120-
AutoConfiguredAuthenticationInitializer.SDG_SECURITY_PASSWORD_PROPERTY;
112+
private static final String SECURITY_USERNAME_PROPERTY = "spring.data.gemfire.security.username";
113+
private static final String SECURITY_PASSWORD_PROPERTY = "spring.data.gemfire.security.password";
121114

122115
private static final String SSL_USE_DEFAULT_CONTEXT_PROPERTY =
123116
"spring.data.gemfire.security.ssl.use-default-context";

‎spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RegionTemplateAutoConfiguration.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
import org.apache.geode.cache.GemFireCache;
2828
import org.apache.geode.cache.Region;
29-
3029
import org.springframework.beans.BeansException;
3130
import org.springframework.beans.PropertyValue;
3231
import org.springframework.beans.factory.BeanFactory;
@@ -47,7 +46,6 @@
4746
import org.springframework.context.ApplicationContext;
4847
import org.springframework.context.ConfigurableApplicationContext;
4948
import org.springframework.context.annotation.Bean;
50-
import org.springframework.context.annotation.Configuration;
5149
import org.springframework.context.event.ContextRefreshedEvent;
5250
import org.springframework.context.event.EventListener;
5351
import org.springframework.core.type.StandardMethodMetadata;
@@ -58,8 +56,8 @@
5856
import org.springframework.data.gemfire.config.xml.GemfireConstants;
5957
import org.springframework.data.gemfire.util.ArrayUtils;
6058
import org.springframework.data.gemfire.util.CollectionUtils;
61-
import org.springframework.data.gemfire.util.SpringUtils;
6259
import org.springframework.geode.config.annotation.support.TypelessAnnotationConfigSupport;
60+
import org.springframework.geode.core.util.SpringExtensions;
6361
import org.springframework.lang.NonNull;
6462
import org.springframework.lang.Nullable;
6563
import org.springframework.util.StringUtils;
@@ -137,7 +135,7 @@ else if (isGemfireTemplateBeanDefinition(resolvedBeanType)) {
137135
userRegionTemplateNames.add(beanName);
138136
}
139137
else if (isBeanWithGemfireTemplateDependency(beanFactory, beanDefinition)) {
140-
SpringUtils.addDependsOn(beanDefinition, GemfireConstants.DEFAULT_GEMFIRE_CACHE_NAME);
138+
SpringExtensions.addDependsOn(beanDefinition, GemfireConstants.DEFAULT_GEMFIRE_CACHE_NAME);
141139
}
142140
}
143141
}
@@ -213,7 +211,7 @@ private void setAutoConfiguredRegionTemplateDependencies(BeanDefinitionRegistry
213211

214212
this.autoConfiguredRegionTemplateBeanNames.stream()
215213
.map(registry::getBeanDefinition)
216-
.forEach(beanDefinition -> SpringUtils.addDependsOn(beanDefinition, dependencyBeanNamesArray));
214+
.forEach(beanDefinition -> SpringExtensions.addDependsOn(beanDefinition, dependencyBeanNamesArray));
217215
}
218216

219217
// Required by @EnableClusterDefinedRegions & Native-Defined Regions (e.g. Regions defined in "cache.xml").

‎spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerProxyConfiguration.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
import java.util.Properties;
1919

20+
import org.apache.geode.cache.Cache;
21+
import org.springframework.context.ApplicationContext;
2022
import org.springframework.context.ApplicationListener;
2123
import org.springframework.context.annotation.Configuration;
2224
import org.springframework.context.event.ContextRefreshedEvent;
@@ -46,9 +48,11 @@ public class SecurityManagerProxyConfiguration implements ApplicationListener<Co
4648
@Override
4749
public void onApplicationEvent(ContextRefreshedEvent event) {
4850

51+
ApplicationContext applicationContext = event.getApplicationContext();
52+
4953
SecurityManagerProxy securityManagerProxy = SecurityManagerProxy.getInstance();
5054

51-
securityManagerProxy.setBeanFactory(event.getApplicationContext().getAutowireCapableBeanFactory());
52-
securityManagerProxy.init(new Properties());
55+
securityManagerProxy.setBeanFactory(applicationContext.getAutowireCapableBeanFactory());
56+
securityManagerProxy.initialize(applicationContext.getBean(Cache.class), new Properties());
5357
}
5458
}

‎spring-geode/src/main/java/org/springframework/geode/context/annotation/RefreshableAnnotationConfigApplicationContext.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import java.util.Optional;
2323
import java.util.Set;
2424

25+
import org.slf4j.Logger;
26+
import org.slf4j.LoggerFactory;
2527
import org.springframework.beans.BeansException;
2628
import org.springframework.beans.factory.config.BeanDefinition;
2729
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -38,15 +40,12 @@
3840
import org.springframework.context.support.AbstractRefreshableConfigApplicationContext;
3941
import org.springframework.data.gemfire.config.annotation.PeerCacheApplication;
4042
import org.springframework.data.gemfire.util.ArrayUtils;
41-
import org.springframework.data.gemfire.util.SpringUtils;
43+
import org.springframework.geode.core.util.SpringExtensions;
4244
import org.springframework.lang.NonNull;
4345
import org.springframework.lang.Nullable;
4446
import org.springframework.util.ClassUtils;
4547
import org.springframework.util.StringUtils;
4648

47-
import org.slf4j.Logger;
48-
import org.slf4j.LoggerFactory;
49-
5049
/**
5150
* A {@literal refreshable} {@link ApplicationContext} capable of loading {@link Class component classes} used for
5251
* {@link Annotation} based configuration in addition to scanning {@link String configuration locations}, and then
@@ -314,7 +313,7 @@ protected void onRefresh() {
314313
*/
315314
@Override
316315
protected void prepareRefresh() {
317-
this.beanFactory = (DefaultListableBeanFactory) SpringUtils.safeGetValue(this::getBeanFactory);
316+
this.beanFactory = (DefaultListableBeanFactory) SpringExtensions.safeGetValue(this::getBeanFactory);
318317
super.prepareRefresh();
319318
}
320319

‎spring-geode/src/main/java/org/springframework/geode/core/util/SpringExtensions.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@
3434
* @see org.springframework.beans.factory.config.BeanDefinition
3535
* @see org.springframework.beans.factory.support.BeanDefinitionRegistry
3636
* @see org.springframework.context.ApplicationContext
37+
* @see org.springframework.data.gemfire.util.SpringExtensions
3738
* @since 1.6.0
3839
*/
3940
@SuppressWarnings("unused")
40-
public abstract class SpringExtensions {
41+
public abstract class SpringExtensions extends org.springframework.data.gemfire.util.SpringExtensions {
4142

4243
public static final String BEAN_DEFINITION_METADATA_JSON = "{\n"
4344
+ "\t'beanName': '%1$s',%n"

‎spring-geode/src/main/java/org/springframework/geode/security/support/SecurityManagerProxy.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,11 @@ public void destroy() throws Exception {
171171
INSTANCE.set(null);
172172
}
173173

174+
@Override
175+
public void init(Properties props) {
176+
super.init(props);
177+
}
178+
174179
@Override
175180
protected BeanFactory locateBeanFactory() {
176181
return this.beanFactory != null ? this.beanFactory : super.locateBeanFactory();

0 commit comments

Comments
 (0)