SONAR-6693 WS issue_filters/search replace favourite by favorite

5 files changed, 17 insertions, 17 deletions

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/IssueFilterWithFavourite.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWithFavorite.java
index b0dc2b05245..4c5949b97cd 100644
--- 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/IssueFilterWithFavorite.java
@@ -23,11 +23,11 @@ package org.sonar.server.issue.filter;
 import javax.annotation.Nullable;
 import org.sonar.db.issue.IssueFilterDto;
 
-public class IssueFilterWithFavourite {
+public class IssueFilterWithFavorite {
   private final IssueFilterDto issueFilter;
   private final Boolean isFavourite;
 
-  public IssueFilterWithFavourite(IssueFilterDto issueFilter, Boolean isFavourite) {
+  public IssueFilterWithFavorite(IssueFilterDto issueFilter, Boolean isFavourite) {
     this.issueFilter = issueFilter;
     this.isFavourite = isFavourite;
   }
@@ -37,7 +37,7 @@ public class IssueFilterWithFavourite {
   }
 
   @Nullable
-  public Boolean isFavourite() {
+  public Boolean isFavorite() {
     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
     }
   ]
 }