From 8fda5d0298d4460986233b58199b183792db2620 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Mon, 27 Oct 2014 09:56:13 +0100 Subject: [PATCH] SONAR-5755 Fix computation of UUIDs to support views --- .../org/sonar/batch/index/DefaultResourcePersister.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 ac4c026b667..1aad14dcd99 100644 --- 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()); } -- 2.39.5