SONAR-11525 message fixes

3 files changed, 17 insertions, 11 deletions

diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v76/DbVersion76.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v76/DbVersion76.java
index 0cdfeaf5f99..550e9b6286d 100644
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v76/DbVersion76.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v76/DbVersion76.java
@@ -29,7 +29,7 @@ public class DbVersion76 implements DbVersion {
     registry
       .add(2500, "Create table USER_PROPERTIES", CreateUserPropertiesTable.class)
       .add(2501, "Add index in table USER_PROPERTIES", AddUniqueIndexInUserPropertiesTable.class)
-      .add(2502, "Move module and directory properties to a project level property", MigrateModuleProperties.class)
+      .add(2502, "Archive module properties in a new project level property", MigrateModuleProperties.class)
       .add(2505, "Fix the direction values of certain metrics (prepare for migration of conditions)", FixDirectionOfMetrics.class)
       .add(2506, "Migrate quality gate conditions using warning, period and no more supported operations", MigrateNoMoreUsedQualityGateConditions.class);
   }
diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v76/MigrateModuleProperties.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v76/MigrateModuleProperties.java
index 8c49e2c62fc..0194084578c 100644
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v76/MigrateModuleProperties.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v76/MigrateModuleProperties.java
@@ -20,6 +20,7 @@
 package org.sonar.server.platform.db.migration.version.v76;
 
 import java.sql.SQLException;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 import org.sonar.api.utils.System2;
 import org.sonar.db.Database;
@@ -80,12 +81,12 @@ public class MigrateModuleProperties extends DataChange {
           if (currentModuleUuid.get() != null && builder.length() != 0) {
             builder.append("\n");
           }
-          builder.append("# previous settings for sub-project ").append(projectName).append("::").append(moduleName).append("\n");
+          builder.append("# Settings from '").append(projectName).append("::").append(moduleName).append("'\n");
           currentModuleUuid.set(moduleUuid);
         }
 
-        String propertyValue = propertyTextValue == null ? propertyClobValue : propertyTextValue;
-        builder.append(propertyKey).append("=").append(propertyValue).append("\n");
+        Optional.ofNullable(Optional.ofNullable(propertyTextValue).orElse(propertyClobValue))
+          .ifPresent(value -> builder.append(propertyKey).append("=").append(value).append("\n"));
       });
 
     if (builder.length() > 0) {
@@ -105,7 +106,7 @@ public class MigrateModuleProperties extends DataChange {
   }
 
   private static void removeModuleProperties(Context context) throws SQLException {
-    MassUpdate massUpdate = context.prepareMassUpdate().rowPluralName("remove module properties");
+    MassUpdate massUpdate = context.prepareMassUpdate().rowPluralName("module level properties");
     massUpdate.select("select prop.id as property_id " +
       "from properties prop " +
       "left join projects mod on mod.id = prop.resource_id " +
diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v76/MigrateModulePropertiesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v76/MigrateModulePropertiesTest.java
index 4692e49ef14..5dd8652de55 100644
--- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v76/MigrateModulePropertiesTest.java
+++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v76/MigrateModulePropertiesTest.java
@@ -53,6 +53,7 @@ public class MigrateModulePropertiesTest {
     underTest.execute();
 
     verifyMultiModuleProjectMigration();
+    assertThat(getRemainingProperties()).hasSize(3);
   }
 
   @Test
@@ -63,8 +64,7 @@ public class MigrateModulePropertiesTest {
     underTest.execute();
 
     verifyMultiModuleProjectMigration();
-    List<Map<String, Object>> remainingProperties = db.select("select ID from properties");
-    assertThat(remainingProperties).hasSize(3);
+    assertThat(getRemainingProperties()).hasSize(3);
   }
 
   @Test
@@ -93,6 +93,11 @@ public class MigrateModulePropertiesTest {
 
     verifyMultiModuleProjectMigration();
     verifySecondMultiModuleProjectMigration();
+    assertThat(getRemainingProperties()).hasSize(5);
+  }
+
+  private List<Map<String, Object>> getRemainingProperties() {
+    return db.select("select ID from properties");
   }
 
   private void insertComponent(long id, String uuid, @Nullable String rootUuid, String projectUuid, String qualifier, String name) {
@@ -137,15 +142,15 @@ public class MigrateModulePropertiesTest {
   }
 
   private void verifyMultiModuleProjectMigration() {
-    final String expectedResult = "# previous settings for sub-project Multi-module project::Module\n" +
+    final String expectedResult = "# Settings from 'Multi-module project::Module'\n" +
       "sonar.coverage.exclusions=ModuleA.java\n" +
       "sonar.cpd.exclusions=ModuleB.java\n" +
       "\n" +
-      "# previous settings for sub-project Multi-module project::Submodule 1\n" +
+      "# Settings from 'Multi-module project::Submodule 1'\n" +
       "sonar.coverage.exclusions=Module1A.java\n" +
       "sonar.cpd.exclusions=Moddule1B.java\n" +
       "\n" +
-      "# previous settings for sub-project Multi-module project::Submodule 2\n" +
+      "# Settings from 'Multi-module project::Submodule 2'\n" +
       "sonar.coverage.exclusions=Module2A.java\n" +
       "sonar.cpd.exclusions=Module2B.java\n";
 
@@ -169,7 +174,7 @@ public class MigrateModulePropertiesTest {
   }
 
   private void verifySecondMultiModuleProjectMigration() {
-    final String expectedResult = "# previous settings for sub-project Another multi-module project::Module X\n" +
+    final String expectedResult = "# Settings from 'Another multi-module project::Module X'\n" +
       "sonar.coverage.exclusions=InModule.java\n";
 
     List<Map<String, Object>> properties = db.select(String.format("select ID, TEXT_VALUE, CLOB_VALUE " +