From 0cf76e9ee1fa4f1e6c2fd210cd180481c9db29e0 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Fri, 2 Jun 2017 15:17:20 -0700 Subject: [PATCH] Tests: Make secure settings available from settings builder for tests This commit exposes the secure settings in Settings.Builder, so that the current secure settings can be retrieved and added to when creating settings for tests. This is necessary since secure settings can only be added once to a builder, so chains of methods using settings builders must reuse the already set mock secure settings. --- .../java/org/elasticsearch/common/settings/Settings.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/src/main/java/org/elasticsearch/common/settings/Settings.java b/core/src/main/java/org/elasticsearch/common/settings/Settings.java index b0a1f2ed09f59..eea24179242d5 100644 --- a/core/src/main/java/org/elasticsearch/common/settings/Settings.java +++ b/core/src/main/java/org/elasticsearch/common/settings/Settings.java @@ -721,6 +721,11 @@ public String get(String key) { return map.get(key); } + /** Return the current secure settings, or {@code null} if none have been set. */ + public SecureSettings getSecureSettings() { + return secureSettings.get(); + } + public Builder setSecureSettings(SecureSettings secureSettings) { if (secureSettings.isLoaded() == false) { throw new IllegalStateException("Secure settings must already be loaded");