Spring/spring-boot-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add logic to ignore member name if 'spring.data.gemfire.name' or 'spring.data.gemfire.cache.name' properties are set.

Browse Source 
Add logic to ignore member name if the 'spring.application.name' property is set.

Add integration tests asserting that @UseMemberName overrides the name attribute specified in the caching annotations (e.g. @ClientCacheApplication#name() or @PeerCacheApplication#name()).
This commit is contained in:
John Blum
2018-10-02 16:11:49 -07:00
parent 7199f3c3a1
commit fe54953e00
3 changed files with 115 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
spring-geode/src/main/java/org/springframework/geode/config/annotation/MemberNameConfiguration.java
View File

@@ -17,14 +17,19 @@
package org.springframework.geode.config.annotation;
import java.lang.annotation.Annotation;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.client.ClientCache;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportAware;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.annotation.Order;
import org.springframework.core.env.Environment;
import org.springframework.core.type.AnnotationMetadata;
import org.springframework.data.gemfire.CacheFactoryBean;
import org.springframework.data.gemfire.config.annotation.ClientCacheConfigurer;
@@ -58,6 +63,21 @@ import org.springframework.util.StringUtils;
public class MemberNameConfiguration extends AbstractAnnotationConfigSupport implements ImportAware {
private static final String GEMFIRE_NAME_PROPERTY = "name";
private static final String SPRING_APPLICATION_NAME_PROPERTY = "spring.application.name";
private static final String SPRING_DATA_GEMFIRE_CACHE_NAME_PROPERTY = "spring.data.gemfire.cache.name";
private static final String SPRING_DATA_GEMFIRE_NAME_PROPERTY = "spring.data.gemfire.name";
private static final String SPRING_DATA_GEODE_CACHE_NAME_PROPERTY = "spring.data.geode.cache.name";
private static final String SPRING_DATA_GEODE_NAME_PROPERTY = "spring.data.geode.name";
private static final Set<String> NAME_PROPERTIES = new HashSet<>();
static {
NAME_PROPERTIES.add(SPRING_APPLICATION_NAME_PROPERTY);
NAME_PROPERTIES.add(SPRING_DATA_GEMFIRE_CACHE_NAME_PROPERTY);
NAME_PROPERTIES.add(SPRING_DATA_GEMFIRE_NAME_PROPERTY);
NAME_PROPERTIES.add(SPRING_DATA_GEODE_CACHE_NAME_PROPERTY);
NAME_PROPERTIES.add(SPRING_DATA_GEODE_NAME_PROPERTY);
}
private String memberName;
@@ -96,17 +116,29 @@ public class MemberNameConfiguration extends AbstractAnnotationConfigSupport imp
}
@Bean
ClientCacheConfigurer clientCacheMemberNameConfigurer() {
return (beaName, clientCacheFactoryBean) -> configureMemberName(clientCacheFactoryBean);
@Order(Ordered.HIGHEST_PRECEDENCE) // apply first (e.g. before CacheNameAutoConfiguration)
ClientCacheConfigurer clientCacheMemberNameConfigurer(Environment environment) {
return (beaName, clientCacheFactoryBean) -> configureMemberName(environment, clientCacheFactoryBean);
}
@Bean
PeerCacheConfigurer peerCacheMemberNameConfigurer() {
return (beaName, peerCacheFactoryBean) -> configureMemberName(peerCacheFactoryBean);
@Order(Ordered.HIGHEST_PRECEDENCE) // apply first (e.g. before CacheNameAutoConfiguration)
PeerCacheConfigurer peerCacheMemberNameConfigurer(Environment environment) {
return (beaName, peerCacheFactoryBean) -> configureMemberName(environment, peerCacheFactoryBean);
}
private void configureMemberName(CacheFactoryBean cacheFactoryBean) {
getMemberName().ifPresent(memberName ->
cacheFactoryBean.getProperties().setProperty(GEMFIRE_NAME_PROPERTY, memberName));
private void configureMemberName(Environment environment, CacheFactoryBean cacheFactoryBean) {
getMemberName()
.filter(memberName -> namePropertiesNotPresent(environment))
.ifPresent(memberName ->
cacheFactoryBean.getProperties().setProperty(GEMFIRE_NAME_PROPERTY, memberName));
}
private boolean namePropertiesArePresent(Environment environment) {
return NAME_PROPERTIES.stream().anyMatch(environment::containsProperty);
}
private boolean namePropertiesNotPresent(Environment environment) {
return !namePropertiesArePresent(environment);
}
}

16
spring-geode/src/main/java/org/springframework/geode/config/annotation/UseMemberName.java
View File

@@ -52,14 +52,6 @@ import org.springframework.core.annotation.AliasFor;
@Import(MemberNameConfiguration.class)
public @interface UseMemberName {
/**
* {@link String Name} used for the Apache Geode/Pivotal GemFire distributed system member.
*
* @see #name()
*/
@AliasFor("name")
String value() default "";
/**
* Alias for the {@link String name} of the Apache Geode/Pivotal GemFire distributed system member.
*
@@ -68,4 +60,12 @@ public @interface UseMemberName {
@AliasFor("value")
String name() default "";
/**
* {@link String Name} used for the Apache Geode/Pivotal GemFire distributed system member.
*
* @see #name()
*/
@AliasFor("name")
String value() default "";
}