From 8e2299f994bab84d34ef2cefd34976d75f11da39 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Thu, 13 Apr 2017 13:47:28 -0400 Subject: [PATCH] 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@b22c612de46e48ac4ca1560bb69cd3ce0b0e60c4 --- .../OldMonitoringIndicesBackwardsCompatibilityTests.java | 2 +- .../elasticsearch/xpack/notification/jira/JiraAccountTests.java | 2 +- .../xpack/watcher/actions/jira/ExecutableJiraActionTests.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin/src/test/java/org/elasticsearch/xpack/monitoring/OldMonitoringIndicesBackwardsCompatibilityTests.java b/plugin/src/test/java/org/elasticsearch/xpack/monitoring/OldMonitoringIndicesBackwardsCompatibilityTests.java index 25002f80b27..1cda858f8f8 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/monitoring/OldMonitoringIndicesBackwardsCompatibilityTests.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/monitoring/OldMonitoringIndicesBackwardsCompatibilityTests.java @@ -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 diff --git a/plugin/src/test/java/org/elasticsearch/xpack/notification/jira/JiraAccountTests.java b/plugin/src/test/java/org/elasticsearch/xpack/notification/jira/JiraAccountTests.java index 2088e5a7420..c5448d4b76e 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/notification/jira/JiraAccountTests.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/notification/jira/JiraAccountTests.java @@ -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); } } } diff --git a/plugin/src/test/java/org/elasticsearch/xpack/watcher/actions/jira/ExecutableJiraActionTests.java b/plugin/src/test/java/org/elasticsearch/xpack/watcher/actions/jira/ExecutableJiraActionTests.java index b812451cbfe..2d8de064305 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/watcher/actions/jira/ExecutableJiraActionTests.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/watcher/actions/jira/ExecutableJiraActionTests.java @@ -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));