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

Settings: AffixSettings as validator dependencies (#52973) (#52982) 

Allow AffixSetting as validator dependencies.  If a validator
specifies AffixSettings as a dependency, then `validate(T, Map)`
will have the concrete setting in a map.

Backport of: #52973, 1e0ba70
Fixes: #52933
This commit is contained in:
Stuart Tettemer 2020-02-29 09:38:46 -07:00 committed by GitHub
parent e6755afeeb
commit 210aab0935
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/main/java/org/elasticsearch/common/settings/Setting.java
View File

@ -438,7 +438,16 @@ public class Setting<T> implements ToXContentObject {
map = new HashMap<>();
while (it.hasNext()) {
final Setting<?> setting = it.next();
map.put(setting, setting.get(settings, false)); // we have to disable validation or we will stack overflow
if (setting instanceof AffixSetting) {
// Collect all possible concrete settings
AffixSetting<?> as = ((AffixSetting<?>)setting);
for (String ns : as.getNamespaces(settings)) {
Setting<?> s = as.getConcreteSettingForNamespace(ns);
map.put(s, s.get(settings, false));
}
} else {
map.put(setting, setting.get(settings, false)); // we have to disable validation or we will stack overflow
}
}
} else {
map = Collections.emptyMap();

53
server/src/test/java/org/elasticsearch/common/settings/SettingTests.java
View File

@ -830,6 +830,59 @@ public class SettingTests extends ESTestCase {
assertEquals("[\"testelement\"]", listAffixSetting.getDefaultRaw(Settings.EMPTY));
}
public void testAffixSettingsValidatorDependencies() {
Setting<Integer> affix = Setting.affixKeySetting("abc.", "def", k -> Setting.intSetting(k, 10));
Setting<Integer> fix0 = Setting.intSetting("abc.tuv", 20, 0);
Setting<Integer> fix1 = Setting.intSetting("abc.qrx", 20, 0, new Setting.Validator<Integer>() {
@Override
public void validate(Integer value) {}
String toString(Map<Setting<?>, Object> s) {
return s.entrySet().stream().map(e -> e.getKey().getKey() + ":" + e.getValue().toString()).sorted()
.collect(Collectors.joining(","));
}
@Override
public void validate(Integer value, Map<Setting<?>, Object> settings, boolean isPresent) {
if (settings.get(fix0).equals(fix0.getDefault(Settings.EMPTY))) {
settings.remove(fix0);
}
if (settings.size() == 1) {
throw new IllegalArgumentException(toString(settings));
} else if (settings.size() == 2) {
throw new IllegalArgumentException(toString(settings));
}
}
@Override
public Iterator<Setting<?>> settings() {
List<Setting<?>> a = Arrays.asList(affix, fix0);
return a.iterator();
}
});
IllegalArgumentException e = expectThrows(IllegalArgumentException.class,
() -> fix1.get(Settings.builder().put("abc.1.def", 11).put("abc.2.def", 12).put("abc.qrx", 11).build()));
assertThat(e.getMessage(), is("abc.1.def:11,abc.2.def:12"));
e = expectThrows(IllegalArgumentException.class,
() -> fix1.get(Settings.builder().put("abc.3.def", 13).put("abc.qrx", 20).build()));
assertThat(e.getMessage(), is("abc.3.def:13"));
e = expectThrows(IllegalArgumentException.class,
() -> fix1.get(Settings.builder().put("abc.4.def", 14).put("abc.qrx", 20).put("abc.tuv", 50).build()));
assertThat(e.getMessage(), is("abc.4.def:14,abc.tuv:50"));
assertEquals(
fix1.get(Settings.builder()
.put("abc.3.def", 13).put("abc.1.def", 11).put("abc.2.def", 12).put("abc.qrx", 20)
.build()),
Integer.valueOf(20)
);
assertEquals(fix1.get(Settings.builder().put("abc.qrx", 30).build()), Integer.valueOf(30));
}
public void testMinMaxInt() {
Setting<Integer> integerSetting = Setting.intSetting("foo.bar", 1, 0, 10, Property.NodeScope);
try {