Skip to content

Fixed inconsistent Setting.exist() #46603

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

Merged
merged 6 commits into from
Sep 16, 2019
Merged

Fixed inconsistent Setting.exist() #46603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
15b419b
Fixed inconsistent Setting.exist
probakowski Sep 11, 2019
af7e590
Added parameter description
probakowski Sep 12, 2019
68bb099
Reuse current methods similar to check in innerGetRaw
probakowski Sep 12, 2019
53301a2
Revert formatting changes
probakowski Sep 12, 2019
1dd83d3
Changed ! to ==false
probakowski Sep 13, 2019
f167263
Merge remote-tracking branch 'origin/master' into setting-exist
probakowski Sep 13, 2019
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
4 changes: 3 additions & 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 @@ -404,7 +404,9 @@ public T getDefault(Settings settings) {
* @return true if the setting is present in the given settings instance, otherwise false
*/
public boolean exists(final Settings settings) {
return settings.keySet().contains(getKey());
SecureSettings secureSettings = settings.getSecureSettings();
return settings.keySet().contains(getKey()) &&
(secureSettings == null || secureSettings.getSettingNames().contains(getKey()) == false);
}

/**
Expand Down
7 changes: 7 additions & 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 @@ -910,6 +910,13 @@ public void testExists() {
assertTrue(fooSetting.exists(Settings.builder().put("foo", "bar").build()));
}

public void testExistsWithSecure() {
final MockSecureSettings secureSettings = new MockSecureSettings();
secureSettings.setString("foo", "foo");
Setting<String> fooSetting = Setting.simpleString("foo", Property.NodeScope);
assertFalse(fooSetting.exists(Settings.builder().setSecureSettings(secureSettings).build()));
}

public void testExistsWithFallback() {
final int count = randomIntBetween(1, 16);
Setting<String> current = Setting.simpleString("fallback0", Property.NodeScope);
Expand Down