SONAR-5878 Fix regression on deep multi-module projects after previous change

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorBuilder.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorBuilder.java
index 9c1775d23a8c44f187a2ab4ce123fe806a137a2f..f4d92aab72ad96e3ccc130ae1706669be8f2af3b 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorBuilder.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorBuilder.java
@@ -43,14 +43,10 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
 
 /**
  * Class that creates a project definition based on a set of properties.
@@ -115,15 +111,7 @@ public class ProjectReactorBuilder {
   public ProjectReactor execute() {
     Properties allProperties = new Properties();
     allProperties.putAll(taskProps.properties());
-    SortedSet<String> moduleIds = new TreeSet<String>(new Comparator<String>() {
-      @Override
-      public int compare(String o1, String o2) {
-        // Reverse string order
-        return o2.compareTo(o1);
-      }
-    });
-    collectModuleIds(null, allProperties, moduleIds);
-    Map<String, Properties> propertiesByModuleId = extractPropertiesByModule(allProperties, new ArrayList<String>(moduleIds));
+    Map<String, Properties> propertiesByModuleId = extractPropertiesByModule("", allProperties);
     ProjectDefinition rootProject = defineRootProject(propertiesByModuleId.get(""), null);
     rootProjectWorkDir = rootProject.getWorkDir();
     defineChildren(rootProject, propertiesByModuleId);
@@ -133,42 +121,27 @@ public class ProjectReactorBuilder {
     return new ProjectReactor(rootProject);
   }
 
-  private Map<String, Properties> extractPropertiesByModule(Properties allProperties, List<String> moduleIds) {
-    Map<String, Properties> result = new HashMap<String, Properties>();
-    for (String moduleId : moduleIds) {
-      result.put(moduleId, new Properties());
-    }
-    // For root module
-    result.put("", new Properties());
-
+  private Map<String, Properties> extractPropertiesByModule(String currentModuleId, Properties parentProperties) {
+    Properties allProperties = new Properties();
+    allProperties.putAll(parentProperties);
+    Properties currentModuleProperties = new Properties();
+    String prefix = !currentModuleId.isEmpty() ? currentModuleId + "." : "";
+    // By default all properties starting with module prefix belong to current module
     for (Map.Entry<Object, Object> entry : allProperties.entrySet()) {
       String key = (String) entry.getKey();
-      boolean found = false;
-      for (String moduleId : moduleIds) {
-        String propertyPrefix = moduleId + ".";
-        int prefixLength = propertyPrefix.length();
-        if (key.startsWith(propertyPrefix)) {
-          result.get(moduleId).put(key.substring(prefixLength), entry.getValue());
-          found = true;
-          break;
-        }
-      }
-      if (!found) {
-        result.get("").put(key, entry.getValue());
+      int prefixLength = prefix.length();
+      if (key.startsWith(prefix)) {
+        currentModuleProperties.put(key.substring(prefixLength), entry.getValue());
+        parentProperties.remove(key);
       }
     }
-    return result;
-  }
-
-  private void collectModuleIds(String currentModuleId, Properties allProperties, Set<String> moduleIds) {
-    if (currentModuleId != null) {
-      if (!moduleIds.add(currentModuleId)) {
-        throw new IllegalStateException("Module ID '" + currentModuleId + "' is defined several times in the reactor");
-      }
-    }
-    for (String moduleId : getListFromProperty(allProperties, (currentModuleId == null ? "" : (currentModuleId + ".")) + PROPERTY_MODULES)) {
-      collectModuleIds(moduleId, allProperties, moduleIds);
+    String[] moduleIds = getListFromProperty(currentModuleProperties, PROPERTY_MODULES);
+    Map<String, Properties> result = new HashMap<String, Properties>();
+    for (String moduleId : moduleIds) {
+      result.putAll(extractPropertiesByModule(moduleId, currentModuleProperties));
     }
+    result.put(currentModuleId, currentModuleProperties);
+    return result;
   }
 
   protected ProjectDefinition defineRootProject(Properties rootProperties, @Nullable ProjectDefinition parent) {

diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/sonar-project.properties b/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/sonar-project.properties
index bbc6f993ffb507a1235775ed2f6f44a815e93f01..12111920f3b6959c4066f2600e94e244a4cb32fa 100644 (file)
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/sonar-project.properties
+++ b/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/sonar-project.properties
@@ -12,5 +12,5 @@ sonar.modules=module1,module2
 
 module1.sonar.modules=module11,module12
 
-module11.property=My module11 property
+module1.module11.property=My module11 property