honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-09 06:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ClusterName#value as the default instead of it's toString method

Browse Source
This commit is contained in:
Simon Willnauer 2016-06-18 08:39:10 +02:00
parent 084b35c08b
commit 420dc72124
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/elasticsearch/node/internal/InternalSettingsPreparer.java
View File

@ -163,7 +163,7 @@ public class InternalSettingsPreparer {
// put the cluster name // put the cluster name
if (output.get(ClusterName.CLUSTER_NAME_SETTING.getKey()) == null) { if (output.get(ClusterName.CLUSTER_NAME_SETTING.getKey()) == null) {
output.put(ClusterName.CLUSTER_NAME_SETTING.getKey(), ClusterName.CLUSTER_NAME_SETTING.getDefault(Settings.EMPTY)); output.put(ClusterName.CLUSTER_NAME_SETTING.getKey(), ClusterName.CLUSTER_NAME_SETTING.getDefault(Settings.EMPTY).value());
} }
replacePromptPlaceholders(output, terminal); replacePromptPlaceholders(output, terminal);

7
core/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java
View File

@ -68,6 +68,13 @@ public class InternalSettingsPreparerTests extends ESTestCase {
assertTrue(configDir, configDir.startsWith(home)); assertTrue(configDir, configDir.startsWith(home));
} }
public void testDefaultClusterName() {
Settings settings = InternalSettingsPreparer.prepareSettings(Settings.EMPTY);
assertEquals("elasticsearch", settings.get("cluster.name"));
settings = InternalSettingsPreparer.prepareSettings(Settings.builder().put("cluster.name", "foobar").build());
assertEquals("foobar", settings.get("cluster.name"));
}
public void testReplacePromptPlaceholders() { public void testReplacePromptPlaceholders() {
MockTerminal terminal = new MockTerminal(); MockTerminal terminal = new MockTerminal();
terminal.addTextInput("text"); terminal.addTextInput("text");