rename web services with the xxxWs form

3 files changed, 8 insertions, 8 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/RubyRailsWebservice.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/RubyRailsWebservice.java
index d61936f5d38..67be027294a 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/RubyRailsWebservice.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/RubyRailsWebservice.java
@@ -29,7 +29,7 @@ package org.sonar.api.web;
  * and will call the index controller method if not specified.
  *
  * @since 1.11
- * @deprecated in 4.2. Replaced by {@link org.sonar.api.web.ws.WebService}
+ * @deprecated in 4.2. Replaced by {@link org.sonar.api.server.ws.WebService}
  */
 @Deprecated
 public interface RubyRailsWebservice extends Webservice {
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/RequestTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/RequestTest.java
index e0ba0f40ef3..24a0f2a69fb 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/RequestTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/RequestTest.java
@@ -73,7 +73,7 @@ public class RequestTest {
     }
   }
 
-  private static class SimpleWebService implements WebService {
+  private static class SimpleWs implements WebService {
 
     @Override
     public void define(Context context) {
@@ -114,7 +114,7 @@ public class RequestTest {
   @Before
   public void before() {
     WebService.Context context = new WebService.Context();
-    new SimpleWebService().define(context);
+    new SimpleWs().define(context);
     request.setAction(context.controller("my_controller").action("my_action"));
   }
 
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/WebServiceTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/WebServiceTest.java
index 9226ea1af60..006aae7c064 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/WebServiceTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/WebServiceTest.java
@@ -35,7 +35,7 @@ import static org.mockito.Mockito.mock;
 
 public class WebServiceTest {
 
-  static class MetricWebService implements WebService {
+  static class MetricWs implements WebService {
     boolean showCalled = false, createCalled = false;
 
     @Override
@@ -89,7 +89,7 @@ public class WebServiceTest {
 
   @Test
   public void define_web_service() {
-    MetricWebService metricWs = new MetricWebService();
+    MetricWs metricWs = new MetricWs();
 
     metricWs.define(context);
 
@@ -125,7 +125,7 @@ public class WebServiceTest {
 
   @Test
   public void fail_if_duplicated_ws_keys() {
-    MetricWebService metricWs = new MetricWebService();
+    MetricWs metricWs = new MetricWs();
     metricWs.define(context);
     try {
       new WebService() {
@@ -240,7 +240,7 @@ public class WebServiceTest {
 
   @Test
   public void handle_request() throws Exception {
-    MetricWebService metricWs = new MetricWebService();
+    MetricWs metricWs = new MetricWs();
     metricWs.define(context);
 
     assertThat(metricWs.showCalled).isFalse();
@@ -416,7 +416,7 @@ public class WebServiceTest {
 
   @Test
   public void response_example() {
-    MetricWebService metricWs = new MetricWebService();
+    MetricWs metricWs = new MetricWs();
     metricWs.define(context);
     WebService.Action action = context.controller("api/metric").action("create");