SONAR-6121 Simplify ES requests on module path

2 files changed, 7 insertions, 23 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
index ffbbb656367..260a3a43169 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
@@ -244,7 +244,7 @@ public class IssueIndex extends BaseIndex {
     FilterBuilder viewFilter = createViewFilter(query.viewUuids());
     FilterBuilder componentFilter = createTermsFilter(IssueIndexDefinition.FIELD_ISSUE_COMPONENT_UUID, query.componentUuids());
     FilterBuilder projectFilter = createTermsFilter(IssueIndexDefinition.FIELD_ISSUE_PROJECT_UUID, query.projectUuids());
-    FilterBuilder moduleRootFilter = createModuleRootFilter(query.moduleRootUuids());
+    FilterBuilder moduleRootFilter = createTermsFilter(IssueIndexDefinition.FIELD_ISSUE_MODULE_PATH, query.moduleRootUuids());
     FilterBuilder moduleFilter = createTermsFilter(IssueIndexDefinition.FIELD_ISSUE_MODULE_UUID, query.moduleUuids());
     FilterBuilder directoryFilter = createTermsFilter(IssueIndexDefinition.FIELD_ISSUE_DIRECTORY_PATH, query.directories());
     FilterBuilder fileFilter = createTermsFilter(IssueIndexDefinition.FIELD_ISSUE_COMPONENT_UUID, query.fileUuids());
@@ -266,26 +266,6 @@ public class IssueIndex extends BaseIndex {
   }
 
   @CheckForNull
-  private FilterBuilder createModuleRootFilter(Collection<String> componentUuids) {
-    if (componentUuids.isEmpty()) {
-      return null;
-    }
-    FilterBuilder componentFilter = createTermsFilter(IssueIndexDefinition.FIELD_ISSUE_COMPONENT_UUID, componentUuids);
-    FilterBuilder modulePathFilter = createTermsFilter(IssueIndexDefinition.FIELD_ISSUE_MODULE_PATH, componentUuids);
-    FilterBuilder compositeFilter = null;
-    if (componentFilter != null) {
-      if (modulePathFilter != null) {
-        compositeFilter = FilterBuilders.orFilter(componentFilter, modulePathFilter);
-      } else {
-        compositeFilter = componentFilter;
-      }
-    } else if (modulePathFilter != null) {
-      compositeFilter = modulePathFilter;
-    }
-    return compositeFilter;
-  }
-
-  @CheckForNull
   private FilterBuilder createViewFilter(Collection<String> viewUuids) {
     if (viewUuids.isEmpty()) {
       return null;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java
index 620accd0afc..bcb34731db5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java
@@ -57,7 +57,7 @@ public class ComponentTesting {
   }
 
   public static ComponentDto newModuleDto(String uuid, ComponentDto subProjectOrProject) {
-    return newChildComponent(uuid, subProjectOrProject)
+    return newChildComponent(uuid, subProjectOrProject, true)
       .setKey("KEY_" + uuid)
       .setName("NAME_" + uuid)
       .setLongName("LONG_NAME_" + uuid)
@@ -131,11 +131,15 @@ public class ComponentTesting {
   }
 
   private static ComponentDto newChildComponent(String uuid, ComponentDto module) {
+    return newChildComponent(uuid, module, false);
+  }
+
+  private static ComponentDto newChildComponent(String uuid, ComponentDto module, boolean isModule) {
     return new ComponentDto()
       .setUuid(uuid)
       .setProjectUuid(module.projectUuid())
       .setModuleUuid(module.uuid())
-      .setModuleUuidPath(module.moduleUuidPath() + module.uuid() + MODULE_UUID_PATH_SEP)
+      .setModuleUuidPath(module.moduleUuidPath() + module.uuid() + MODULE_UUID_PATH_SEP + (isModule ? uuid + MODULE_UUID_PATH_SEP : ""))
       .setParentProjectId(module.getId())
       .setEnabled(true);
   }