SONAR-6693 WS issue_filters/search return both favorite and non favorite filters

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/AppAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/AppAction.java
index 8facc8d02de7b424e20e18160dd0ad47ec561a4e..1025d1cd68bef51571612a5f13b93758b68ca06a 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/AppAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/AppAction.java
@@ -48,7 +48,7 @@ public class AppAction implements IssueFilterWsAction {
       .setDescription("Data required for rendering the page 'Issues'")
       .setInternal(true)
       .setHandler(this)
-      .setResponseExample(Resources.getResource(this.getClass(), "app-example-show.json"));
+      .setResponseExample(Resources.getResource(this.getClass(), "example-app.json"));
     action
       .createParam("id")
       .setDescription("Optionally, the ID of the current filter");

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/SearchAction.java
index f7e5ab9e2050e9cd7ddaa00866fcc4d2f7e8b8f4..2c1f3d2a59bdc1e48a6a29749d45ba09971e73ea 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/SearchAction.java
@@ -49,7 +49,7 @@ public class SearchAction implements IssueFilterWsAction {
       .setInternal(false)
       .setHandler(this)
       .setSince("5.2")
-      .setResponseExample(Resources.getResource(this.getClass(), "search-example-show.json"));
+      .setResponseExample(Resources.getResource(this.getClass(), "example-search.json"));
   }
 
   @Override
@@ -59,8 +59,8 @@ public class SearchAction implements IssueFilterWsAction {
 
     // Favorite filters, if logged in
     if (userSession.isLoggedIn()) {
-      List<IssueFilterDto> favorites = service.findFavoriteFilters(userSession);
-      json.name("favorites").beginArray();
+      List<IssueFilterDto> favorites = service.findByUser(userSession);
+      json.name("issueFilters").beginArray();
       for (IssueFilterDto favorite : favorites) {
         issueFilterJsonWriter.write(json, favorite, userSession);
       }

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/app-example-show.json b/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/app-example-show.json
deleted file mode 100644 (file)
index 982d0ef..0000000
--- a/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/app-example-show.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "canManageFilters": true,
-  "canBulkChange": true,
-  "filter": {
-    "id": 8,
-    "name": "My Issues To Fix",
-    "description": "",
-    "user": "john.snow",
-    "shared": false,
-    "query": "asc=false|assignees=john.snow|statuses=OPEN,CONFIRMED,REOPENED",
-    "canModify": true
-  },
-  "favorites": [
-    {
-      "id": 8,
-      "name": "My Issues To Fix"
-    },
-    {
-      "id": 22,
-      "name": "SonarQube Issues"
-    }
-  ]
-}

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/example-app.json b/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/example-app.json
new file mode 100644 (file)
index 0000000..982d0ef
--- /dev/null
+++ b/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/example-app.json
@@ -0,0 +1,23 @@
+{
+  "canManageFilters": true,
+  "canBulkChange": true,
+  "filter": {
+    "id": 8,
+    "name": "My Issues To Fix",
+    "description": "",
+    "user": "john.snow",
+    "shared": false,
+    "query": "asc=false|assignees=john.snow|statuses=OPEN,CONFIRMED,REOPENED",
+    "canModify": true
+  },
+  "favorites": [
+    {
+      "id": 8,
+      "name": "My Issues To Fix"
+    },
+    {
+      "id": 22,
+      "name": "SonarQube Issues"
+    }
+  ]
+}

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/example-search.json b/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/example-search.json
new file mode 100644 (file)
index 0000000..ff666a7
--- /dev/null
+++ b/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/example-search.json
@@ -0,0 +1,25 @@
+{
+  "issueFilters": [
+    {
+      "id": 3,
+      "name": "My Unresolved Issues",
+      "shared": true,
+      "query": "resolved=false|assignees=__me__",
+      "canModify": true
+    },
+    {
+      "id": 2,
+      "name": "False Positive and Won't Fix Issues",
+      "shared": true,
+      "query": "resolutions=FALSE-POSITIVE,WONTFIX",
+      "canModify": true
+    },
+    {
+      "id": 1,
+      "name": "Unresolved Issues",
+      "shared": true,
+      "query": "resolved=false",
+      "canModify": true
+    }
+  ]
+}

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/search-example-show.json b/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/search-example-show.json
deleted file mode 100644 (file)
index dbf2ac8..0000000
--- a/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/search-example-show.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "favorites": [
-    {
-      "id": 3,
-      "name": "My Unresolved Issues",
-      "shared": true,
-      "query": "resolved=false|assignees=__me__",
-      "canModify": true
-    },
-    {
-      "id": 2,
-      "name": "False Positive and Won't Fix Issues",
-      "shared": true,
-      "query": "resolutions=FALSE-POSITIVE,WONTFIX",
-      "canModify": true
-    },
-    {
-      "id": 1,
-      "name": "Unresolved Issues",
-      "shared": true,
-      "query": "resolved=false",
-      "canModify": true
-    }
-  ]
-}

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/SearchActionTest.java
index 1d9c0b57698caa56bbdc7f25e0512cde72a8985a..33fb4c24198af01bd7557815e47d23d3c5108652 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/SearchActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/SearchActionTest.java
@@ -34,8 +34,8 @@ import static org.sonar.test.JsonAssert.assertJson;
 
 public class SearchActionTest {
   static final String EMPTY_JSON = "{}";
-  static final String EMPTY_FAVORITES_JSON = "{" +
-    "    \"favorites\": []" +
+  static final String EMPTY_ISSUE_FILTERS_JSON = "{" +
+    "    \"issueFilters\": []" +
     "}";
 
   @Rule
@@ -63,13 +63,13 @@ public class SearchActionTest {
     userSessionRule.login("eric").setUserId(123);
     WsTester.Result result = ws.newGetRequest("api/issue_filters", "search").execute();
 
-    assertJson(result.outputAsString()).isSimilarTo(EMPTY_FAVORITES_JSON);
+    assertJson(result.outputAsString()).isSimilarTo(EMPTY_ISSUE_FILTERS_JSON);
   }
 
   @Test
-  public void logged_in_app_with_favorites() throws Exception {
+  public void logged_in_app_with_all_issue_filters() throws Exception {
     userSessionRule.login("eric").setUserId(123);
-    when(service.findFavoriteFilters(userSessionRule)).thenReturn(Arrays.asList(
+    when(service.findByUser(userSessionRule)).thenReturn(Arrays.asList(
       new IssueFilterDto()
         .setId(3L)
         .setName("My Unresolved Issues")

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/filter/SearchActionTest/logged_in_page_with_favorites.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/filter/SearchActionTest/logged_in_page_with_favorites.json
index bbaa677e0faeb208926a086cb0a1df955b813efc..d8d652713616b005443a7a8b40a9fdf269400755 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/filter/SearchActionTest/logged_in_page_with_favorites.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/filter/SearchActionTest/logged_in_page_with_favorites.json
@@ -1,18 +1,18 @@
 {
-    "favorites": [
-        {
-            "id": 3,
-            "name": "My Unresolved Issues",
-            "shared": true,
-            "query": "resolved=false|assignees=__me__",
-            "canModify": false
-        },
-        {
-            "id": 2,
-            "name": "False Positive and Won't Fix Issues",
-            "shared": false,
-            "query": "resolutions=FALSE-POSITIVE,WONTFIX",
-            "canModify": false
-        }
-    ]
+  "issueFilters": [
+    {
+      "id": 3,
+      "name": "My Unresolved Issues",
+      "shared": true,
+      "query": "resolved=false|assignees=__me__",
+      "canModify": false
+    },
+    {
+      "id": 2,
+      "name": "False Positive and Won't Fix Issues",
+      "shared": false,
+      "query": "resolutions=FALSE-POSITIVE,WONTFIX",
+      "canModify": false
+    }
+  ]
 }