summaryrefslogtreecommitdiff
path: root/core/src/test/java/org/elasticsearch/common
diff options
context:
space:
mode:
authorRyan Ernst <ryan@iernst.net>2017-05-17 13:14:12 -0700
committerGitHub <noreply@github.com>2017-05-17 13:14:12 -0700
commitf8a48badcf4293396925308962c7d1bd2a357845 (patch)
tree72b2bba406d392b71ec605d6daa6fd392ddafce2 /core/src/test/java/org/elasticsearch/common
parentff34434bba07d85c2e1e551f597d790c35261bf9 (diff)
Settings: Remove shared setting property (#24728)
Shared settings were added intially to allow the few common settings names across aws plugins. However, in 6.0 these settings have been removed. The last use was in netty, but since 6.0 also has the netty 3 modules removed, there is no longer a need for the shared property. This commit removes the shared setting property.
Diffstat (limited to 'core/src/test/java/org/elasticsearch/common')
-rw-r--r--core/src/test/java/org/elasticsearch/common/settings/SettingsModuleTests.java19
1 files changed, 0 insertions, 19 deletions
diff --git a/core/src/test/java/org/elasticsearch/common/settings/SettingsModuleTests.java b/core/src/test/java/org/elasticsearch/common/settings/SettingsModuleTests.java
index 6da023aef2..f2d9016a09 100644
--- a/core/src/test/java/org/elasticsearch/common/settings/SettingsModuleTests.java
+++ b/core/src/test/java/org/elasticsearch/common/settings/SettingsModuleTests.java
@@ -207,23 +207,4 @@ public class SettingsModuleTests extends ModuleTestCase {
assertEquals("unknown setting [index.query.bool.max_clause_count] did you mean [indices.query.bool.max_clause_count]?",
ex.getMessage());
}
-
- public void testRegisterShared() {
- Property scope = randomFrom(Property.NodeScope, Property.IndexScope);
- expectThrows(IllegalArgumentException.class, () ->
- new SettingsModule(Settings.EMPTY,
- Setting.simpleString("index.foo.bar", scope), Setting.simpleString("index.foo.bar", scope))
- );
- expectThrows(IllegalArgumentException.class, () ->
- new SettingsModule(Settings.EMPTY,
- Setting.simpleString("index.foo.bar", scope, Property.Shared), Setting.simpleString("index.foo.bar", scope))
- );
- expectThrows(IllegalArgumentException.class, () ->
- new SettingsModule(Settings.EMPTY,
- Setting.simpleString("index.foo.bar", scope), Setting.simpleString("index.foo.bar", scope, Property.Shared))
- );
- new SettingsModule(Settings.EMPTY,
- Setting.simpleString("index.foo.bar", scope, Property.Shared),
- Setting.simpleString("index.foo.bar", scope, Property.Shared));
- }
}