CORE: Disable Setting Type Validation (#33660)

* Reverts setting type validation introduced in #33503
elastic · Sep 13, 2018 · 928fe3f · 928fe3f
1 parent 9a03d8b
commit 928fe3f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/server/src/main/java/org/elasticsearch/common/settings/Setting.java b/server/src/main/java/org/elasticsearch/common/settings/Setting.java
@@ -458,7 +458,7 @@ public final String getRaw(final Settings settings) {
      * @return the raw string representation of the setting value
      */
     String innerGetRaw(final Settings settings) {
-        return settings.get(getKey(), defaultValue.apply(settings), isListSetting());
+        return settings.get(getKey(), defaultValue.apply(settings));
     }
 
     /** Logs a deprecation warning if the setting is deprecated and used. */

diff --git a/server/src/test/java/org/elasticsearch/common/settings/SettingTests.java b/server/src/test/java/org/elasticsearch/common/settings/SettingTests.java
@@ -180,6 +180,7 @@ public void testSimpleUpdate() {
         }
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/33135")
     public void testValidateStringSetting() {
         Settings settings = Settings.builder().putList("foo.bar", Arrays.asList("bla-a", "bla-b")).build();
         Setting<String> stringSetting = Setting.simpleString("foo.bar", Property.NodeScope);