From 8868a5ff310c74f44f2c94e46ba31065017f50b4 Mon Sep 17 00:00:00 2001 From: Matteo Mara Date: Fri, 6 Jan 2023 17:11:40 +0100 Subject: [NO-JIRA] Remove reported code smells about text blocks --- .../java/org/sonar/application/command/EsJvmOptions.java | 12 +++++++----- .../main/java/org/sonar/application/es/EsYmlSettings.java | 10 ++++++---- .../java/org/sonar/application/es/EsYmlSettingsTest.java | 13 +++++++------ 3 files changed, 20 insertions(+), 15 deletions(-) (limited to 'server/sonar-main/src') diff --git a/server/sonar-main/src/main/java/org/sonar/application/command/EsJvmOptions.java b/server/sonar-main/src/main/java/org/sonar/application/command/EsJvmOptions.java index 89d289724a0..64b00823c73 100644 --- a/server/sonar-main/src/main/java/org/sonar/application/command/EsJvmOptions.java +++ b/server/sonar-main/src/main/java/org/sonar/application/command/EsJvmOptions.java @@ -30,11 +30,13 @@ import java.util.stream.Collectors; import org.sonar.process.Props; public class EsJvmOptions extends JvmOptions { - private static final String ELASTICSEARCH_JVM_OPTIONS_HEADER = "# This file has been automatically generated by SonarQube during startup.\n" + - "# Please use sonar.search.javaOpts and/or sonar.search.javaAdditionalOpts in sonar.properties to specify jvm options for Elasticsearch\n" + - "\n" + - "# DO NOT EDIT THIS FILE\n" + - "\n"; + private static final String ELASTICSEARCH_JVM_OPTIONS_HEADER = """ + # This file has been automatically generated by SonarQube during startup. + # Please use sonar.search.javaOpts and/or sonar.search.javaAdditionalOpts in sonar.properties to specify jvm options for Elasticsearch + + # DO NOT EDIT THIS FILE + + """; public EsJvmOptions(Props props, File tmpDir) { super(mandatoryOptions(tmpDir, props)); diff --git a/server/sonar-main/src/main/java/org/sonar/application/es/EsYmlSettings.java b/server/sonar-main/src/main/java/org/sonar/application/es/EsYmlSettings.java index c18e78f3fcb..0b1535edbb4 100644 --- a/server/sonar-main/src/main/java/org/sonar/application/es/EsYmlSettings.java +++ b/server/sonar-main/src/main/java/org/sonar/application/es/EsYmlSettings.java @@ -30,10 +30,12 @@ import org.yaml.snakeyaml.Yaml; import static org.yaml.snakeyaml.DumperOptions.FlowStyle.BLOCK; public class EsYmlSettings { - private static final String ELASTICSEARCH_YML_OPTIONS_HEADER = "# This file has been automatically generated by SonarQube during startup.\n" + - "\n" + - "# DO NOT EDIT THIS FILE\n" + - "\n"; + private static final String ELASTICSEARCH_YML_OPTIONS_HEADER = """ + # This file has been automatically generated by SonarQube during startup. + + # DO NOT EDIT THIS FILE + + """; private final Map elasticsearchSettings; diff --git a/server/sonar-main/src/test/java/org/sonar/application/es/EsYmlSettingsTest.java b/server/sonar-main/src/test/java/org/sonar/application/es/EsYmlSettingsTest.java index 4dca3247173..30c1284c18c 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/es/EsYmlSettingsTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/es/EsYmlSettingsTest.java @@ -40,12 +40,13 @@ public class EsYmlSettingsTest { new EsYmlSettings(new HashMap<>()).writeToYmlSettingsFile(yamlFile); assertThat(yamlFile).exists(); - assertThat(yamlFile).hasContent("# This file has been automatically generated by SonarQube during startup.\n" + - "\n" + - "# DO NOT EDIT THIS FILE\n" + - "\n" + - "{\n" + - " }"); + assertThat(yamlFile).hasContent(""" + # This file has been automatically generated by SonarQube during startup. + + # DO NOT EDIT THIS FILE + + { + }"""); } @Test -- cgit v1.2.3