SONAR-6047 dirPath should not begin by "/"

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueResultSetIterator.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueResultSetIterator.java
index 7bb8c882c9d27a8373b7e49313fd6ea11a85d86f..b305f35c2572a670536f962f2064f0dd59c53070 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueResultSetIterator.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueResultSetIterator.java
@@ -147,12 +147,11 @@ class IssueResultSetIterator extends ResultSetIterator<IssueDoc> {
   @CheckForNull
   private static String extractDirPath(@Nullable String filePath) {
     if (filePath != null) {
-      StringBuilder dirPath = new StringBuilder("/");
       int lastSlashIndex = CharMatcher.anyOf("/").lastIndexIn(filePath);
       if (lastSlashIndex > 0) {
-        dirPath.append(filePath.substring(0, lastSlashIndex));
+        return filePath.substring(0, lastSlashIndex);
       }
-      return dirPath.toString();
+      return "/";
     }
     return null;
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java
index ce16b9fa94ddfb1cd21625a245376e5ad7ed3743..094e35db90838dde5b2ec8bd211e5721e2ab2619 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java
@@ -64,7 +64,7 @@ public class IssueIndexerTest {
     assertThat(doc.componentUuid()).isEqualTo("THE_FILE");
     assertThat(doc.moduleUuid()).isEqualTo("THE_PROJECT");
     assertThat(doc.modulePath()).isEqualTo(".THE_PROJECT.");
-    assertThat(doc.directoryPath()).isEqualTo("/src/main/java");
+    assertThat(doc.directoryPath()).isEqualTo("src/main/java");
     assertThat(doc.severity()).isEqualTo("BLOCKER");
     assertThat(doc.ruleKey()).isEqualTo(RuleKey.of("squid", "AvoidCycles"));
 

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueResultSetIteratorTest.java
index bb540e9548d500700ac9adfd7fb8445d5fcb8090..c4de18dc648892d2d302423b102e12d15f525ce0 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueResultSetIteratorTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueResultSetIteratorTest.java
@@ -104,7 +104,7 @@ public class IssueResultSetIteratorTest {
     assertThat(issuesByKey).hasSize(3);
 
     // File in sub directoy
-    assertThat(issuesByKey.get("ABC").directoryPath()).isEqualTo("/src/main/java");
+    assertThat(issuesByKey.get("ABC").directoryPath()).isEqualTo("src/main/java");
 
     // File in root directoy
     assertThat(issuesByKey.get("DEF").directoryPath()).isEqualTo("/");

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java
index e0820eed055ad1296e13d1efe5d6e8b8345723a2..8945a6132f78f03c96c7e3446231c40eb1b3b917 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java
@@ -359,12 +359,12 @@ public class SearchActionMediumTest {
     tester.get(IssueIndexer.class).indexAll();
 
     wsTester.newGetRequest(IssuesWs.API_ENDPOINT, SearchAction.SEARCH_ACTION)
-      .setParam(IssueFilterParameters.DIRECTORIES, "/src/main/java/dir")
+      .setParam(IssueFilterParameters.DIRECTORIES, "src/main/java/dir")
       .execute()
       .assertJson(this.getClass(), "search_by_file_uuid.json", false);
 
     wsTester.newGetRequest(IssuesWs.API_ENDPOINT, SearchAction.SEARCH_ACTION)
-      .setParam(IssueFilterParameters.DIRECTORIES, "/src/main/java")
+      .setParam(IssueFilterParameters.DIRECTORIES, "src/main/java")
       .execute()
       .assertJson(this.getClass(), "no_issue.json", false);
   }

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_directory_facet.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_directory_facet.json
index 53f067312f752006be68e2579483917b08ba0abc..1df736cb25c4225700c3fe144c7060edd49235ee 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_directory_facet.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_directory_facet.json
@@ -4,7 +4,7 @@
       "property": "directories",
       "values": [
         {
-          "val": "/src/main/java/dir",
+          "val": "src/main/java/dir",
           "count": 1
         }
       ]