honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Useful error message for null property placeholder 

This commit adds the key to the error message when encountering a
missing property placeholder.
This commit is contained in:
Jason Tedor 2016-03-23 13:23:44 -04:00
parent 3f73ef9aa4
commit 0654b84d2c
3 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/elasticsearch/common/property/PropertyPlaceholder.java
View File

@ -76,8 +76,8 @@ public class PropertyPlaceholder {
* @param placeholderResolver the <code>PlaceholderResolver</code> to use for replacement. * @param placeholderResolver the <code>PlaceholderResolver</code> to use for replacement.
* @return the supplied value with placeholders replaced inline. * @return the supplied value with placeholders replaced inline.
*/ */
public String replacePlaceholders(String value, PlaceholderResolver placeholderResolver) { public String replacePlaceholders(String key, String value, PlaceholderResolver placeholderResolver) {
Objects.requireNonNull(value, "Argument 'value' must not be null."); Objects.requireNonNull(value, "value can not be null for [" + key + "]");
return parseStringValue(value, placeholderResolver, new HashSet<String>()); return parseStringValue(value, placeholderResolver, new HashSet<String>());
} }

2
core/src/main/java/org/elasticsearch/common/settings/Settings.java
View File

@ -1221,7 +1221,7 @@ public final class Settings implements ToXContent {
} }
}; };
for (Map.Entry<String, String> entry : new HashMap<>(map).entrySet()) { for (Map.Entry<String, String> entry : new HashMap<>(map).entrySet()) {
String value = propertyPlaceholder.replacePlaceholders(entry.getValue(), placeholderResolver); String value = propertyPlaceholder.replacePlaceholders(entry.getKey(), entry.getValue(), placeholderResolver);
// if the values exists and has length, we should maintain it in the map // if the values exists and has length, we should maintain it in the map
// otherwise, the replace process resolved into removing it // otherwise, the replace process resolved into removing it
if (Strings.hasLength(value)) { if (Strings.hasLength(value)) {

49
core/src/test/java/org/elasticsearch/common/property/PropertyPlaceholderTests.java
View File

@ -24,6 +24,7 @@ import org.elasticsearch.test.ESTestCase;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import static org.hamcrest.Matchers.hasToString;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
public class PropertyPlaceholderTests extends ESTestCase { public class PropertyPlaceholderTests extends ESTestCase {
@ -33,10 +34,10 @@ public class PropertyPlaceholderTests extends ESTestCase {
map.put("foo1", "bar1"); map.put("foo1", "bar1");
map.put("foo2", "bar2"); map.put("foo2", "bar2");
PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true); PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true);
assertEquals("bar1", propertyPlaceholder.replacePlaceholders("{foo1}", placeholderResolver)); assertEquals("bar1", propertyPlaceholder.replacePlaceholders("key", "{foo1}", placeholderResolver));
assertEquals("a bar1b", propertyPlaceholder.replacePlaceholders("a {foo1}b", placeholderResolver)); assertEquals("a bar1b", propertyPlaceholder.replacePlaceholders("key", "a {foo1}b", placeholderResolver));
assertEquals("bar1bar2", propertyPlaceholder.replacePlaceholders("{foo1}{foo2}", placeholderResolver)); assertEquals("bar1bar2", propertyPlaceholder.replacePlaceholders("key", "{foo1}{foo2}", placeholderResolver));
assertEquals("a bar1 b bar2 c", propertyPlaceholder.replacePlaceholders("a {foo1} b {foo2} c", placeholderResolver)); assertEquals("a bar1 b bar2 c", propertyPlaceholder.replacePlaceholders("key", "a {foo1} b {foo2} c", placeholderResolver));
} }
public void testVariousPrefixSuffix() { public void testVariousPrefixSuffix() {
@ -47,24 +48,24 @@ public class PropertyPlaceholderTests extends ESTestCase {
Map<String, String> map = new LinkedHashMap<>(); Map<String, String> map = new LinkedHashMap<>();
map.put("foo", "bar"); map.put("foo", "bar");
PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true); PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true);
assertEquals("bar", ppEqualsPrefix.replacePlaceholders("{foo}", placeholderResolver)); assertEquals("bar", ppEqualsPrefix.replacePlaceholders("key", "{foo}", placeholderResolver));
assertEquals("bar", ppLongerPrefix.replacePlaceholders("${foo}", placeholderResolver)); assertEquals("bar", ppLongerPrefix.replacePlaceholders("key", "${foo}", placeholderResolver));
assertEquals("bar", ppShorterPrefix.replacePlaceholders("{foo}}", placeholderResolver)); assertEquals("bar", ppShorterPrefix.replacePlaceholders("key", "{foo}}", placeholderResolver));
} }
public void testDefaultValue() { public void testDefaultValue() {
PropertyPlaceholder propertyPlaceholder = new PropertyPlaceholder("${", "}", false); PropertyPlaceholder propertyPlaceholder = new PropertyPlaceholder("${", "}", false);
Map<String, String> map = new LinkedHashMap<>(); Map<String, String> map = new LinkedHashMap<>();
PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true); PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true);
assertEquals("bar", propertyPlaceholder.replacePlaceholders("${foo:bar}", placeholderResolver)); assertEquals("bar", propertyPlaceholder.replacePlaceholders("key", "${foo:bar}", placeholderResolver));
assertEquals("", propertyPlaceholder.replacePlaceholders("${foo:}", placeholderResolver)); assertEquals("", propertyPlaceholder.replacePlaceholders("key", "${foo:}", placeholderResolver));
} }
public void testIgnoredUnresolvedPlaceholder() { public void testIgnoredUnresolvedPlaceholder() {
PropertyPlaceholder propertyPlaceholder = new PropertyPlaceholder("${", "}", true); PropertyPlaceholder propertyPlaceholder = new PropertyPlaceholder("${", "}", true);
Map<String, String> map = new LinkedHashMap<>(); Map<String, String> map = new LinkedHashMap<>();
PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true); PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true);
assertEquals("${foo}", propertyPlaceholder.replacePlaceholders("${foo}", placeholderResolver)); assertEquals("${foo}", propertyPlaceholder.replacePlaceholders("key", "${foo}", placeholderResolver));
} }
public void testNotIgnoredUnresolvedPlaceholder() { public void testNotIgnoredUnresolvedPlaceholder() {
@ -72,7 +73,7 @@ public class PropertyPlaceholderTests extends ESTestCase {
Map<String, String> map = new LinkedHashMap<>(); Map<String, String> map = new LinkedHashMap<>();
PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true); PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true);
try { try {
propertyPlaceholder.replacePlaceholders("${foo}", placeholderResolver); propertyPlaceholder.replacePlaceholders("key", "${foo}", placeholderResolver);
fail("Expected IllegalArgumentException"); fail("Expected IllegalArgumentException");
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
assertThat(e.getMessage(), is("Could not resolve placeholder 'foo'")); assertThat(e.getMessage(), is("Could not resolve placeholder 'foo'"));
@ -83,7 +84,7 @@ public class PropertyPlaceholderTests extends ESTestCase {
PropertyPlaceholder propertyPlaceholder = new PropertyPlaceholder("${", "}", false); PropertyPlaceholder propertyPlaceholder = new PropertyPlaceholder("${", "}", false);
Map<String, String> map = new LinkedHashMap<>(); Map<String, String> map = new LinkedHashMap<>();
PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, true, true); PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, true, true);
assertEquals("bar", propertyPlaceholder.replacePlaceholders("bar${foo}", placeholderResolver)); assertEquals("bar", propertyPlaceholder.replacePlaceholders("key", "bar${foo}", placeholderResolver));
} }
public void testRecursive() { public void testRecursive() {
@ -93,8 +94,8 @@ public class PropertyPlaceholderTests extends ESTestCase {
map.put("foo1", "${foo2}"); map.put("foo1", "${foo2}");
map.put("foo2", "bar"); map.put("foo2", "bar");
PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true); PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true);
assertEquals("bar", propertyPlaceholder.replacePlaceholders("${foo}", placeholderResolver)); assertEquals("bar", propertyPlaceholder.replacePlaceholders("key", "${foo}", placeholderResolver));
assertEquals("abarb", propertyPlaceholder.replacePlaceholders("a${foo}b", placeholderResolver)); assertEquals("abarb", propertyPlaceholder.replacePlaceholders("key", "a${foo}b", placeholderResolver));
} }
public void testNestedLongerPrefix() { public void testNestedLongerPrefix() {
@ -105,7 +106,7 @@ public class PropertyPlaceholderTests extends ESTestCase {
map.put("foo2", "bar"); map.put("foo2", "bar");
map.put("barbar", "baz"); map.put("barbar", "baz");
PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true); PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true);
assertEquals("baz", propertyPlaceholder.replacePlaceholders("${bar${foo}}", placeholderResolver)); assertEquals("baz", propertyPlaceholder.replacePlaceholders("key", "${bar${foo}}", placeholderResolver));
} }
public void testNestedSameLengthPrefixSuffix() { public void testNestedSameLengthPrefixSuffix() {
@ -116,7 +117,7 @@ public class PropertyPlaceholderTests extends ESTestCase {
map.put("foo2", "bar"); map.put("foo2", "bar");
map.put("barbar", "baz"); map.put("barbar", "baz");
PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true); PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true);
assertEquals("baz", propertyPlaceholder.replacePlaceholders("{bar{foo}}", placeholderResolver)); assertEquals("baz", propertyPlaceholder.replacePlaceholders("key", "{bar{foo}}", placeholderResolver));
} }
public void testNestedShorterPrefix() { public void testNestedShorterPrefix() {
@ -127,7 +128,7 @@ public class PropertyPlaceholderTests extends ESTestCase {
map.put("foo2", "bar"); map.put("foo2", "bar");
map.put("barbar", "baz"); map.put("barbar", "baz");
PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true); PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true);
assertEquals("baz", propertyPlaceholder.replacePlaceholders("{bar{foo}}}}", placeholderResolver)); assertEquals("baz", propertyPlaceholder.replacePlaceholders("key", "{bar{foo}}}}", placeholderResolver));
} }
public void testCircularReference() { public void testCircularReference() {
@ -137,7 +138,7 @@ public class PropertyPlaceholderTests extends ESTestCase {
map.put("bar", "${foo}"); map.put("bar", "${foo}");
PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true); PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, false, true);
try { try {
propertyPlaceholder.replacePlaceholders("${foo}", placeholderResolver); propertyPlaceholder.replacePlaceholders("key", "${foo}", placeholderResolver);
fail("Expected IllegalArgumentException"); fail("Expected IllegalArgumentException");
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
assertThat(e.getMessage(), is("Circular placeholder reference 'foo' in property definitions")); assertThat(e.getMessage(), is("Circular placeholder reference 'foo' in property definitions"));
@ -148,7 +149,17 @@ public class PropertyPlaceholderTests extends ESTestCase {
PropertyPlaceholder propertyPlaceholder = new PropertyPlaceholder("${", "}", false); PropertyPlaceholder propertyPlaceholder = new PropertyPlaceholder("${", "}", false);
Map<String, String> map = new LinkedHashMap<>(); Map<String, String> map = new LinkedHashMap<>();
PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, true, false); PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, true, false);
assertEquals("bar${foo}", propertyPlaceholder.replacePlaceholders("bar${foo}", placeholderResolver)); assertEquals("bar${foo}", propertyPlaceholder.replacePlaceholders("key", "bar${foo}", placeholderResolver));
}
public void testNullValue() {
final PropertyPlaceholder propertyPlaceholder = new PropertyPlaceholder("${", "}", false);
final Map<String, String> map = new LinkedHashMap<>();
final PropertyPlaceholder.PlaceholderResolver placeholderResolver = new SimplePlaceholderResolver(map, true, false);
final String key = randomAsciiOfLength(10);
NullPointerException e =
expectThrows(NullPointerException.class, () -> propertyPlaceholder.replacePlaceholders(key, null, placeholderResolver));
assertThat(e, hasToString("java.lang.NullPointerException: value can not be null for [" + key + "]"));
} }
private class SimplePlaceholderResolver implements PropertyPlaceholder.PlaceholderResolver { private class SimplePlaceholderResolver implements PropertyPlaceholder.PlaceholderResolver {