Remove support default settings

Support for default settings has been removed in core and so some
methods were refactored. This commit responds to this change in core.

Original commit: elastic/x-pack-elasticsearch@b22c612de4
This commit is contained in:
Jason Tedor 2017-04-13 13:47:28 -04:00
parent 4245672acd
commit 8e2299f994
3 changed files with 3 additions and 3 deletions

View File

@ -87,7 +87,7 @@ public class OldMonitoringIndicesBackwardsCompatibilityTests extends AbstractOld
httpExporter.put("auth.username", SecuritySettingsSource.DEFAULT_USER_NAME);
httpExporter.put("auth.password", SecuritySettingsSource.DEFAULT_PASSWORD);
settings.putProperties(httpExporter, k -> true, k -> MonitoringSettings.EXPORTERS_SETTINGS.getKey() + "my_exporter." + k);
settings.putProperties(httpExporter, k -> MonitoringSettings.EXPORTERS_SETTINGS.getKey() + "my_exporter." + k);
}
@Override

View File

@ -218,7 +218,7 @@ public class JiraAccountTests extends ESTestCase {
if (setting.getValue() instanceof String) {
builder.put(key, setting.getValue());
} else if (setting.getValue() instanceof Map) {
builder.putProperties((Map) setting.getValue(), s -> true, s -> key + "." + s);
builder.putProperties((Map) setting.getValue(), s -> key + "." + s);
}
}
}

View File

@ -265,7 +265,7 @@ public class ExecutableJiraActionTests extends ESTestCase {
.put("url", "https://internal-jira.elastic.co:443")
.put("user", "elastic")
.put("password", "secret")
.putProperties(accountFields, s -> true, s -> "issue_defaults." + s);
.putProperties(accountFields, s -> "issue_defaults." + s);
JiraAccount account = new JiraAccount("account", settings.build(), mock(HttpClient.class));