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

Check mutually exclusive scopes 

We want to make sure that a developer does not put more than one scope on a given setting.
This commit is contained in:
David Pilato 2016-02-28 11:21:20 +01:00
parent d77daf3861
commit 7a7f112e89
2 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/org/elasticsearch/common/settings/Setting.java
View File

@ -125,6 +125,18 @@ public class Setting<T> extends ToXContentToBytes {
} else { } else {
this.properties = EnumSet.copyOf(Arrays.asList(properties)); this.properties = EnumSet.copyOf(Arrays.asList(properties));
} }
// We validate scope settings. They are mutually exclusive
int numScopes = 0;
for (SettingsProperty property : properties) {
if (property == SettingsProperty.ClusterScope ||
property == SettingsProperty.IndexScope ||
property == SettingsProperty.NodeScope) {
numScopes++;
}
}
if (numScopes > 1) {
throw new IllegalArgumentException("More than one scope has been added to the setting [" + key + "]");
}
} }
/** /**

52
core/src/test/java/org/elasticsearch/common/settings/SettingTests.java
View File

@ -30,6 +30,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
public class SettingTests extends ESTestCase { public class SettingTests extends ESTestCase {
@ -400,4 +401,55 @@ public class SettingTests extends ESTestCase {
assertEquals(5, integerSetting.get(Settings.builder().put("foo.bar", 5).build()).intValue()); assertEquals(5, integerSetting.get(Settings.builder().put("foo.bar", 5).build()).intValue());
assertEquals(1, integerSetting.get(Settings.EMPTY).intValue()); assertEquals(1, integerSetting.get(Settings.EMPTY).intValue());
} }
/**
* Only one single scope can be added to any setting
*/
public void testMutuallyExclusiveScopes() {
// Those should pass
Setting<String> setting = Setting.simpleString("foo.bar", SettingsProperty.ClusterScope);
assertThat(setting.hasClusterScope(), is(true));
assertThat(setting.hasNodeScope(), is(false));
assertThat(setting.hasIndexScope(), is(false));
setting = Setting.simpleString("foo.bar", SettingsProperty.NodeScope);
assertThat(setting.hasNodeScope(), is(true));
assertThat(setting.hasIndexScope(), is(false));
assertThat(setting.hasClusterScope(), is(false));
setting = Setting.simpleString("foo.bar", SettingsProperty.IndexScope);
assertThat(setting.hasIndexScope(), is(true));
assertThat(setting.hasNodeScope(), is(false));
assertThat(setting.hasClusterScope(), is(false));
// We test the default scope
setting = Setting.simpleString("foo.bar");
assertThat(setting.hasNodeScope(), is(true));
assertThat(setting.hasIndexScope(), is(false));
assertThat(setting.hasClusterScope(), is(false));
// Those should fail
try {
Setting.simpleString("foo.bar", SettingsProperty.IndexScope, SettingsProperty.ClusterScope);
fail("Multiple scopes should fail");
} catch (IllegalArgumentException e) {
assertThat(e.getMessage(), containsString("More than one scope has been added to the setting"));
}
try {
Setting.simpleString("foo.bar", SettingsProperty.IndexScope, SettingsProperty.NodeScope);
fail("Multiple scopes should fail");
} catch (IllegalArgumentException e) {
assertThat(e.getMessage(), containsString("More than one scope has been added to the setting"));
}
try {
Setting.simpleString("foo.bar", SettingsProperty.ClusterScope, SettingsProperty.NodeScope);
fail("Multiple scopes should fail");
} catch (IllegalArgumentException e) {
assertThat(e.getMessage(), containsString("More than one scope has been added to the setting"));
}
try {
Setting.simpleString("foo.bar", SettingsProperty.IndexScope, SettingsProperty.ClusterScope, SettingsProperty.NodeScope);
fail("Multiple scopes should fail");
} catch (IllegalArgumentException e) {
assertThat(e.getMessage(), containsString("More than one scope has been added to the setting"));
}
}
} }