Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CORE: Disable Setting Type Validation (#33660) #33669

Merged
merged 3 commits into from
Sep 13, 2018
Merged

CORE: Disable Setting Type Validation (#33660) #33669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f2590a
CORE: Disable Setting Type Validation (#33660)
original-brownbear Sep 13, 2018
3698317
Merge remote-tracking branch 'elastic/master' into remove-setting-typ…
original-brownbear Sep 13, 2018
668abeb
Merge remote-tracking branch 'elastic/master' into remove-setting-typ…
original-brownbear Sep 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/common/settings/Setting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
1 change: 1 addition & 0 deletions server/src/test/java/org/elasticsearch/common/settings/SettingTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down