Skip to content

Commit 486f9ac

Browse files
jxblumjxblum
committed
Adapt to API changes in Spring Data for Apache Geode.
1 parent a491713 commit 486f9ac

File tree

6 files changed

+25
-22
lines changed

6 files changed

+25
-22
lines changed

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import org.apache.geode.cache.GemFireCache;
2424
import org.apache.geode.cache.client.ClientCache;
2525

26+
import org.slf4j.Logger;
27+
import org.slf4j.LoggerFactory;
2628
import org.springframework.boot.SpringApplication;
2729
import org.springframework.boot.SpringBootConfiguration;
2830
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -36,22 +38,17 @@
3638
import org.springframework.boot.cloud.CloudPlatform;
3739
import org.springframework.boot.env.EnvironmentPostProcessor;
3840
import org.springframework.context.annotation.Conditional;
39-
import org.springframework.context.annotation.Configuration;
4041
import org.springframework.core.env.ConfigurableEnvironment;
4142
import org.springframework.core.env.Environment;
4243
import org.springframework.core.env.PropertySource;
4344
import org.springframework.data.gemfire.client.ClientCacheFactoryBean;
4445
import org.springframework.data.gemfire.config.annotation.EnableSecurity;
45-
import org.springframework.data.gemfire.config.annotation.support.AutoConfiguredAuthenticationInitializer;
4646
import org.springframework.geode.core.env.VcapPropertySource;
4747
import org.springframework.geode.core.env.support.CloudCacheService;
4848
import org.springframework.geode.core.env.support.User;
4949
import org.springframework.lang.Nullable;
5050
import org.springframework.util.StringUtils;
5151

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

114111
private static final String POOL_LOCATORS_PROPERTY = "spring.data.gemfire.pool.locators";
115112

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;
113+
private static final String SECURITY_USERNAME_PROPERTY = "spring.data.gemfire.security.username";
114+
private static final String SECURITY_PASSWORD_PROPERTY = "spring.data.gemfire.security.password";
121115

122116
private static final String SSL_USE_DEFAULT_CONTEXT_PROPERTY =
123117
"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 & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.springframework.context.ApplicationContext;
4848
import org.springframework.context.ConfigurableApplicationContext;
4949
import org.springframework.context.annotation.Bean;
50-
import org.springframework.context.annotation.Configuration;
5150
import org.springframework.context.event.ContextRefreshedEvent;
5251
import org.springframework.context.event.EventListener;
5352
import org.springframework.core.type.StandardMethodMetadata;
@@ -58,8 +57,8 @@
5857
import org.springframework.data.gemfire.config.xml.GemfireConstants;
5958
import org.springframework.data.gemfire.util.ArrayUtils;
6059
import org.springframework.data.gemfire.util.CollectionUtils;
61-
import org.springframework.data.gemfire.util.SpringUtils;
6260
import org.springframework.geode.config.annotation.support.TypelessAnnotationConfigSupport;
61+
import org.springframework.geode.core.util.SpringExtensions;
6362
import org.springframework.lang.NonNull;
6463
import org.springframework.lang.Nullable;
6564
import org.springframework.util.StringUtils;
@@ -137,7 +136,7 @@ else if (isGemfireTemplateBeanDefinition(resolvedBeanType)) {
137136
userRegionTemplateNames.add(beanName);
138137
}
139138
else if (isBeanWithGemfireTemplateDependency(beanFactory, beanDefinition)) {
140-
SpringUtils.addDependsOn(beanDefinition, GemfireConstants.DEFAULT_GEMFIRE_CACHE_NAME);
139+
SpringExtensions.addDependsOn(beanDefinition, GemfireConstants.DEFAULT_GEMFIRE_CACHE_NAME);
141140
}
142141
}
143142
}
@@ -213,7 +212,7 @@ private void setAutoConfiguredRegionTemplateDependencies(BeanDefinitionRegistry
213212

214213
this.autoConfiguredRegionTemplateBeanNames.stream()
215214
.map(registry::getBeanDefinition)
216-
.forEach(beanDefinition -> SpringUtils.addDependsOn(beanDefinition, dependencyBeanNamesArray));
215+
.forEach(beanDefinition -> SpringExtensions.addDependsOn(beanDefinition, dependencyBeanNamesArray));
217216
}
218217

219218
// 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: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717

1818
import java.util.Properties;
1919

20+
import org.apache.geode.cache.Cache;
21+
22+
import org.springframework.context.ApplicationContext;
2023
import org.springframework.context.ApplicationListener;
2124
import org.springframework.context.annotation.Configuration;
2225
import org.springframework.context.event.ContextRefreshedEvent;
@@ -46,9 +49,11 @@ public class SecurityManagerProxyConfiguration implements ApplicationListener<Co
4649
@Override
4750
public void onApplicationEvent(ContextRefreshedEvent event) {
4851

52+
ApplicationContext applicationContext = event.getApplicationContext();
53+
4954
SecurityManagerProxy securityManagerProxy = SecurityManagerProxy.getInstance();
5055

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

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