Fix typo in favourite action name

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/FavoritesWs.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/FavoritesWs.java
deleted file mode 100644 (file)
index 40ce6b8..0000000
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/FavoritesWs.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program 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.
- *
- * This program 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.user.ws;
-
-import org.sonar.api.server.ws.RailsHandler;
-import org.sonar.api.server.ws.WebService;
-
-public class FavoritesWs implements WebService {
-
-  @Override
-  public void define(Context context) {
-    NewController controller = context.createController("api/favorites");
-    controller.setDescription("Manage user favorites.");
-    controller.setSince("2.6");
-
-    defineIndexAction(controller);
-
-    controller.done();
-  }
-
-  private void defineIndexAction(NewController controller) {
-    controller.createAction("index")
-      .setDescription("Documentation of this web service is available <a href=\"http://redirect.sonarsource.com/doc/old-web-service-api.html\">here</a>")
-      .setResponseExample(getClass().getResource("favourites-index-example.xml"))
-      .setSince("2.6")
-      .setHandler(RailsHandler.INSTANCE);
-  }
-}

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/FavouritesWs.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/FavouritesWs.java
new file mode 100644 (file)
index 0000000..7ec8bec
--- /dev/null
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/FavouritesWs.java
@@ -0,0 +1,45 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.user.ws;
+
+import org.sonar.api.server.ws.RailsHandler;
+import org.sonar.api.server.ws.WebService;
+
+public class FavouritesWs implements WebService {
+
+  @Override
+  public void define(Context context) {
+    NewController controller = context.createController("api/favourites");
+    controller.setDescription("Manage user favorites.");
+    controller.setSince("2.6");
+
+    defineIndexAction(controller);
+
+    controller.done();
+  }
+
+  private void defineIndexAction(NewController controller) {
+    controller.createAction("index")
+      .setDescription("Documentation of this web service is available <a href=\"http://redirect.sonarsource.com/doc/old-web-service-api.html\">here</a>")
+      .setResponseExample(getClass().getResource("favourites-index-example.xml"))
+      .setSince("2.6")
+      .setHandler(RailsHandler.INSTANCE);
+  }
+}

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsModule.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsModule.java
index 2b8e05dc78539274f4d38144e826cc779a331b8f..a568fb8c10a41404d9eb4af135e4b5f7d194ba13 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsModule.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsModule.java
@@ -35,7 +35,7 @@ public class UsersWsModule extends Module {
       SearchAction.class,
       GroupsAction.class,
       IdentityProvidersAction.class,
-      FavoritesWs.class,
+      FavouritesWs.class,
       UserPropertiesWs.class,
       UserJsonWriter.class);
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/FavoritesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/FavoritesWsTest.java
deleted file mode 100644 (file)
index da3658d..0000000
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/FavoritesWsTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program 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.
- *
- * This program 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.user.ws;
-
-import org.junit.Test;
-import org.sonar.api.server.ws.WebService;
-import org.sonar.server.ws.WsTester;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class FavoritesWsTest {
-
-  WsTester tester = new WsTester(new FavoritesWs());
-
-  @Test
-  public void define_ws() {
-    WebService.Controller controller = tester.controller("api/favorites");
-    assertThat(controller).isNotNull();
-    assertThat(controller.description()).isNotEmpty();
-    assertThat(controller.actions()).hasSize(1);
-  }
-}

diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/FavouritesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/FavouritesWsTest.java
new file mode 100644 (file)
index 0000000..b3b8220
--- /dev/null
+++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/FavouritesWsTest.java
@@ -0,0 +1,39 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.user.ws;
+
+import org.junit.Test;
+import org.sonar.api.server.ws.WebService;
+import org.sonar.server.ws.WsTester;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FavouritesWsTest {
+
+  WsTester tester = new WsTester(new FavouritesWs());
+
+  @Test
+  public void define_ws() {
+    WebService.Controller controller = tester.controller("api/favourites");
+    assertThat(controller).isNotNull();
+    assertThat(controller.description()).isNotEmpty();
+    assertThat(controller.actions()).hasSize(1);
+  }
+}