From e7c7fb9ab9d2cf7daf264ba0e84487c359e8501f Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 14 Apr 2020 19:07:55 -0700 Subject: [PATCH] DATAGEODE-330 - Enhance GemFireProperties.from(:String) to handle valid 'gemfire.' prefixed properties. --- .../org/springframework/data/gemfire/GemFireProperties.java | 5 ++--- .../data/gemfire/GemFirePropertiesUnitTests.java | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemFireProperties.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemFireProperties.java index 51728377..9b3dd02d 100644 --- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemFireProperties.java +++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemFireProperties.java @@ -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; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/GemFirePropertiesUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/GemFirePropertiesUnitTests.java index 251dc5ea..390152ba 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/GemFirePropertiesUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/GemFirePropertiesUnitTests.java @@ -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) {