From 040695b64e6452c9e54109b9d31fe3d1efdd69f7 Mon Sep 17 00:00:00 2001
From: Armin Braun <me@obrown.io>
Date: Thu, 13 Sep 2018 20:45:48 +0200
Subject: [PATCH] CORE: Disable Setting Type Validation (#33660) (#33669)

* Reverts setting type validation introduced in #33503
---
 .../main/java/org/elasticsearch/common/settings/Setting.java    | 2 +-
 .../java/org/elasticsearch/common/settings/SettingTests.java    | 1 +
 2 files changed, 2 insertions(+), 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
index 5244cdd726d..23984e58749 100644
--- 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 class Setting<T> implements ToXContentObject {
      * @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
index 30cfee81ddd..99fde0855f9 100644
--- 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 class SettingTests extends ESTestCase {
         }
     }
 
+    @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);