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

DATAGEODE-330 - Enhance GemFireProperties.from(:String) to handle valid 'gemfire.' prefixed properties.

Browse Source
This commit is contained in:
John Blum
2020-04-14 19:07:55 -07:00
parent f146a7daf8
commit e7c7fb9ab9
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-data-geode/src/main/java/org/springframework/data/gemfire/GemFireProperties.java
View File

@@ -24,6 +24,7 @@ import org.apache.geode.distributed.ConfigurationProperties;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
/**
@@ -164,10 +165,9 @@ public enum GemFireProperties {
}
private static boolean equals(GemFireProperties property, String propertyName) {
return property != null && property.getName().equals(propertyName);
return property != null && property.getName().equals(normalizePropertyName(propertyName));
}
/*
private static String normalizePropertyName(@Nullable String propertyName) {
String safePropertyName = String.valueOf(propertyName).trim();
@@ -178,7 +178,6 @@ public enum GemFireProperties {
return index > -1 && gemfireDotPrefixed ? safePropertyName.substring(index + 1) : propertyName;
}
*/
private Class<?> nullSafeType(Object target, Class<?> defaultType) {
return target != null ? target.getClass() : defaultType;

4
spring-data-geode/src/test/java/org/springframework/data/gemfire/GemFirePropertiesUnitTests.java
View File

@@ -117,8 +117,8 @@ public class GemFirePropertiesUnitTests {
public void fromValidGemFireProperty() {
assertThat(GemFireProperties.from("cache-xml-file")).isEqualTo(GemFireProperties.CACHE_XML_FILE);
//assertThat(GemFireProperties.from("gemfire.locators")).isEqualTo(GemFireProperties.LOCATORS);
//assertThat(GemFireProperties.from(" gemfire.remote-locators ")).isEqualTo(GemFireProperties.REMOTE_LOCATORS);
assertThat(GemFireProperties.from("gemfire.locators")).isEqualTo(GemFireProperties.LOCATORS);
assertThat(GemFireProperties.from(" gemfire.remote-locators ")).isEqualTo(GemFireProperties.REMOTE_LOCATORS);
}
private void testFromInvalidGemFireProperty(String propertyName) {