[NO-JIRA] Remove reported code smells about text blocks

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 89d289724a0e6bb0d63685def635e1548c67d510..64b00823c73d14ce40bc2423aa026d4c2914ce73 100644 (file)
--- 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<EsJvmOptions> {
-  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 c18e78f3fcb6381f28c0ed2239d63f6d32430c4c..0b1535edbb462a602bb98bc7a0dcb94ac161b9c5 100644 (file)
--- 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<String, String> 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 4dca324717324d9c3400fcf586d1193fbf6925b5..30c1284c18c51b4de2203599c3d6bb0301484eb7 100644 (file)
--- 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

diff --git a/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/DefaultAdminCredentialsVerifierNotificationTemplate.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/DefaultAdminCredentialsVerifierNotificationTemplate.java
index 927c77701b13442183de793ff955cc612fa382b8..a9339d43154f445ccc05c672ebc9840016043a58 100644 (file)
--- a/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/DefaultAdminCredentialsVerifierNotificationTemplate.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/DefaultAdminCredentialsVerifierNotificationTemplate.java
@@ -27,9 +27,11 @@ import org.sonar.server.issue.notification.EmailTemplate;
 public class DefaultAdminCredentialsVerifierNotificationTemplate implements EmailTemplate {
 
   static final String SUBJECT = "Default Administrator credentials are still used";
-  static final String BODY_FORMAT = "Hello,\n\n" +
-    "Your SonarQube instance is still using default administrator credentials.\n" +
-    "Make sure to change the password for the 'admin' account or deactivate this account.";
+  static final String BODY_FORMAT = """
+    Hello,
+
+    Your SonarQube instance is still using default administrator credentials.
+    Make sure to change the password for the 'admin' account or deactivate this account.""";
 
   @Override
   @CheckForNull

diff --git a/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/DefaultAdminCredentialsVerifierNotificationTemplateTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/DefaultAdminCredentialsVerifierNotificationTemplateTest.java
index 0e24a9fafe5be9fb1fbc51f583cb9092b0add266..fb24d20f28de2c4e033067c6164b2ebeea06e452 100644 (file)
--- a/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/DefaultAdminCredentialsVerifierNotificationTemplateTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/DefaultAdminCredentialsVerifierNotificationTemplateTest.java
@@ -41,9 +41,11 @@ public class DefaultAdminCredentialsVerifierNotificationTemplateTest {
     EmailMessage emailMessage = underTest.format(notification);
 
     assertThat(emailMessage.getSubject()).isEqualTo("Default Administrator credentials are still used");
-    assertThat(emailMessage.getMessage()).isEqualTo("Hello,\n\n" +
-      "Your SonarQube instance is still using default administrator credentials.\n" +
-      "Make sure to change the password for the 'admin' account or deactivate this account.");
+    assertThat(emailMessage.getMessage()).isEqualTo("""
+      Hello,
+
+      Your SonarQube instance is still using default administrator credentials.
+      Make sure to change the password for the 'admin' account or deactivate this account.""");
   }
 
 }

diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/monitoring/MetricsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/monitoring/MetricsAction.java
index f64e8bb2c9c602886fff6393c8d11407eeef1c86..2467b944575cc8d2997924428d879a6b38b66716 100644 (file)
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/monitoring/MetricsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/monitoring/MetricsAction.java
@@ -38,9 +38,10 @@ public class MetricsAction extends SafeModeMonitoringMetricAction {
   public void define(WebService.NewController context) {
     context.createAction("metrics")
       .setSince("9.3")
-      .setDescription("Return monitoring metrics in Prometheus format. \n" +
-        "Support content type 'text/plain' (default) and 'application/openmetrics-text'.\n" +
-        "this endpoint can be access using a Bearer token, that needs to be defined in sonar.properties with the 'sonar.web.systemPasscode' key.")
+      .setDescription("""
+        Return monitoring metrics in Prometheus format.\s
+        Support content type 'text/plain' (default) and 'application/openmetrics-text'.
+        this endpoint can be access using a Bearer token, that needs to be defined in sonar.properties with the 'sonar.web.systemPasscode' key.""")
       .setResponseExample(getClass().getResource("monitoring-metrics.txt"))
       .setHandler(this);