From a1da17682267f9cda27504286d98e1e0b96a38d1 Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Thu, 27 Aug 2015 10:11:02 +0200 Subject: SONAR-6693 WS issue_filters/search replace favourite by favorite --- .../server/issue/filter/IssueFilterJsonWriter.java | 10 ++--- .../issue/filter/IssueFilterWithFavorite.java | 43 ++++++++++++++++++++++ .../issue/filter/IssueFilterWithFavourite.java | 43 ---------------------- .../sonar/server/issue/filter/SearchAction.java | 2 +- .../sonar/server/issue/filter/search-example.json | 8 ++-- .../issue/filter/SearchActionTest/search.json | 8 ++-- 6 files changed, 57 insertions(+), 57 deletions(-) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWithFavorite.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWithFavourite.java (limited to 'server') diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterJsonWriter.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterJsonWriter.java index 272f4614acb..ef947c98697 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterJsonWriter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterJsonWriter.java @@ -38,11 +38,11 @@ class IssueFilterJsonWriter { static void writeWithName(JsonWriter json, IssueFilterDto filter, UserSession userSession) { json.name("filter"); - write(json, new IssueFilterWithFavourite(filter, null), userSession); + write(json, new IssueFilterWithFavorite(filter, null), userSession); } - static void write(JsonWriter json, IssueFilterWithFavourite issueFilterWithFavourite, UserSession userSession) { - IssueFilterDto issueFilter = issueFilterWithFavourite.issueFilter(); + static void write(JsonWriter json, IssueFilterWithFavorite issueFilterWithFavorite, UserSession userSession) { + IssueFilterDto issueFilter = issueFilterWithFavorite.issueFilter(); json .beginObject() .prop("id", String.valueOf(issueFilter.getId())) @@ -52,8 +52,8 @@ class IssueFilterJsonWriter { .prop("shared", issueFilter.isShared()) .prop("query", issueFilter.getData()) .prop("canModify", canModifyFilter(userSession, issueFilter)); - if (issueFilterWithFavourite.isFavourite() != null) { - json.prop("favourite", issueFilterWithFavourite.isFavourite()); + if (issueFilterWithFavorite.isFavorite() != null) { + json.prop("favorite", issueFilterWithFavorite.isFavorite()); } json.endObject(); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWithFavorite.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWithFavorite.java new file mode 100644 index 00000000000..4c5949b97cd --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWithFavorite.java @@ -0,0 +1,43 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +package org.sonar.server.issue.filter; + +import javax.annotation.Nullable; +import org.sonar.db.issue.IssueFilterDto; + +public class IssueFilterWithFavorite { + private final IssueFilterDto issueFilter; + private final Boolean isFavourite; + + public IssueFilterWithFavorite(IssueFilterDto issueFilter, Boolean isFavourite) { + this.issueFilter = issueFilter; + this.isFavourite = isFavourite; + } + + public IssueFilterDto issueFilter() { + return issueFilter; + } + + @Nullable + public Boolean isFavorite() { + return isFavourite; + } +} diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWithFavourite.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWithFavourite.java deleted file mode 100644 index b0dc2b05245..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWithFavourite.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package org.sonar.server.issue.filter; - -import javax.annotation.Nullable; -import org.sonar.db.issue.IssueFilterDto; - -public class IssueFilterWithFavourite { - private final IssueFilterDto issueFilter; - private final Boolean isFavourite; - - public IssueFilterWithFavourite(IssueFilterDto issueFilter, Boolean isFavourite) { - this.issueFilter = issueFilter; - this.isFavourite = isFavourite; - } - - public IssueFilterDto issueFilter() { - return issueFilter; - } - - @Nullable - public Boolean isFavourite() { - return isFavourite; - } -} 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 71ee8891613..8762e28c6fb 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 @@ -78,7 +78,7 @@ public class SearchAction implements IssueFilterWsAction { json.beginObject(); json.name("issueFilters").beginArray(); for (IssueFilterDto issueFilter : issueFilters) { - IssueFilterJsonWriter.write(json, new IssueFilterWithFavourite(issueFilter, isFavourite(issueFilter, userFavouritesByFilterId)), userSession); + IssueFilterJsonWriter.write(json, new IssueFilterWithFavorite(issueFilter, isFavourite(issueFilter, userFavouritesByFilterId)), userSession); } json.endArray(); diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/search-example.json b/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/search-example.json index cb981b8211d..b303d6430ef 100644 --- a/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/search-example.json +++ b/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/search-example.json @@ -7,7 +7,7 @@ "query": "resolved=false|assignees=__me__", "user": "[SonarQube]", "canModify": false, - "favourite": true + "favorite": true }, { "id": "2", @@ -16,7 +16,7 @@ "query": "resolutions=FALSE-POSITIVE,WONTFIX", "user": "[SonarQube]", "canModify": false, - "favourite": false + "favorite": false }, { "id": "12", @@ -25,7 +25,7 @@ "query": "resolved=false", "user": "grace.hopper", "canModify": true, - "favourite": false + "favorite": false }, { "id": "54", @@ -34,7 +34,7 @@ "query": "resolved=false|statuses=OPEN,REOPENED|assignees=__me__", "user": "grace.hopper", "canModify": true, - "favourite": true + "favorite": true } ] } diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/filter/SearchActionTest/search.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/filter/SearchActionTest/search.json index a9bb2c4c541..7bbcb909081 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/issue/filter/SearchActionTest/search.json +++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/filter/SearchActionTest/search.json @@ -6,7 +6,7 @@ "query": "resolved=false|assignees=__me__", "user": "[SonarQube]", "canModify": false, - "favourite": true + "favorite": true }, { "name": "False Positive and Won't Fix Issues", @@ -14,7 +14,7 @@ "query": "resolutions=FALSE-POSITIVE,WONTFIX", "user": "[SonarQube]", "canModify": false, - "favourite": false + "favorite": false }, { "name": "Unresolved Issues", @@ -22,7 +22,7 @@ "query": "resolved=false", "user": "grace.hopper", "canModify": true, - "favourite": false + "favorite": false }, { "name": "My Custom Filter", @@ -30,7 +30,7 @@ "query": "resolved=false|statuses=OPEN,REOPENED|assignees=__me__", "user": "grace.hopper", "canModify": true, - "favourite": true + "favorite": true } ] } -- cgit v1.2.3