SONAR-5755 Fix computation of UUIDs to support views

diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultResourcePersister.java b/sonar-batch/src/main/java/org/sonar/batch/index/DefaultResourcePersister.java
index ac4c026b667352997f568a3f18340158b95e50b7..1aad14dcd99db5e8742931b05a3359a5c620b957 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultResourcePersister.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/index/DefaultResourcePersister.java
@@ -331,15 +331,12 @@ public final class DefaultResourcePersister implements ResourcePersister {
       } else {
         model.setProjectUuid(parentModel.getUuid());
       }
-      if (Qualifiers.isProject(parentResource, true)) {
+      if (Scopes.isProject(parentResource)) {
         model.setModuleUuid(parentResource.getUuid());
-      } else {
-        model.setModuleUuid(parentModel.getModuleUuid());
-      }
-      if (Qualifiers.isProject(parentResource, true)) {
         String parentModuleUuidPath = parentModel.getModuleUuidPath();
         model.setModuleUuidPath(parentModuleUuidPath != null ? parentModuleUuidPath + "." + parentModel.getUuid() : parentModel.getUuid());
       } else {
+        model.setModuleUuid(parentModel.getModuleUuid());
         String parentModuleUuidPath = parentModel.getModuleUuidPath();
         model.setModuleUuidPath(parentModuleUuidPath != null ? parentModuleUuidPath : parentModel.getUuid());
       }