From 0f15f1633e5dfa9b24a61a524f963fc0f68d08c7 Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Tue, 28 Jul 2015 17:51:57 +0200 Subject: SONAR-6693 WS issue_filters/search return both favorite and non favorite filters --- .../org/sonar/server/issue/filter/AppAction.java | 2 +- .../sonar/server/issue/filter/SearchAction.java | 6 ++-- .../server/issue/filter/app-example-show.json | 23 ---------------- .../org/sonar/server/issue/filter/example-app.json | 23 ++++++++++++++++ .../sonar/server/issue/filter/example-search.json | 25 +++++++++++++++++ .../server/issue/filter/search-example-show.json | 25 ----------------- .../server/issue/filter/SearchActionTest.java | 10 +++---- .../logged_in_page_with_favorites.json | 32 +++++++++++----------- 8 files changed, 73 insertions(+), 73 deletions(-) delete mode 100644 server/sonar-server/src/main/resources/org/sonar/server/issue/filter/app-example-show.json create mode 100644 server/sonar-server/src/main/resources/org/sonar/server/issue/filter/example-app.json create mode 100644 server/sonar-server/src/main/resources/org/sonar/server/issue/filter/example-search.json delete mode 100644 server/sonar-server/src/main/resources/org/sonar/server/issue/filter/search-example-show.json (limited to 'server') 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 8facc8d02de..1025d1cd68b 100644 --- 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 f7e5ab9e205..2c1f3d2a59b 100644 --- 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 favorites = service.findFavoriteFilters(userSession); - json.name("favorites").beginArray(); + List 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 index 982d0ef6460..00000000000 --- 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 index 00000000000..982d0ef6460 --- /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 index 00000000000..ff666a72a78 --- /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 index dbf2ac8b8d1..00000000000 --- 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 1d9c0b57698..33fb4c24198 100644 --- 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 bbaa677e0fa..d8d65271361 100644 --- 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 + } + ] } -- cgit v1.2.3