1297 files changed, 643 insertions, 276 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationModule.java b/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationModule.java
index 4ec1a69c2f7..8309447b400 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationModule.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationModule.java
@@ -21,17 +21,12 @@ package org.sonar.server.authentication;
 
 import org.sonar.core.platform.Module;
 import org.sonar.server.authentication.event.AuthenticationEventImpl;
-import org.sonar.server.authentication.ws.AuthenticationWs;
-import org.sonar.server.authentication.ws.LoginAction;
-import org.sonar.server.authentication.ws.LogoutAction;
-import org.sonar.server.authentication.ws.ValidateAction;
 
 public class AuthenticationModule extends Module {
   @Override
   protected void configureModule() {
     add(
       AuthenticationEventImpl.class,
-      AuthenticationWs.class,
       InitFilter.class,
       OAuth2CallbackFilter.class,
       IdentityProviderRepository.class,
@@ -44,13 +39,10 @@ public class AuthenticationModule extends Module {
       JwtHttpHandler.class,
       JwtCsrfVerifier.class,
       OAuth2AuthenticationParametersImpl.class,
-      LoginAction.class,
-      LogoutAction.class,
       CredentialsAuthentication.class,
       CredentialsLocalAuthentication.class,
       CredentialsExternalAuthentication.class,
       BasicAuthentication.class,
-      ValidateAction.class,
       HttpHeadersAuthentication.class,
       RequestAuthenticatorImpl.class,
       UserLastConnectionDatesUpdaterImpl.class);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/UserSessionInitializer.java b/server/sonar-server/src/main/java/org/sonar/server/authentication/UserSessionInitializer.java
index 7c6bafe1eb3..4f28a4cad4e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/UserSessionInitializer.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/authentication/UserSessionInitializer.java
@@ -37,9 +37,6 @@ import static org.apache.commons.lang.StringUtils.defaultString;
 import static org.sonar.api.CoreProperties.CORE_FORCE_AUTHENTICATION_PROPERTY;
 import static org.sonar.api.web.ServletFilter.UrlPattern.Builder.staticResourcePatterns;
 import static org.sonar.server.authentication.AuthenticationError.handleAuthenticationError;
-import static org.sonar.server.authentication.ws.LoginAction.LOGIN_URL;
-import static org.sonar.server.authentication.ws.LogoutAction.LOGOUT_URL;
-import static org.sonar.server.authentication.ws.ValidateAction.VALIDATE_URL;
 
 @ServerSide
 public class UserSessionInitializer {
@@ -59,7 +56,7 @@ public class UserSessionInitializer {
     "/api/system/db_migration_status", "/api/system/status", "/api/system/migrate_db",
     "/api/server/version",
     "/api/users/identity_providers", "/api/l10n/index",
-    LOGIN_URL, LOGOUT_URL, VALIDATE_URL);
+    "/api/authentication/login", "/api/authentication/logout", "/api/authentication/validate");
 
   private static final Set<String> URL_USING_PASSCODE = ImmutableSet.of(
     "/api/ce/info", "/api/ce/pause", "/api/ce/resume", "/api/system/health", "/api/system/analytics", "/api/system/migrate_es");
diff --git a/server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteModule.java b/server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteModule.java
index e7121a3c864..fa5805627c0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteModule.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteModule.java
@@ -20,24 +20,16 @@
 package org.sonar.server.favorite;
 
 import org.sonar.core.platform.Module;
-import org.sonar.server.favorite.ws.AddAction;
-import org.sonar.server.favorite.ws.FavoritesWs;
-import org.sonar.server.favorite.ws.FavouritesWs;
-import org.sonar.server.favorite.ws.RemoveAction;
-import org.sonar.server.favorite.ws.SearchAction;
 
 public class FavoriteModule extends Module {
 
   @Override
   protected void configureModule() {
     add(
-      FavouritesWs.class,
       FavoriteFinder.class,
-      FavoriteUpdater.class,
-      FavoritesWs.class,
-      AddAction.class,
-      RemoveAction.class,
-      SearchAction.class);
+      FavoriteUpdater.class
+
+    );
   }
 
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ActionContext.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ActionContext.java
new file mode 100644
index 00000000000..9f9a12368fe
--- /dev/null
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ActionContext.java
@@ -0,0 +1,51 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info 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.issue;
+
+import org.sonar.core.issue.DefaultIssue;
+import org.sonar.core.issue.IssueChangeContext;
+import org.sonar.db.component.ComponentDto;
+
+public class ActionContext implements Action.Context {
+  private final DefaultIssue issue;
+  private final IssueChangeContext changeContext;
+  private final ComponentDto project;
+
+  public ActionContext(DefaultIssue issue, IssueChangeContext changeContext, ComponentDto project) {
+    this.issue = issue;
+    this.changeContext = changeContext;
+    this.project = project;
+  }
+
+  @Override
+  public DefaultIssue issue() {
+    return issue;
+  }
+
+  @Override
+  public IssueChangeContext issueChangeContext() {
+    return changeContext;
+  }
+
+  @Override
+  public ComponentDto project() {
+    return project;
+  }
+}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AvatarResolver.java b/server/sonar-server/src/main/java/org/sonar/server/issue/AvatarResolver.java
index 99a0b116cff..2f60bf471b6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AvatarResolver.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/AvatarResolver.java
@@ -17,7 +17,7 @@
  * 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.ws;
+package org.sonar.server.issue;
 
 import org.sonar.db.user.UserDto;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AvatarResolverImpl.java b/server/sonar-server/src/main/java/org/sonar/server/issue/AvatarResolverImpl.java
index 462f19c339d..c65543c106a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AvatarResolverImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/AvatarResolverImpl.java
@@ -17,7 +17,7 @@
  * 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.ws;
+package org.sonar.server.issue;
 
 import com.google.common.hash.Hashing;
 import org.sonar.db.user.UserDto;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationModule.java b/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationModule.java
index dbdd2380e04..abe04c57386 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationModule.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationModule.java
@@ -29,8 +29,6 @@ public class NotificationModule extends Module {
     add(
       EmailSettings.class,
       NotificationService.class,
-      NotificationCenter.class,
-      NotificationUpdater.class,
       DefaultNotificationManager.class,
       NotificationDaemon.class,
       EmailNotificationChannel.class);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolver.java b/server/sonar-server/src/main/java/org/sonar/server/permission/DefaultTemplatesResolver.java
index 0f49334496e..fe8b1821c67 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolver.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/DefaultTemplatesResolver.java
@@ -17,7 +17,7 @@
  * 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.permission.ws.template;
+package org.sonar.server.permission;
 
 import java.util.Optional;
 import javax.annotation.Nullable;
@@ -47,7 +47,7 @@ public interface DefaultTemplatesResolver {
     private final String application;
     private final String portfolio;
 
-    ResolvedDefaultTemplates(String project, @Nullable String application, @Nullable String portfolio) {
+    public ResolvedDefaultTemplates(String project, @Nullable String application, @Nullable String portfolio) {
       this.project = requireNonNull(project, "project can't be null");
       this.application = application;
       this.portfolio = portfolio;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverImpl.java b/server/sonar-server/src/main/java/org/sonar/server/permission/DefaultTemplatesResolverImpl.java
index 39d27f3af89..b7d88ae00e1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/DefaultTemplatesResolverImpl.java
@@ -17,7 +17,7 @@
  * 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.permission.ws.template;
+package org.sonar.server.permission;
 
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.resources.ResourceType;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupId.java b/server/sonar-server/src/main/java/org/sonar/server/permission/GroupId.java
index 2f09df9b18b..0faba895d4a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupId.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/GroupId.java
@@ -17,7 +17,7 @@
  * 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.usergroups.ws;
+package org.sonar.server.permission;
 
 import javax.annotation.concurrent.Immutable;
 import org.sonar.db.user.GroupDto;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupIdOrAnyone.java b/server/sonar-server/src/main/java/org/sonar/server/permission/GroupIdOrAnyone.java
index b91aae31a1e..4a6add59eb6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupIdOrAnyone.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/GroupIdOrAnyone.java
@@ -17,7 +17,7 @@
  * 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.usergroups.ws;
+package org.sonar.server.permission;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
@@ -31,7 +31,6 @@ import static java.util.Objects.requireNonNull;
  * {@link GroupId}, it supports reference to virtual groups "anyone". In these
  * cases {@link #getId()} returns {@code null}
  *
- * @see GroupWsRef
  * @see GroupId
  */
 @Immutable
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChange.java b/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChange.java
index ef5f3a541de..488da6d6351 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChange.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChange.java
@@ -20,7 +20,6 @@
 package org.sonar.server.permission;
 
 import javax.annotation.Nullable;
-import org.sonar.server.usergroups.ws.GroupIdOrAnyone;
 
 public class GroupPermissionChange extends PermissionChange {
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java b/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java
index bfa05843b9c..f285f7b0d25 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java
@@ -29,7 +29,7 @@ import static org.sonar.api.web.UserRole.PUBLIC_PERMISSIONS;
 import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN;
 import static org.sonar.server.permission.PermissionChange.Operation.ADD;
 import static org.sonar.server.permission.PermissionChange.Operation.REMOVE;
-import static org.sonar.server.permission.ws.RequestValidator.validateNotAnyoneAndAdminPermission;
+import static org.sonar.server.permission.RequestValidator.validateNotAnyoneAndAdminPermission;
 import static org.sonar.server.ws.WsUtils.checkRequest;
 
 public class GroupPermissionChanger {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java
index 7e4295a516b..3dcfff32d9a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java
@@ -42,8 +42,6 @@ import org.sonar.db.permission.template.PermissionTemplateGroupDto;
 import org.sonar.db.permission.template.PermissionTemplateUserDto;
 import org.sonar.server.es.ProjectIndexer;
 import org.sonar.server.es.ProjectIndexers;
-import org.sonar.server.permission.ws.template.DefaultTemplatesResolver;
-import org.sonar.server.permission.ws.template.DefaultTemplatesResolverImpl;
 import org.sonar.server.user.UserSession;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ProjectId.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ProjectId.java
index 14a8ed90ebe..0fb1941e3b8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ProjectId.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ProjectId.java
@@ -21,7 +21,6 @@ package org.sonar.server.permission;
 
 import javax.annotation.concurrent.Immutable;
 import org.sonar.db.component.ComponentDto;
-import org.sonar.server.permission.ws.ProjectWsRef;
 
 import static java.util.Objects.requireNonNull;
 
@@ -29,7 +28,6 @@ import static java.util.Objects.requireNonNull;
  * Reference to a project by its db id or uuid. The field "id" should
  * be removed as soon as backend is fully based on uuids.
  *
- * @see ProjectWsRef
  */
 @Immutable
 public class ProjectId {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RequestValidator.java b/server/sonar-server/src/main/java/org/sonar/server/permission/RequestValidator.java
index dab4e60be70..be763cce0e2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RequestValidator.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/RequestValidator.java
@@ -17,7 +17,7 @@
  * 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.permission.ws;
+package org.sonar.server.permission;
 
 import com.google.common.base.Joiner;
 import java.util.Set;
@@ -29,8 +29,6 @@ import org.sonar.api.resources.ResourceType;
 import org.sonar.api.resources.ResourceTypes;
 import org.sonar.core.permission.GlobalPermissions;
 import org.sonar.server.exceptions.BadRequestException;
-import org.sonar.server.permission.PermissionService;
-import org.sonar.server.usergroups.ws.GroupIdOrAnyone;
 import org.sonar.server.ws.WsUtils;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java
index 61741fbf525..209fd855df4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java
@@ -20,23 +20,6 @@
 package org.sonar.server.qualitygate;
 
 import org.sonar.core.platform.Module;
-import org.sonar.server.qualitygate.ws.CopyAction;
-import org.sonar.server.qualitygate.ws.CreateAction;
-import org.sonar.server.qualitygate.ws.CreateConditionAction;
-import org.sonar.server.qualitygate.ws.DeleteConditionAction;
-import org.sonar.server.qualitygate.ws.DeselectAction;
-import org.sonar.server.qualitygate.ws.DestroyAction;
-import org.sonar.server.qualitygate.ws.GetByProjectAction;
-import org.sonar.server.qualitygate.ws.ListAction;
-import org.sonar.server.qualitygate.ws.ProjectStatusAction;
-import org.sonar.server.qualitygate.ws.QualityGatesWs;
-import org.sonar.server.qualitygate.ws.QualityGatesWsSupport;
-import org.sonar.server.qualitygate.ws.RenameAction;
-import org.sonar.server.qualitygate.ws.SearchAction;
-import org.sonar.server.qualitygate.ws.SelectAction;
-import org.sonar.server.qualitygate.ws.SetAsDefaultAction;
-import org.sonar.server.qualitygate.ws.ShowAction;
-import org.sonar.server.qualitygate.ws.UpdateConditionAction;
 
 public class QualityGateModule extends Module {
   @Override
@@ -46,24 +29,6 @@ public class QualityGateModule extends Module {
       QualityGateConditionsUpdater.class,
       QualityGateFinder.class,
       QualityGateEvaluatorImpl.class,
-      // WS
-      QualityGatesWsSupport.class,
-      QualityGatesWs.class,
-      ListAction.class,
-      SearchAction.class,
-      ShowAction.class,
-      CreateAction.class,
-      RenameAction.class,
-      CopyAction.class,
-      DestroyAction.class,
-      SetAsDefaultAction.class,
-      SelectAction.class,
-      DeselectAction.class,
-      CreateConditionAction.class,
-      DeleteConditionAction.class,
-      UpdateConditionAction.class,
-      ProjectStatusAction.class,
-      GetByProjectAction.class,
       ProjectsInWarningDaemon.class,
       ProjectsInWarning.class);
   }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/updatecenter/UpdateCenterModule.java b/server/sonar-server/src/main/java/org/sonar/server/updatecenter/UpdateCenterModule.java
index 2ad5fa5924f..d3f07169f61 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/updatecenter/UpdateCenterModule.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/updatecenter/UpdateCenterModule.java
@@ -22,18 +22,12 @@ package org.sonar.server.updatecenter;
 import org.sonar.core.platform.Module;
 import org.sonar.server.plugins.UpdateCenterClient;
 import org.sonar.server.plugins.UpdateCenterMatrixFactory;
-import org.sonar.server.updatecenter.ws.InstalledPluginsAction;
-import org.sonar.server.updatecenter.ws.UpdateCenterWs;
-import org.sonar.server.updatecenter.ws.UploadAction;
 
 public class UpdateCenterModule extends Module {
   @Override
   protected void configureModule() {
     add(
       UpdateCenterClient.class,
-      UpdateCenterMatrixFactory.class,
-      UploadAction.class,
-      InstalledPluginsAction.class,
-      UpdateCenterWs.class);
+      UpdateCenterMatrixFactory.class);
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usertoken/UserTokenModule.java b/server/sonar-server/src/main/java/org/sonar/server/usertoken/UserTokenModule.java
index b3c0ddabc5e..7f3bd962a68 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usertoken/UserTokenModule.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/usertoken/UserTokenModule.java
@@ -20,21 +20,11 @@
 package org.sonar.server.usertoken;
 
 import org.sonar.core.platform.Module;
-import org.sonar.server.usertoken.ws.GenerateAction;
-import org.sonar.server.usertoken.ws.RevokeAction;
-import org.sonar.server.usertoken.ws.SearchAction;
-import org.sonar.server.usertoken.ws.UserTokenSupport;
-import org.sonar.server.usertoken.ws.UserTokensWs;
 
 public class UserTokenModule extends Module {
   @Override
   protected void configureModule() {
     add(
-      UserTokensWs.class,
-      UserTokenSupport.class,
-      GenerateAction.class,
-      RevokeAction.class,
-      SearchAction.class,
       UserTokenAuthentication.class,
       TokenGeneratorImpl.class);
   }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/AuthenticationModuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/AuthenticationModuleTest.java
index b33053ba5ff..8d281d4cb01 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/AuthenticationModuleTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/AuthenticationModuleTest.java
@@ -23,6 +23,7 @@ import org.junit.Test;
 import org.sonar.core.platform.ComponentContainer;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER;
 
 public class AuthenticationModuleTest {
 
@@ -30,7 +31,7 @@ public class AuthenticationModuleTest {
   public void verify_count_of_added_components() {
     ComponentContainer container = new ComponentContainer();
     new AuthenticationModule().configure(container);
-    assertThat(container.size()).isEqualTo(2 + 24);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 20);
   }
 
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java
index 7520d8adb12..790c4863c17 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java
@@ -23,12 +23,13 @@ import org.junit.Test;
 import org.sonar.core.platform.ComponentContainer;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER;
 
 public class FavoriteModuleTest {
   @Test
   public void verify_count_of_added_components() {
     ComponentContainer container = new ComponentContainer();
     new FavoriteModule().configure(container);
-    assertThat(container.size()).isEqualTo(7 + 2);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 2);
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/AssignActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/AssignActionTest.java
index f2827c2a9d6..cdfe07d39a4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/AssignActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/AssignActionTest.java
@@ -36,7 +36,6 @@ import org.sonar.db.component.ComponentDto;
 import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.exceptions.NotFoundException;
-import org.sonar.server.issue.ws.BulkChangeAction;
 import org.sonar.server.tester.UserSessionRule;
 
 import static java.util.Collections.emptyMap;
@@ -70,7 +69,7 @@ public class AssignActionTest {
   public void setUp() throws Exception {
     issueOrganizationDto = db.organizations().insert();
     project = db.components().insertPrivateProject(issueOrganizationDto);
-    context = new BulkChangeAction.ActionContext(issue, issueChangeContext, project);
+    context = new ActionContext(issue, issueChangeContext, project);
   }
 
   @Test
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AvatarResolverImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/AvatarResolverImplTest.java
index e2768859ea2..21f5fe4cd5e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AvatarResolverImplTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/AvatarResolverImplTest.java
@@ -17,7 +17,7 @@
  * 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.ws;
+package org.sonar.server.issue;
 
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/FakeAvatarResolver.java b/server/sonar-server/src/test/java/org/sonar/server/issue/FakeAvatarResolver.java
index d54d67ec109..5821749a62a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/FakeAvatarResolver.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/FakeAvatarResolver.java
@@ -17,7 +17,7 @@
  * 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.ws;
+package org.sonar.server.issue;
 
 import org.sonar.db.user.UserDto;
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java
index b188ad8def6..3021160d7ef 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java
@@ -35,7 +35,6 @@ import org.sonar.db.DbTester;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.issue.IssueDto;
 import org.sonar.db.rule.RuleDto;
-import org.sonar.server.issue.ws.BulkChangeAction;
 import org.sonar.server.tester.AnonymousMockUserSession;
 import org.sonar.server.tester.UserSessionRule;
 
@@ -71,7 +70,7 @@ public class SetSeverityActionTest {
     IssueDto issueDto = newIssue().setSeverity(MAJOR);
     DefaultIssue issue = issueDto.toDefaultIssue();
     setUserWithBrowseAndAdministerIssuePermission(issueDto);
-    BulkChangeAction.ActionContext context = new BulkChangeAction.ActionContext(issue, IssueChangeContext.createUser(NOW, userSession.getUuid()), null);
+    Action.Context context = new ActionContext(issue, IssueChangeContext.createUser(NOW, userSession.getUuid()), null);
 
     action.execute(ImmutableMap.of("severity", MINOR), context);
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/SetTypeActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/SetTypeActionTest.java
index bebd90e2423..2585b44f5b9 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/SetTypeActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/SetTypeActionTest.java
@@ -34,7 +34,6 @@ import org.sonar.db.DbTester;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.issue.IssueDto;
 import org.sonar.db.rule.RuleDto;
-import org.sonar.server.issue.ws.BulkChangeAction;
 import org.sonar.server.tester.UserSessionRule;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -71,7 +70,7 @@ public class SetTypeActionTest {
     setUserWithBrowseAndAdministerIssuePermission(issueDto);
 
     action.execute(ImmutableMap.of("type", VULNERABILITY.name()),
-      new BulkChangeAction.ActionContext(issue, IssueChangeContext.createUser(NOW, userSession.getUuid()), null));
+      new ActionContext(issue, IssueChangeContext.createUser(NOW, userSession.getUuid()), null));
 
     assertThat(issue.type()).isEqualTo(VULNERABILITY);
     assertThat(issue.isChanged()).isTrue();
diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationModuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationModuleTest.java
index a60e2bcc573..b485602fcd3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationModuleTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationModuleTest.java
@@ -23,12 +23,13 @@ import org.junit.Test;
 import org.sonar.core.platform.ComponentContainer;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER;
 
 public class NotificationModuleTest {
   @Test
   public void verify_count_of_added_components() {
     ComponentContainer container = new ComponentContainer();
     new NotificationModule().configure(container);
-    assertThat(container.size()).isEqualTo(7 + 2);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 5);
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverImplTest.java
index 285ad03d8dd..76af5bbe7a2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverImplTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverImplTest.java
@@ -17,7 +17,7 @@
  * 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.permission.ws.template;
+package org.sonar.server.permission;
 
 import java.util.stream.Stream;
 import org.junit.Test;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverRule.java b/server/sonar-server/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverRule.java
index 4938f3f364b..87b5529db46 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DefaultTemplatesResolverRule.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverRule.java
@@ -17,7 +17,7 @@
  * 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.permission.ws.template;
+package org.sonar.server.permission;
 
 import org.junit.rules.ExternalResource;
 import org.sonar.api.resources.ResourceType;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java
index cab6880f1cd..b6f9600af1a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java
@@ -38,7 +38,6 @@ import org.sonar.db.permission.OrganizationPermission;
 import org.sonar.db.user.GroupDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.exceptions.BadRequestException;
-import org.sonar.server.usergroups.ws.GroupIdOrAnyone;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java
index c859ea7c39d..2bc2f07606b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java
@@ -39,7 +39,6 @@ import org.sonar.db.user.GroupDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.es.ProjectIndexers;
 import org.sonar.server.es.TestProjectIndexers;
-import org.sonar.server.permission.ws.template.DefaultTemplatesResolverRule;
 import org.sonar.server.tester.UserSessionRule;
 
 import static java.util.Collections.singletonList;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java
index 5ad6df1bbd5..db4417f0247 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java
@@ -23,12 +23,13 @@ import org.junit.Test;
 import org.sonar.core.platform.ComponentContainer;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER;
 
 public class QualityGateModuleTest {
   @Test
   public void verify_count_of_added_components() {
     ComponentContainer container = new ComponentContainer();
     new QualityGateModule().configure(container);
-    assertThat(container.size()).isEqualTo(23 + 2);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 6);
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/updatecenter/UpdateCenterModuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/updatecenter/UpdateCenterModuleTest.java
index 02abcefc4f2..b7531b0f39b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/updatecenter/UpdateCenterModuleTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/updatecenter/UpdateCenterModuleTest.java
@@ -23,12 +23,13 @@ import org.junit.Test;
 import org.sonar.core.platform.ComponentContainer;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER;
 
 public class UpdateCenterModuleTest {
   @Test
   public void verify_count_of_added_components() {
     ComponentContainer container = new ComponentContainer();
     new UpdateCenterModule().configure(container);
-    assertThat(container.size()).isEqualTo(2 + 5);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 2);
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usertoken/UserTokenModuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/usertoken/UserTokenModuleTest.java
index 505587b3518..aea1820bca0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usertoken/UserTokenModuleTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/usertoken/UserTokenModuleTest.java
@@ -23,12 +23,13 @@ import org.junit.Test;
 import org.sonar.core.platform.ComponentContainer;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER;
 
 public class UserTokenModuleTest {
   @Test
   public void verify_count_of_added_components() {
     ComponentContainer container = new ComponentContainer();
     new UserTokenModule().configure(container);
-    assertThat(container.size()).isEqualTo(9);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 7);
   }
 }
diff --git a/server/sonar-webserver-webapi/build.gradle b/server/sonar-webserver-webapi/build.gradle
new file mode 100644
index 00000000000..4c940770b74
--- /dev/null
+++ b/server/sonar-webserver-webapi/build.gradle
@@ -0,0 +1,43 @@
+sonarqube {
+  properties {
+    property 'sonar.projectName', "${projectTitle} :: WebServer :: WebAPI"
+  }
+}
+
+configurations {
+  tests
+
+  testCompile.extendsFrom tests
+}
+
+dependencies {
+  // please keep the list grouped by configuration and ordered by name
+
+  compile 'com.google.guava:guava'
+  compile project(':server:sonar-server')
+  compile project(':server:sonar-webserver-ws')
+
+  compileOnly 'com.google.code.findbugs:jsr305'
+
+  testCompile 'org.apache.logging.log4j:log4j-api'
+  testCompile 'org.apache.logging.log4j:log4j-core'
+  testCompile 'org.assertj:assertj-guava'
+  testCompile 'com.google.code.findbugs:jsr305'
+  testCompile 'com.h2database:h2'
+  testCompile 'com.tngtech.java:junit-dataprovider'
+  testCompile 'org.mockito:mockito-core'
+  testCompile project(':server:sonar-db-testing')
+  testCompile project(path: ":server:sonar-server", configuration: "tests")
+  testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+  testCompile project(path: ":server:sonar-webserver-ws", configuration: "tests")
+  testCompile project(':sonar-testing-harness')
+}
+
+task testJar(type: Jar) {
+  classifier = 'tests'
+  from sourceSets.test.output
+}
+
+artifacts {
+  tests testJar
+}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/AuthenticationWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/authentication/ws/AuthenticationWs.java
index a84bd1f48c6..a84bd1f48c6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/AuthenticationWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/authentication/ws/AuthenticationWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/AuthenticationWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/authentication/ws/AuthenticationWsAction.java
index bb22e979b0f..bb22e979b0f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/AuthenticationWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/authentication/ws/AuthenticationWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/authentication/ws/AuthenticationWsModule.java
index 77ca4e9762e..6beb57e6e16 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/authentication/ws/AuthenticationWsModule.java
@@ -17,8 +17,18 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-@ParametersAreNonnullByDefault
-package org.sonar.server.projectanalysis;
+package org.sonar.server.authentication.ws;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import org.sonar.core.platform.Module;
 
+public class AuthenticationWsModule extends Module {
+  @Override
+  protected void configureModule() {
+    add(
+      AuthenticationWs.class,
+      LoginAction.class,
+      LogoutAction.class,
+      ValidateAction.class
+    );
+  }
+}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/LoginAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/authentication/ws/LoginAction.java
index 7c6c71b6014..7c6c71b6014 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/LoginAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/authentication/ws/LoginAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/LogoutAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/authentication/ws/LogoutAction.java
index 0e816581132..0e816581132 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/LogoutAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/authentication/ws/LogoutAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/ValidateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/authentication/ws/ValidateAction.java
index 4647695654f..4647695654f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/ValidateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/authentication/ws/ValidateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/authentication/ws/package-info.java
index e74eae8713e..e74eae8713e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/authentication/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/ETagUtils.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/ETagUtils.java
index 8b1bbe40806..8b1bbe40806 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/ETagUtils.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/ETagUtils.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/MeasureAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/MeasureAction.java
index 9b4d97dc4f3..9b4d97dc4f3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/MeasureAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/MeasureAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/ProjectBadgesException.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/ProjectBadgesException.java
index bcd36a21de0..bcd36a21de0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/ProjectBadgesException.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/ProjectBadgesException.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/ProjectBadgesSupport.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/ProjectBadgesSupport.java
index 2d8427cb6f7..2d8427cb6f7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/ProjectBadgesSupport.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/ProjectBadgesSupport.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/ProjectBadgesWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/ProjectBadgesWs.java
index f53dd7e599a..f53dd7e599a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/ProjectBadgesWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/ProjectBadgesWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/ProjectBadgesWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/ProjectBadgesWsAction.java
index 4bb8bcb6964..4bb8bcb6964 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/ProjectBadgesWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/ProjectBadgesWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/ProjectBadgesWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/ProjectBadgesWsModule.java
index 8c9b04a6e79..8c9b04a6e79 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/ProjectBadgesWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/ProjectBadgesWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/QualityGateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/QualityGateAction.java
index b67708f404f..b67708f404f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/QualityGateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/QualityGateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/SvgFormatter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/SvgFormatter.java
index ed639188883..ed639188883 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/SvgFormatter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/SvgFormatter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/SvgGenerator.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/SvgGenerator.java
index b9d86844a0b..b9d86844a0b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/SvgGenerator.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/SvgGenerator.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/package-info.java
index 613aeafdaac..613aeafdaac 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/badge/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/BatchIndex.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/BatchIndex.java
index 59951807609..59951807609 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/BatchIndex.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/BatchIndex.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/BatchWs.java
index 7734e8f3bbe..7734e8f3bbe 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/BatchWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/BatchWsAction.java
index 4ddaf3d64a5..4ddaf3d64a5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/BatchWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/BatchWsModule.java
index 888a6cd7fe4..888a6cd7fe4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/BatchWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/FileAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/FileAction.java
index 93bce42e288..93bce42e288 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/FileAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/FileAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/IndexAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/IndexAction.java
index b16f2c04688..b16f2c04688 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/IndexAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/IndexAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/IssuesAction.java
index b1f127ef490..b1f127ef490 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/IssuesAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/ProjectAction.java
index 2dd84dc2441..2dd84dc2441 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/ProjectAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/ProjectDataLoader.java
index ae253385bb7..ae253385bb7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/ProjectDataLoader.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataQuery.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/ProjectDataQuery.java
index b2d0fec150a..b2d0fec150a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataQuery.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/ProjectDataQuery.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/package-info.java
index ee516cbc237..ee516cbc237 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/batch/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/pr/ws/DeleteAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/pr/ws/DeleteAction.java
index eac0da622a2..eac0da622a2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/pr/ws/DeleteAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/pr/ws/DeleteAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/pr/ws/ListAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/pr/ws/ListAction.java
index 109e3f780f9..109e3f780f9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/pr/ws/ListAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/pr/ws/ListAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/pr/ws/PullRequestWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/pr/ws/PullRequestWsAction.java
index fb4f85cb7e0..fb4f85cb7e0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/pr/ws/PullRequestWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/pr/ws/PullRequestWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/pr/ws/PullRequestWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/pr/ws/PullRequestWsModule.java
index 33e00e452f0..33e00e452f0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/pr/ws/PullRequestWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/pr/ws/PullRequestWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/pr/ws/PullRequestsWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/pr/ws/PullRequestsWs.java
index c980ca02559..c980ca02559 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/pr/ws/PullRequestsWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/pr/ws/PullRequestsWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/pr/ws/PullRequestsWsParameters.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/pr/ws/PullRequestsWsParameters.java
index 59ab42577f0..59ab42577f0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/pr/ws/PullRequestsWsParameters.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/pr/ws/PullRequestsWsParameters.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/pr/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/pr/ws/package-info.java
index ee2366dc91a..ee2366dc91a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/pr/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/pr/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/ws/BranchWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/ws/BranchWsAction.java
index 07916ab739c..07916ab739c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/ws/BranchWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/ws/BranchWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/ws/BranchWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/ws/BranchWsModule.java
index 47369fc861c..47369fc861c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/ws/BranchWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/ws/BranchWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/ws/BranchesWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/ws/BranchesWs.java
index 3e64024baa5..3e64024baa5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/ws/BranchesWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/ws/BranchesWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/ws/DeleteAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/ws/DeleteAction.java
index 5e0e6dae001..5e0e6dae001 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/ws/DeleteAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/ws/DeleteAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/ws/ListAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/ws/ListAction.java
index 0cfcbadb08e..0cfcbadb08e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/ws/ListAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/ws/ListAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/ws/ProjectBranchesParameters.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/ws/ProjectBranchesParameters.java
index dda583e6271..dda583e6271 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/ws/ProjectBranchesParameters.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/ws/ProjectBranchesParameters.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/ws/RenameAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/ws/RenameAction.java
index b8575bc3af8..b8575bc3af8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/ws/RenameAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/ws/RenameAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/ws/package-info.java
index 3a03b673be2..3a03b673be2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/branch/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/branch/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/ActivityAction.java
index cefe7441f2a..cefe7441f2a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/ActivityAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityStatusAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/ActivityStatusAction.java
index 11e24208d35..11e24208d35 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityStatusAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/ActivityStatusAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/AnalysisStatusAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/AnalysisStatusAction.java
index dcedd00a345..dcedd00a345 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/AnalysisStatusAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/AnalysisStatusAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CancelAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/CancelAction.java
index 1eccbc77aa3..1eccbc77aa3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CancelAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/CancelAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CancelAllAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/CancelAllAction.java
index fc74e5300bb..fc74e5300bb 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CancelAllAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/CancelAllAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CeWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/CeWs.java
index 9018054806f..9018054806f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CeWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/CeWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CeWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/CeWsAction.java
index 2d73960d720..2d73960d720 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CeWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/CeWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CeWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/CeWsModule.java
index 606e655f0bb..606e655f0bb 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CeWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/CeWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CeWsParameters.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/CeWsParameters.java
index 6ee0856c486..6ee0856c486 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CeWsParameters.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/CeWsParameters.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ComponentAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/ComponentAction.java
index a65b310c0e5..a65b310c0e5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ComponentAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/ComponentAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/InfoAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/InfoAction.java
index da1f3916e4f..da1f3916e4f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/InfoAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/InfoAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/IsQueueEmptyWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/IsQueueEmptyWs.java
index 8fa1b3a5dd7..8fa1b3a5dd7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/IsQueueEmptyWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/IsQueueEmptyWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/PauseAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/PauseAction.java
index 8943abe7850..8943abe7850 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/PauseAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/PauseAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ResumeAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/ResumeAction.java
index e70d3d5fc8f..e70d3d5fc8f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ResumeAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/ResumeAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/SubmitAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/SubmitAction.java
index a7c406ba8b5..a7c406ba8b5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/SubmitAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/SubmitAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/TaskAction.java
index 3d726449afa..3d726449afa 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/TaskAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskFormatter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/TaskFormatter.java
index d970b821f96..d970b821f96 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskFormatter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/TaskFormatter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskTypesAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/TaskTypesAction.java
index 3986b2234ee..3986b2234ee 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskTypesAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/TaskTypesAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/WorkerCountAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/WorkerCountAction.java
index e5f308e24e0..e5f308e24e0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/WorkerCountAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/WorkerCountAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/package-info.java
index 4aa307a0858..4aa307a0858 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/AppAction.java
index d761a1cd9af..d761a1cd9af 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/AppAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentDtoToWsComponent.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/ComponentDtoToWsComponent.java
index df6d5fe1f86..df6d5fe1f86 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentDtoToWsComponent.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/ComponentDtoToWsComponent.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentViewerJsonWriter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/ComponentViewerJsonWriter.java
index 4ea0b0e1c76..4ea0b0e1c76 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentViewerJsonWriter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/ComponentViewerJsonWriter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/ComponentsWs.java
index cb8df4b080b..cb8df4b080b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/ComponentsWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/ComponentsWsAction.java
index 37df88f3a2c..37df88f3a2c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/ComponentsWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/ComponentsWsModule.java
index ce1d5b8c298..ce1d5b8c298 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/ComponentsWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/FilterParser.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/FilterParser.java
index 870af53cb37..870af53cb37 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/FilterParser.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/FilterParser.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/MeasuresWsParameters.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/MeasuresWsParameters.java
index da4f72fdbd5..da4f72fdbd5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/MeasuresWsParameters.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/MeasuresWsParameters.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactory.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactory.java
index 869ff91484d..869ff91484d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactory.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactory.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidator.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidator.java
index 528442728f1..528442728f1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidator.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidator.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchAction.java
index f695b3e1472..f695b3e1472 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java
index 72491ccf7c7..72491ccf7c7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ShowAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/ShowAction.java
index 47b4710e511..47b4710e511 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ShowAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/ShowAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SuggestionCategory.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SuggestionCategory.java
index bf79215625c..bf79215625c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SuggestionCategory.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SuggestionCategory.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SuggestionsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SuggestionsAction.java
index 372f3284159..372f3284159 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SuggestionsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SuggestionsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/TreeAction.java
index b5d14616f04..b5d14616f04 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/TreeAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/package-info.java
index 525cc56ca0f..525cc56ca0f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/Duplication.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/duplication/ws/Duplication.java
index 089093cbc91..089093cbc91 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/Duplication.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/duplication/ws/Duplication.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java
index fe2b20417e0..fe2b20417e0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/duplication/ws/DuplicationsWs.java
index ee5fda3d409..ee5fda3d409 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/duplication/ws/DuplicationsWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/duplication/ws/DuplicationsWsAction.java
index becfdd0960e..becfdd0960e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/duplication/ws/DuplicationsWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/duplication/ws/ShowAction.java
index 9efe24ec903..9efe24ec903 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/duplication/ws/ShowAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java
index 20dac116a43..20dac116a43 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/duplication/ws/package-info.java
index de1bcd84d93..de1bcd84d93 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/duplication/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/email/ws/EmailsWs.java
index 21542502b47..21542502b47 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/email/ws/EmailsWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/email/ws/EmailsWsAction.java
index 5145e753f20..5145e753f20 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/email/ws/EmailsWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/email/ws/EmailsWsModule.java
index a20121262db..a20121262db 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/email/ws/EmailsWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/email/ws/EmailsWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/email/ws/SendAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/email/ws/SendAction.java
index 66550e2c26b..66550e2c26b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/email/ws/SendAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/email/ws/SendAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/email/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/email/ws/package-info.java
index 9ae81460713..9ae81460713 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/email/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/email/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/AddAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/AddAction.java
index 2c07647d331..2c07647d331 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/AddAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/AddAction.java
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/FavoriteWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/FavoriteWsModule.java
new file mode 100644
index 00000000000..e6d0e061bda
--- /dev/null
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/FavoriteWsModule.java
@@ -0,0 +1,36 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info 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.favorite.ws;
+
+import org.sonar.core.platform.Module;
+
+public class FavoriteWsModule extends Module {
+  @Override
+  protected void configureModule() {
+    add(
+      FavouritesWs.class,
+      FavoritesWs.class,
+      AddAction.class,
+      RemoveAction.class,
+      SearchAction.class
+
+    );
+  }
+}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/FavoritesWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/FavoritesWs.java
index 3529d2111aa..3529d2111aa 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/FavoritesWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/FavoritesWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/FavoritesWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/FavoritesWsAction.java
index 96142228d05..96142228d05 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/FavoritesWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/FavoritesWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/FavoritesWsParameters.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/FavoritesWsParameters.java
index ec3a1dca26a..ec3a1dca26a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/FavoritesWsParameters.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/FavoritesWsParameters.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/FavouritesWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/FavouritesWs.java
index d59492158d2..d59492158d2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/FavouritesWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/FavouritesWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/RemoveAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/RemoveAction.java
index 1e93b6a18df..1e93b6a18df 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/RemoveAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/RemoveAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/SearchAction.java
index 9617362f189..9617362f189 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/SearchAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/package-info.java
index 6b8b89a7b24..6b8b89a7b24 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/favorite/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AddCommentAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/AddCommentAction.java
index 2acae7cb3f2..2a4c5fdcc7f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AddCommentAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/AddCommentAction.java
@@ -33,7 +33,6 @@ import org.sonar.db.DbSession;
 import org.sonar.db.issue.IssueDto;
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.IssueFinder;
-import org.sonar.server.issue.IssueUpdater;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.client.issue.IssuesWsParameters;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AssignAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/AssignAction.java
index 94dea6deb10..cb4c4268f0f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AssignAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/AssignAction.java
@@ -40,7 +40,6 @@ import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.IssueFinder;
-import org.sonar.server.issue.IssueUpdater;
 import org.sonar.server.user.UserSession;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java
index 6e97a07cba7..6e97a07cba7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/BulkChangeAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/BulkChangeAction.java
index d4662b0a5c3..7f14b45fd45 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/BulkChangeAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/BulkChangeAction.java
@@ -57,6 +57,7 @@ import org.sonar.db.issue.IssueDto;
 import org.sonar.db.rule.RuleDefinitionDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.issue.Action;
+import org.sonar.server.issue.ActionContext;
 import org.sonar.server.issue.AddTagsAction;
 import org.sonar.server.issue.AssignAction;
 import org.sonar.server.issue.IssueChangePostProcessor;
@@ -334,33 +335,6 @@ public class BulkChangeAction implements IssuesWsAction {
       .build();
   }
 
-  public static class ActionContext implements Action.Context {
-    private final DefaultIssue issue;
-    private final IssueChangeContext changeContext;
-    private final ComponentDto project;
-
-    public ActionContext(DefaultIssue issue, IssueChangeContext changeContext, ComponentDto project) {
-      this.issue = issue;
-      this.changeContext = changeContext;
-      this.project = project;
-    }
-
-    @Override
-    public DefaultIssue issue() {
-      return issue;
-    }
-
-    @Override
-    public IssueChangeContext issueChangeContext() {
-      return changeContext;
-    }
-
-    @Override
-    public ComponentDto project() {
-      return project;
-    }
-  }
-
   private class BulkChangeData {
     private final Map<String, Map<String, Object>> propertiesByActions;
     private final boolean sendNotification;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ChangelogAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/ChangelogAction.java
index bbd294d475e..104cf5b6705 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ChangelogAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/ChangelogAction.java
@@ -43,6 +43,7 @@ import org.sonar.db.component.ComponentDto;
 import org.sonar.db.issue.IssueDto;
 import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.user.UserDto;
+import org.sonar.server.issue.AvatarResolver;
 import org.sonar.server.issue.IssueFinder;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.Issues.ChangelogWsResponse;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java
index 92e9b11b265..92e9b11b265 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/DeleteCommentAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/DeleteCommentAction.java
index 308d6e11dac..308d6e11dac 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/DeleteCommentAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/DeleteCommentAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/DoTransitionAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/DoTransitionAction.java
index 7b0659e69ef..59902201fe9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/DoTransitionAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/DoTransitionAction.java
@@ -34,7 +34,6 @@ import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.issue.IssueDto;
 import org.sonar.server.issue.IssueFinder;
-import org.sonar.server.issue.IssueUpdater;
 import org.sonar.server.issue.TransitionService;
 import org.sonar.server.user.UserSession;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/EditCommentAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/EditCommentAction.java
index a3583a5e596..a3583a5e596 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/EditCommentAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/EditCommentAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueUpdater.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssueUpdater.java
index 5423d2b7ddd..b9bb37084a9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueUpdater.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssueUpdater.java
@@ -17,7 +17,7 @@
  * 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;
+package org.sonar.server.issue.ws;
 
 import java.util.List;
 import java.util.Optional;
@@ -34,6 +34,8 @@ import org.sonar.db.component.ComponentDto;
 import org.sonar.db.issue.IssueDto;
 import org.sonar.db.rule.RuleDefinitionDto;
 import org.sonar.db.user.UserDto;
+import org.sonar.server.issue.IssueChangePostProcessor;
+import org.sonar.server.issue.WebIssueStorage;
 import org.sonar.server.issue.notification.IssuesChangesNotificationBuilder;
 import org.sonar.server.issue.notification.IssuesChangesNotificationBuilder.ChangedIssue;
 import org.sonar.server.issue.notification.IssuesChangesNotificationBuilder.Project;
@@ -41,7 +43,6 @@ import org.sonar.server.issue.notification.IssuesChangesNotificationBuilder.Rule
 import org.sonar.server.issue.notification.IssuesChangesNotificationBuilder.User;
 import org.sonar.server.issue.notification.IssuesChangesNotificationBuilder.UserChange;
 import org.sonar.server.issue.notification.IssuesChangesNotificationSerializer;
-import org.sonar.server.issue.ws.SearchResponseData;
 import org.sonar.server.notification.NotificationManager;
 
 import static com.google.common.base.Preconditions.checkState;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java
index 30b70b5f08a..2dce5f3200f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java
@@ -20,11 +20,11 @@
 package org.sonar.server.issue.ws;
 
 import org.sonar.core.platform.Module;
+import org.sonar.server.issue.AvatarResolverImpl;
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.IssueFinder;
 import org.sonar.server.issue.index.IssueQueryFactory;
 import org.sonar.server.issue.WebIssueStorage;
-import org.sonar.server.issue.IssueUpdater;
 import org.sonar.server.issue.TransitionService;
 import org.sonar.server.issue.workflow.FunctionExecutor;
 import org.sonar.server.issue.workflow.IssueWorkflow;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssuesWs.java
index e0dbb5b4769..e0dbb5b4769 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssuesWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssuesWsAction.java
index ac9876f0a8f..ac9876f0a8f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssuesWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/OperationResponseWriter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/OperationResponseWriter.java
index e68773edd07..e68773edd07 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/OperationResponseWriter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/OperationResponseWriter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAction.java
index 1144a6f83a0..1144a6f83a0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAdditionalField.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAdditionalField.java
index d00cf78e0b3..d00cf78e0b3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAdditionalField.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAdditionalField.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseData.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchResponseData.java
index 15b2c5f0c01..15b2c5f0c01 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseData.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchResponseData.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java
index 2f17f592203..c20b8ebd244 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java
@@ -43,6 +43,7 @@ import org.sonar.db.rule.RuleDefinitionDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.markdown.Markdown;
 import org.sonar.server.es.Facets;
+import org.sonar.server.issue.AvatarResolver;
 import org.sonar.server.issue.workflow.Transition;
 import org.sonarqube.ws.Common;
 import org.sonarqube.ws.Issues;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseLoader.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchResponseLoader.java
index c0f2944e1e0..c0f2944e1e0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseLoader.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchResponseLoader.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SetSeverityAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SetSeverityAction.java
index 0493ae97110..68718a65a8d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SetSeverityAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SetSeverityAction.java
@@ -34,7 +34,6 @@ import org.sonar.db.DbSession;
 import org.sonar.db.issue.IssueDto;
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.IssueFinder;
-import org.sonar.server.issue.IssueUpdater;
 import org.sonar.server.user.UserSession;
 
 import static org.sonar.api.web.UserRole.ISSUE_ADMIN;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SetTagsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SetTagsAction.java
index 2d5bcc0d814..436eba98c33 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SetTagsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SetTagsAction.java
@@ -37,7 +37,6 @@ import org.sonar.db.DbSession;
 import org.sonar.db.issue.IssueDto;
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.IssueFinder;
-import org.sonar.server.issue.IssueUpdater;
 import org.sonar.server.user.UserSession;
 
 import static org.sonarqube.ws.client.issue.IssuesWsParameters.ACTION_SET_TAGS;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SetTypeAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SetTypeAction.java
index b02c18ea26d..c56035d955a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SetTypeAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SetTypeAction.java
@@ -35,7 +35,6 @@ import org.sonar.db.DbSession;
 import org.sonar.db.issue.IssueDto;
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.IssueFinder;
-import org.sonar.server.issue.IssueUpdater;
 import org.sonar.server.user.UserSession;
 
 import static org.sonar.api.web.UserRole.ISSUE_ADMIN;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/TagsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/TagsAction.java
index 9fae3e598d0..9fae3e598d0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/TagsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/TagsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/package-info.java
index 143cf3930d1..143cf3930d1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/language/ws/LanguageWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/ws/LanguageWs.java
index 2a47c673db9..2a47c673db9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/language/ws/LanguageWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/ws/LanguageWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/language/ws/ListAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/ws/ListAction.java
index f5bd503a8c8..f5bd503a8c8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/language/ws/ListAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/ws/ListAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/language/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/ws/package-info.java
index 785ec238835..785ec238835 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/language/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java
index 1db81b88956..1db81b88956 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java
index 41098e90d5e..41098e90d5e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValidator.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValidator.java
index bdd41c3d2c1..bdd41c3d2c1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValidator.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValidator.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValueDescription.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValueDescription.java
index 08b2e405a6b..08b2e405a6b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValueDescription.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValueDescription.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWs.java
index debda15d221..debda15d221 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsAction.java
index 93dcd52fabb..93dcd52fabb 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModule.java
index 44a5132091b..44a5132091b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/DeleteAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/DeleteAction.java
index 378020db97d..378020db97d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/DeleteAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/DeleteAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/MetricsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/MetricsAction.java
index 275c0953ad6..275c0953ad6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/MetricsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/MetricsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/SearchAction.java
index eb46c61fb10..eb46c61fb10 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/SearchAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java
index a77de33dc83..a77de33dc83 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/package-info.java
index 49ee46c7c86..49ee46c7c86 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/custom/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/ComponentAction.java
index 04b60be8adf..123d929bcf3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/ComponentAction.java
@@ -106,7 +106,7 @@ public class ComponentAction implements MeasuresWsAction {
       .setResponseExample(getClass().getResource("component-example.json"))
       .setSince("5.4")
       .setChangelog(
-        new Change("7.6", String.format("The use of module keys in parameter '%s' is deprecated", PARAM_COMPONENT)),
+        new Change("7.6", format("The use of module keys in parameter '%s' is deprecated", PARAM_COMPONENT)),
         new Change("6.6", "the response field id is deprecated. Use key instead."),
         new Change("6.6", "the response field refId is deprecated. Use refKey instead."))
       .setHandler(this);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentDtoToWsComponent.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/ComponentDtoToWsComponent.java
index b762c30013c..b762c30013c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentDtoToWsComponent.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/ComponentDtoToWsComponent.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/ComponentTreeAction.java
index 836564ba395..db8e9ed0b56 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/ComponentTreeAction.java
@@ -185,7 +185,7 @@ public class ComponentTreeAction implements MeasuresWsAction {
       .setHandler(this)
       .addPagingParams(100, MAX_SIZE)
       .setChangelog(
-        new Change("7.6", String.format("The use of module keys in parameter '%s' is deprecated", PARAM_COMPONENT)),
+        new Change("7.6", format("The use of module keys in parameter '%s' is deprecated", PARAM_COMPONENT)),
         new Change("7.2", "field 'bestValue' is added to the response"),
         new Change("6.3", format("Number of metric keys is limited to %s", MAX_METRIC_KEYS)),
         new Change("6.6", "the response field id is deprecated. Use key instead."),
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeData.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/ComponentTreeData.java
index d2747787f0c..d2747787f0c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeData.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/ComponentTreeData.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeRequest.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/ComponentTreeRequest.java
index b0fb303bd48..b0fb303bd48 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeRequest.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/ComponentTreeRequest.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeSort.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/ComponentTreeSort.java
index fbe691e62be..fbe691e62be 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeSort.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/ComponentTreeSort.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/HasMeasure.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/HasMeasure.java
index 963e80b5bee..963e80b5bee 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/HasMeasure.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/HasMeasure.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasureDtoToWsMeasure.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MeasureDtoToWsMeasure.java
index ad9929aeb7a..ad9929aeb7a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasureDtoToWsMeasure.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MeasureDtoToWsMeasure.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasureValueFormatter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MeasureValueFormatter.java
index 6150a929c6c..6150a929c6c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasureValueFormatter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MeasureValueFormatter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MeasuresWs.java
index 122f77c0dee..122f77c0dee 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MeasuresWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MeasuresWsAction.java
index e7c88649b34..e7c88649b34 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MeasuresWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MeasuresWsModule.java
index 9f11a3a0744..9f11a3a0744 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MeasuresWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsParametersBuilder.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MeasuresWsParametersBuilder.java
index e7604c38cf0..e7604c38cf0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasuresWsParametersBuilder.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MeasuresWsParametersBuilder.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricDtoToWsMetric.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MetricDtoToWsMetric.java
index 940bacb0a61..940bacb0a61 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricDtoToWsMetric.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MetricDtoToWsMetric.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricDtoWithBestValue.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MetricDtoWithBestValue.java
index 897997e4064..bd3d9e819f3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricDtoWithBestValue.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MetricDtoWithBestValue.java
@@ -28,7 +28,7 @@ import org.sonar.db.component.ComponentDto;
 import org.sonar.db.measure.LiveMeasureDto;
 import org.sonar.db.metric.MetricDto;
 
-class MetricDtoWithBestValue {
+public class MetricDtoWithBestValue {
   private static final String LOWER_CASE_NEW_METRIC_PREFIX = "new_";
   private static final Set<String> QUALIFIERS_ELIGIBLE_FOR_BEST_VALUE = ImmutableSortedSet.of(Qualifiers.FILE, Qualifiers.UNIT_TEST_FILE);
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SLBorPRMeasureFix.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/SLBorPRMeasureFix.java
index ddab46c9800..ddab46c9800 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SLBorPRMeasureFix.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/SLBorPRMeasureFix.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/SearchAction.java
index 06b12c9fdd6..06b12c9fdd6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/SearchAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/SearchHistoryAction.java
index 9dd0911f099..46ff895f8f5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/SearchHistoryAction.java
@@ -89,7 +89,7 @@ public class SearchHistoryAction implements MeasuresWsAction {
         "Requires the following permission: 'Browse' on the specified component")
       .setResponseExample(getClass().getResource("search_history-example.json"))
       .setSince("6.3")
-      .setChangelog(new Change("7.6", String.format("The use of module keys in parameter '%s' is deprecated", PARAM_COMPONENT)))
+      .setChangelog(new Change("7.6", format("The use of module keys in parameter '%s' is deprecated", PARAM_COMPONENT)))
       .setHandler(this);
 
     action.createParam(PARAM_COMPONENT)
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryResponseFactory.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/SearchHistoryResponseFactory.java
index 3de9c7b992c..3de9c7b992c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryResponseFactory.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/SearchHistoryResponseFactory.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryResult.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/SearchHistoryResult.java
index 8c6be69bb26..8c6be69bb26 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SearchHistoryResult.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/SearchHistoryResult.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SnapshotDtoToWsPeriod.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/SnapshotDtoToWsPeriod.java
index 1143d7dc4a8..1143d7dc4a8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/SnapshotDtoToWsPeriod.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/SnapshotDtoToWsPeriod.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java
index 20fa7b1fc4c..20fa7b1fc4c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/package-info.java
index af30a9e4f0b..af30a9e4f0b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/CreateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/CreateAction.java
index 1bcba8cf613..1bcba8cf613 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/CreateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/CreateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/DeleteAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/DeleteAction.java
index dae9a9df708..dae9a9df708 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/DeleteAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/DeleteAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/DomainsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/DomainsAction.java
index f62bca3362d..f62bca3362d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/DomainsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/DomainsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricJsonWriter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/MetricJsonWriter.java
index 0bd893dc95c..0bd893dc95c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricJsonWriter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/MetricJsonWriter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/MetricsWs.java
index e4fab220cbc..e4fab220cbc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/MetricsWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/MetricsWsAction.java
index 2d45ce20a3a..2d45ce20a3a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/MetricsWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/MetricsWsModule.java
index 87f3a8233eb..87f3a8233eb 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/MetricsWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/SearchAction.java
index 4d92df0791a..4d92df0791a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/SearchAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/TypesAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/TypesAction.java
index f2f3deef009..f2f3deef009 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/TypesAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/TypesAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/UpdateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/UpdateAction.java
index 128e353effa..128e353effa 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/UpdateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/UpdateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/package-info.java
index 97939aea620..97939aea620 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/AddAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/AddAction.java
index fc953c894a4..a17fb840b03 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/AddAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/AddAction.java
@@ -34,8 +34,6 @@ import org.sonar.db.component.ComponentDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.component.ComponentFinder;
 import org.sonar.server.issue.notification.MyNewIssuesNotificationHandler;
-import org.sonar.server.notification.NotificationCenter;
-import org.sonar.server.notification.NotificationUpdater;
 import org.sonar.server.notification.email.EmailNotificationChannel;
 import org.sonar.server.user.UserSession;
 import org.sonar.server.ws.KeyExamples;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/Dispatchers.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/Dispatchers.java
index 01b5bd6dbd0..01b5bd6dbd0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/Dispatchers.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/Dispatchers.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/DispatchersImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/DispatchersImpl.java
index 67d9ab9a7fe..c4781d78094 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/DispatchersImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/DispatchersImpl.java
@@ -26,7 +26,6 @@ import java.util.function.Predicate;
 import org.sonar.api.Startable;
 import org.sonar.api.config.Configuration;
 import org.sonar.process.ProcessProperties;
-import org.sonar.server.notification.NotificationCenter;
 import org.sonar.server.qualitygate.notification.QGChangeNotificationHandler;
 
 import static org.sonar.core.util.stream.MoreCollectors.toList;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/ListAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/ListAction.java
index a3a71d48695..bbb62c039a4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/ListAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/ListAction.java
@@ -42,7 +42,6 @@ import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.property.PropertyDto;
 import org.sonar.db.property.PropertyQuery;
 import org.sonar.db.user.UserDto;
-import org.sonar.server.notification.NotificationCenter;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.Notifications.ListResponse;
 import org.sonarqube.ws.Notifications.Notification;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationCenter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/NotificationCenter.java
index 0e4793cd7f2..8a0177b2297 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationCenter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/NotificationCenter.java
@@ -17,7 +17,7 @@
  * 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.notification;
+package org.sonar.server.notification.ws;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Arrays;
@@ -26,6 +26,7 @@ import javax.annotation.Nullable;
 import org.sonar.api.notifications.NotificationChannel;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
+import org.sonar.server.notification.NotificationDispatcherMetadata;
 
 public class NotificationCenter {
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationUpdater.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/NotificationUpdater.java
index 72506463cb9..20ce7f18ef5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationUpdater.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/NotificationUpdater.java
@@ -17,7 +17,7 @@
  * 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.notification;
+package org.sonar.server.notification.ws;
 
 import java.util.List;
 import java.util.function.Predicate;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/NotificationWsModule.java
index a484811b4ed..48e0ad26a2f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/NotificationWsModule.java
@@ -25,6 +25,8 @@ public class NotificationWsModule extends Module {
   @Override
   protected void configureModule() {
     add(
+      NotificationCenter.class,
+      NotificationUpdater.class,
       DispatchersImpl.class,
       // WS
       NotificationsWs.class,
diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationsWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/NotificationsWs.java
index 1ab9f1f2635..1ab9f1f2635 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationsWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/NotificationsWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationsWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/NotificationsWsAction.java
index 58b0e8ec47d..58b0e8ec47d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationsWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/NotificationsWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationsWsParameters.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/NotificationsWsParameters.java
index 529ba104838..529ba104838 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/NotificationsWsParameters.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/NotificationsWsParameters.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/RemoveAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/RemoveAction.java
index 143d85e31f0..0713dd3d4f8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/RemoveAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/RemoveAction.java
@@ -34,8 +34,6 @@ import org.sonar.db.component.ComponentDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.component.ComponentFinder;
 import org.sonar.server.issue.notification.MyNewIssuesNotificationHandler;
-import org.sonar.server.notification.NotificationCenter;
-import org.sonar.server.notification.NotificationUpdater;
 import org.sonar.server.notification.email.EmailNotificationChannel;
 import org.sonar.server.user.UserSession;
 import org.sonar.server.ws.KeyExamples;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/package-info.java
index 505581d0db0..505581d0db0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/notification/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/AddMemberAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/AddMemberAction.java
index 54a1c2e60d7..b1740833e5f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/AddMemberAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/AddMemberAction.java
@@ -29,7 +29,7 @@ import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.permission.OrganizationPermission;
 import org.sonar.db.user.GroupMembershipQuery;
 import org.sonar.db.user.UserDto;
-import org.sonar.server.issue.ws.AvatarResolver;
+import org.sonar.server.issue.AvatarResolver;
 import org.sonar.server.organization.MemberUpdater;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.Organizations.AddMemberWsResponse;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/CreateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/CreateAction.java
index 06294edf160..06294edf160 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/CreateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/CreateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/DeleteAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/DeleteAction.java
index 9d76d8adf9c..9d76d8adf9c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/DeleteAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/DeleteAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/EnableSupportAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/EnableSupportAction.java
index 3e515b5a2cd..3e515b5a2cd 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/EnableSupportAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/EnableSupportAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationDeleter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/OrganizationDeleter.java
index fb638feeda9..fb638feeda9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationDeleter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/OrganizationDeleter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/OrganizationsWs.java
index b8cdc7b4f1a..b8cdc7b4f1a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/OrganizationsWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/OrganizationsWsAction.java
index 210634cedad..210634cedad 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/OrganizationsWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/OrganizationsWsModule.java
index a3df5bf41d6..a3df5bf41d6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/OrganizationsWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsSupport.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/OrganizationsWsSupport.java
index c070f1bb389..c070f1bb389 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsSupport.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/OrganizationsWsSupport.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/PreventUserDeletionAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/PreventUserDeletionAction.java
index 7ff1feb859d..7ff1feb859d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/PreventUserDeletionAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/PreventUserDeletionAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/RemoveMemberAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/RemoveMemberAction.java
index 405c0098cf0..405c0098cf0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/RemoveMemberAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/RemoveMemberAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/SearchAction.java
index 96df687d0ea..96df687d0ea 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/SearchAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchMembersAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/SearchMembersAction.java
index cc588949555..70cc2b0f3ef 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchMembersAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/SearchMembersAction.java
@@ -37,7 +37,7 @@ import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.es.SearchOptions;
 import org.sonar.server.es.SearchResult;
-import org.sonar.server.issue.ws.AvatarResolver;
+import org.sonar.server.issue.AvatarResolver;
 import org.sonar.server.organization.DefaultOrganizationProvider;
 import org.sonar.server.user.UserSession;
 import org.sonar.server.user.index.UserDoc;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/UpdateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/UpdateAction.java
index fcfbdf0cdeb..fcfbdf0cdeb 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/UpdateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/UpdateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/package-info.java
index 48f9b156665..48f9b156665 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/organization/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java
index f5fbacb026e..d695629547a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java
@@ -32,7 +32,7 @@ import org.sonar.server.permission.PermissionService;
 import org.sonar.server.permission.PermissionUpdater;
 import org.sonar.server.permission.ProjectId;
 import org.sonar.server.user.UserSession;
-import org.sonar.server.usergroups.ws.GroupIdOrAnyone;
+import org.sonar.server.permission.GroupIdOrAnyone;
 
 import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdmin;
 import static org.sonar.server.permission.ws.WsParameters.createGroupIdParameter;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/AddUserAction.java
index ced231cea0f..ced231cea0f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/AddUserAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/GroupsAction.java
index 71b525b6423..71b525b6423 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/GroupsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionWsSupport.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/PermissionWsSupport.java
index 767ce037837..d7a50e52d48 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionWsSupport.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/PermissionWsSupport.java
@@ -32,7 +32,7 @@ import org.sonar.server.component.ComponentFinder;
 import org.sonar.server.permission.ProjectId;
 import org.sonar.server.permission.UserId;
 import org.sonar.server.permission.ws.template.WsTemplateRef;
-import org.sonar.server.usergroups.ws.GroupIdOrAnyone;
+import org.sonar.server.permission.GroupIdOrAnyone;
 import org.sonar.server.usergroups.ws.GroupWsRef;
 import org.sonar.server.usergroups.ws.GroupWsSupport;
 import org.sonarqube.ws.client.permission.PermissionsWsParameters;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/PermissionsWs.java
index cbf6db0e69f..cbf6db0e69f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/PermissionsWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/PermissionsWsAction.java
index 1031f50951e..1031f50951e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/PermissionsWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/PermissionsWsModule.java
index b31d8f5224e..9d88d918d54 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/PermissionsWsModule.java
@@ -21,6 +21,7 @@ package org.sonar.server.permission.ws;
 
 import org.sonar.core.platform.Module;
 import org.sonar.server.permission.PermissionServiceImpl;
+import org.sonar.server.permission.RequestValidator;
 import org.sonar.server.permission.ws.template.AddGroupToTemplateAction;
 import org.sonar.server.permission.ws.template.AddProjectCreatorToTemplateAction;
 import org.sonar.server.permission.ws.template.AddUserToTemplateAction;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/ProjectWsRef.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/ProjectWsRef.java
index 088c8e1cae2..088c8e1cae2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/ProjectWsRef.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/ProjectWsRef.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java
index 60f800f4787..be7f8accb03 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java
@@ -31,7 +31,7 @@ import org.sonar.server.permission.PermissionService;
 import org.sonar.server.permission.PermissionUpdater;
 import org.sonar.server.permission.ProjectId;
 import org.sonar.server.user.UserSession;
-import org.sonar.server.usergroups.ws.GroupIdOrAnyone;
+import org.sonar.server.permission.GroupIdOrAnyone;
 
 import static java.util.Arrays.asList;
 import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdmin;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java
index 599bf4e038c..599bf4e038c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java
index 1ffd2d27208..1ffd2d27208 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java
index 4dbc0314bdf..422b99a071e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java
@@ -44,6 +44,7 @@ import org.sonar.db.permission.CountPerProjectPermission;
 import org.sonar.server.permission.PermissionPrivilegeChecker;
 import org.sonar.server.permission.PermissionService;
 import org.sonar.server.permission.ProjectId;
+import org.sonar.server.permission.RequestValidator;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.Common;
 import org.sonarqube.ws.Permissions.Permission;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsData.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsData.java
index 70c8d52e348..70c8d52e348 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsData.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsData.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/UsersAction.java
index 8f1a6e7003b..d000f61ef08 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/UsersAction.java
@@ -37,8 +37,9 @@ import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.permission.PermissionQuery;
 import org.sonar.db.permission.UserPermissionDto;
 import org.sonar.db.user.UserDto;
-import org.sonar.server.issue.ws.AvatarResolver;
+import org.sonar.server.issue.AvatarResolver;
 import org.sonar.server.permission.ProjectId;
+import org.sonar.server.permission.RequestValidator;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.Permissions;
 import org.sonarqube.ws.Permissions.UsersWsResponse;
@@ -50,7 +51,7 @@ import static org.sonar.db.permission.PermissionQuery.DEFAULT_PAGE_SIZE;
 import static org.sonar.db.permission.PermissionQuery.RESULTS_MAX_SIZE;
 import static org.sonar.db.permission.PermissionQuery.SEARCH_QUERY_MIN_LENGTH;
 import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdmin;
-import static org.sonar.server.permission.ws.RequestValidator.validateGlobalPermission;
+import static org.sonar.server.permission.RequestValidator.validateGlobalPermission;
 import static org.sonar.server.permission.ws.WsParameters.createOrganizationParameter;
 import static org.sonar.server.permission.ws.WsParameters.createProjectParameters;
 import static org.sonar.server.ws.WsUtils.writeProtobuf;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/WsParameters.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/WsParameters.java
index c313a7a9892..c313a7a9892 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/WsParameters.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/WsParameters.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/package-info.java
index 185c78cd8d7..185c78cd8d7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java
index df0d15e4b07..0fa3c6347fe 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java
@@ -29,7 +29,7 @@ import org.sonar.server.permission.ws.PermissionWsSupport;
 import org.sonar.server.permission.ws.PermissionsWsAction;
 import org.sonar.server.permission.ws.WsParameters;
 import org.sonar.server.user.UserSession;
-import org.sonar.server.usergroups.ws.GroupIdOrAnyone;
+import org.sonar.server.permission.GroupIdOrAnyone;
 
 import static java.lang.String.format;
 import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateAction.java
index 6c103cbe05d..64f8b6e1a4a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateAction.java
@@ -32,7 +32,7 @@ import org.sonar.db.permission.template.PermissionTemplateCharacteristicDto;
 import org.sonar.db.permission.template.PermissionTemplateDto;
 import org.sonar.server.permission.ws.PermissionWsSupport;
 import org.sonar.server.permission.ws.PermissionsWsAction;
-import org.sonar.server.permission.ws.RequestValidator;
+import org.sonar.server.permission.RequestValidator;
 import org.sonar.server.permission.ws.WsParameters;
 import org.sonar.server.user.UserSession;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java
index 3be17b53ac8..3be17b53ac8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/ApplyTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/ApplyTemplateAction.java
index f448effbeaa..f448effbeaa 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/ApplyTemplateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/ApplyTemplateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/BulkApplyTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/BulkApplyTemplateAction.java
index eaa2db9d178..eaa2db9d178 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/BulkApplyTemplateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/BulkApplyTemplateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/CreateTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/CreateTemplateAction.java
index 9c8e5458f85..ddda5a51086 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/CreateTemplateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/CreateTemplateAction.java
@@ -33,7 +33,7 @@ import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.permission.template.PermissionTemplateDto;
 import org.sonar.server.permission.ws.PermissionWsSupport;
 import org.sonar.server.permission.ws.PermissionsWsAction;
-import org.sonar.server.permission.ws.RequestValidator;
+import org.sonar.server.permission.RequestValidator;
 import org.sonar.server.permission.ws.WsParameters;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.Permissions.CreateTemplateWsResponse;
@@ -42,7 +42,7 @@ import org.sonarqube.ws.Permissions.PermissionTemplate;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdmin;
-import static org.sonar.server.permission.ws.RequestValidator.MSG_TEMPLATE_WITH_SAME_NAME;
+import static org.sonar.server.permission.RequestValidator.MSG_TEMPLATE_WITH_SAME_NAME;
 import static org.sonar.server.permission.ws.template.PermissionTemplateDtoToPermissionTemplateResponse.toPermissionTemplateResponse;
 import static org.sonar.server.ws.WsUtils.checkRequest;
 import static org.sonar.server.ws.WsUtils.writeProtobuf;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/DeleteTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/DeleteTemplateAction.java
index f91cb750b7c..eb816ff78d5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/DeleteTemplateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/DeleteTemplateAction.java
@@ -28,6 +28,8 @@ import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.organization.DefaultTemplates;
 import org.sonar.db.permission.template.PermissionTemplateDto;
+import org.sonar.server.permission.DefaultTemplatesResolver;
+import org.sonar.server.permission.DefaultTemplatesResolverImpl;
 import org.sonar.server.permission.ws.PermissionWsSupport;
 import org.sonar.server.permission.ws.PermissionsWsAction;
 import org.sonar.server.permission.ws.WsParameters;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponse.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponse.java
index 01f579891fb..01f579891fb 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponse.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponse.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateAction.java
index 013d76b63b0..c67dd4dd784 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateAction.java
@@ -29,7 +29,7 @@ import org.sonar.server.permission.ws.PermissionWsSupport;
 import org.sonar.server.permission.ws.PermissionsWsAction;
 import org.sonar.server.permission.ws.WsParameters;
 import org.sonar.server.user.UserSession;
-import org.sonar.server.usergroups.ws.GroupIdOrAnyone;
+import org.sonar.server.permission.GroupIdOrAnyone;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdmin;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateAction.java
index 8efaba21a44..9815ea11558 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateAction.java
@@ -32,7 +32,7 @@ import org.sonar.db.permission.template.PermissionTemplateCharacteristicDto;
 import org.sonar.db.permission.template.PermissionTemplateDto;
 import org.sonar.server.permission.ws.PermissionWsSupport;
 import org.sonar.server.permission.ws.PermissionsWsAction;
-import org.sonar.server.permission.ws.RequestValidator;
+import org.sonar.server.permission.RequestValidator;
 import org.sonar.server.permission.ws.WsParameters;
 import org.sonar.server.user.UserSession;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateAction.java
index 862398f17e0..95023bb65d0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateAction.java
@@ -30,7 +30,7 @@ import org.sonar.db.permission.template.PermissionTemplateDto;
 import org.sonar.server.permission.UserId;
 import org.sonar.server.permission.ws.PermissionWsSupport;
 import org.sonar.server.permission.ws.PermissionsWsAction;
-import org.sonar.server.permission.ws.RequestValidator;
+import org.sonar.server.permission.RequestValidator;
 import org.sonar.server.permission.ws.WsParameters;
 import org.sonar.server.user.UserSession;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java
index 8b83aa87838..a62b35ff977 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java
@@ -39,6 +39,8 @@ import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.permission.template.CountByTemplateAndPermissionDto;
 import org.sonar.db.permission.template.PermissionTemplateCharacteristicDto;
 import org.sonar.db.permission.template.PermissionTemplateDto;
+import org.sonar.server.permission.DefaultTemplatesResolver;
+import org.sonar.server.permission.DefaultTemplatesResolverImpl;
 import org.sonar.server.permission.PermissionService;
 import org.sonar.server.permission.ws.PermissionWsSupport;
 import org.sonar.server.permission.ws.PermissionsWsAction;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesData.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesData.java
index 3d8301480ce..5da2039dc63 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesData.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesData.java
@@ -22,7 +22,7 @@ package org.sonar.server.permission.ws.template;
 import com.google.common.collect.Table;
 import java.util.List;
 import org.sonar.db.permission.template.PermissionTemplateDto;
-import org.sonar.server.permission.ws.template.DefaultTemplatesResolver.ResolvedDefaultTemplates;
+import org.sonar.server.permission.DefaultTemplatesResolver.ResolvedDefaultTemplates;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkState;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java
index 7afecd78a5f..3c8d160b7c0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java
@@ -34,7 +34,7 @@ import org.sonar.db.organization.OrganizationDao;
 import org.sonar.db.permission.template.PermissionTemplateDto;
 import org.sonar.server.permission.ws.PermissionWsSupport;
 import org.sonar.server.permission.ws.PermissionsWsAction;
-import org.sonar.server.permission.ws.RequestValidator;
+import org.sonar.server.permission.RequestValidator;
 import org.sonar.server.permission.ws.WsParameters;
 import org.sonar.server.user.UserSession;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/TemplateGroupsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/TemplateGroupsAction.java
index 6140dfb441a..fb4bdf1554e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/TemplateGroupsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/TemplateGroupsAction.java
@@ -37,7 +37,7 @@ import org.sonar.db.permission.template.PermissionTemplateGroupDto;
 import org.sonar.db.user.GroupDto;
 import org.sonar.server.permission.ws.PermissionWsSupport;
 import org.sonar.server.permission.ws.PermissionsWsAction;
-import org.sonar.server.permission.ws.RequestValidator;
+import org.sonar.server.permission.RequestValidator;
 import org.sonar.server.permission.ws.WsParameters;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.Permissions;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/TemplateUsersAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/TemplateUsersAction.java
index b6a49548e05..c7ec80c1b2a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/TemplateUsersAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/TemplateUsersAction.java
@@ -35,10 +35,10 @@ import org.sonar.db.permission.PermissionQuery;
 import org.sonar.db.permission.template.PermissionTemplateDto;
 import org.sonar.db.permission.template.PermissionTemplateUserDto;
 import org.sonar.db.user.UserDto;
-import org.sonar.server.issue.ws.AvatarResolver;
+import org.sonar.server.issue.AvatarResolver;
 import org.sonar.server.permission.ws.PermissionWsSupport;
 import org.sonar.server.permission.ws.PermissionsWsAction;
-import org.sonar.server.permission.ws.RequestValidator;
+import org.sonar.server.permission.RequestValidator;
 import org.sonar.server.permission.ws.WsParameters;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.Permissions;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/UpdateTemplateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/UpdateTemplateAction.java
index bf40cc593c9..0508ec5e220 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/UpdateTemplateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/UpdateTemplateAction.java
@@ -31,7 +31,7 @@ import org.sonar.db.DbSession;
 import org.sonar.db.permission.template.PermissionTemplateDto;
 import org.sonar.server.permission.ws.PermissionWsSupport;
 import org.sonar.server.permission.ws.PermissionsWsAction;
-import org.sonar.server.permission.ws.RequestValidator;
+import org.sonar.server.permission.RequestValidator;
 import org.sonar.server.permission.ws.WsParameters;
 import org.sonar.server.user.UserSession;
 import org.sonar.server.ws.WsUtils;
@@ -43,7 +43,7 @@ import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static org.apache.commons.lang.StringUtils.isBlank;
 import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdmin;
-import static org.sonar.server.permission.ws.RequestValidator.MSG_TEMPLATE_WITH_SAME_NAME;
+import static org.sonar.server.permission.RequestValidator.MSG_TEMPLATE_WITH_SAME_NAME;
 import static org.sonar.server.permission.ws.template.PermissionTemplateDtoToPermissionTemplateResponse.toPermissionTemplateResponse;
 import static org.sonar.server.ws.WsUtils.checkRequest;
 import static org.sonar.server.ws.WsUtils.writeProtobuf;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/WsTemplateRef.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/WsTemplateRef.java
index d04209d4dda..d04209d4dda 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/WsTemplateRef.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/WsTemplateRef.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/package-info.java
index c9c46623882..c9c46623882 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelAction.java
index 06734192c12..06734192c12 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelActionModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelActionModule.java
index 45a768fe24d..45a768fe24d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelActionModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelActionModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelClusterService.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelClusterService.java
index f041b61b75d..f041b61b75d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelClusterService.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelClusterService.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelService.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelService.java
index 8cf4227372c..8cf4227372c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelService.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelService.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelStandaloneService.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelStandaloneService.java
index 0f010f859fd..0f010f859fd 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelStandaloneService.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelStandaloneService.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ClusterSystemInfoWriter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ClusterSystemInfoWriter.java
index 97c92f8323f..97c92f8323f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ClusterSystemInfoWriter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ClusterSystemInfoWriter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/DbMigrationJsonWriter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/DbMigrationJsonWriter.java
index 46cad20ea11..46cad20ea11 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/DbMigrationJsonWriter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/DbMigrationJsonWriter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/DbMigrationStatusAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/DbMigrationStatusAction.java
index aeecbd20b92..aeecbd20b92 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/DbMigrationStatusAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/DbMigrationStatusAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/HealthAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/HealthAction.java
index 17c6827fae3..17c6827fae3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/HealthAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/HealthAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/HealthActionModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/HealthActionModule.java
index 453d287fc1c..453d287fc1c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/HealthActionModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/HealthActionModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/HealthActionSupport.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/HealthActionSupport.java
index 63273872a77..63273872a77 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/HealthActionSupport.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/HealthActionSupport.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/IndexAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/IndexAction.java
index dc194a049a0..dc194a049a0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/IndexAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/IndexAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/InfoAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/InfoAction.java
index f9e94ea24b0..f9e94ea24b0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/InfoAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/InfoAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/L10nWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/L10nWs.java
index 66e834709de..66e834709de 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/L10nWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/L10nWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/LogsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/LogsAction.java
index c28f77a3166..c28f77a3166 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/LogsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/LogsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDbAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/MigrateDbAction.java
index 3f0b3be8010..3f0b3be8010 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDbAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/MigrateDbAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/PingAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/PingAction.java
index 8ba825caeac..8ba825caeac 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/PingAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/PingAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/RestartAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/RestartAction.java
index 763b3cb1ed5..763b3cb1ed5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/RestartAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/RestartAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SafeModeHealthAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SafeModeHealthAction.java
index e9857e0c80b..e9857e0c80b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SafeModeHealthAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SafeModeHealthAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SafeModeHealthActionModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SafeModeHealthActionModule.java
index 96f8f7bb934..96f8f7bb934 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SafeModeHealthActionModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SafeModeHealthActionModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ServerWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ServerWs.java
index 73359a0dcc5..73359a0dcc5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ServerWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ServerWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriter.java
index 3557fa3caf4..3557fa3caf4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/StatusAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/StatusAction.java
index c9e5441d342..c9e5441d342 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/StatusAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/StatusAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemInfoWriter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SystemInfoWriter.java
index 5c0b046a028..5c0b046a028 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemInfoWriter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SystemInfoWriter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SystemWs.java
index e4ae26cb818..e4ae26cb818 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SystemWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SystemWsAction.java
index 9fa442abc3b..9fa442abc3b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SystemWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/UpgradesAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/UpgradesAction.java
index a6fd5f95ec6..a6fd5f95ec6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/UpgradesAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/UpgradesAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/WebSystemInfoModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/WebSystemInfoModule.java
index 6966465b999..e430a11d77f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/WebSystemInfoModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/WebSystemInfoModule.java
@@ -17,13 +17,21 @@
  * 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.platform.monitoring;
+package org.sonar.server.platform.ws;
 
 import org.sonar.api.config.Configuration;
 import org.sonar.core.platform.Module;
 import org.sonar.process.systeminfo.JvmPropertiesSection;
 import org.sonar.process.systeminfo.JvmStateSection;
 import org.sonar.server.platform.WebServer;
+import org.sonar.server.platform.monitoring.DbConnectionSection;
+import org.sonar.server.platform.monitoring.DbSection;
+import org.sonar.server.platform.monitoring.EsIndexesSection;
+import org.sonar.server.platform.monitoring.EsStateSection;
+import org.sonar.server.platform.monitoring.LoggingSection;
+import org.sonar.server.platform.monitoring.PluginsSection;
+import org.sonar.server.platform.monitoring.SettingsSection;
+import org.sonar.server.platform.monitoring.StandaloneSystemSection;
 import org.sonar.server.platform.monitoring.cluster.AppNodesInfoLoaderImpl;
 import org.sonar.server.platform.monitoring.cluster.CeQueueGlobalSection;
 import org.sonar.server.platform.monitoring.cluster.EsClusterStateSection;
@@ -32,9 +40,6 @@ import org.sonar.server.platform.monitoring.cluster.GlobalSystemSection;
 import org.sonar.server.platform.monitoring.cluster.NodeSystemSection;
 import org.sonar.server.platform.monitoring.cluster.ProcessInfoProvider;
 import org.sonar.server.platform.monitoring.cluster.SearchNodesInfoLoaderImpl;
-import org.sonar.server.platform.ws.ClusterSystemInfoWriter;
-import org.sonar.server.platform.ws.InfoAction;
-import org.sonar.server.platform.ws.StandaloneSystemInfoWriter;
 
 public class WebSystemInfoModule extends Module {
   private final Configuration configuration;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/package-info.java
index 6b4ff041314..6b4ff041314 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailableAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/AvailableAction.java
index df2e98b29e7..df2e98b29e7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailableAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/AvailableAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/CancelAllAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/CancelAllAction.java
index 313e95957ff..313e95957ff 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/CancelAllAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/CancelAllAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/DownloadAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/DownloadAction.java
index 714a2cd91db..714a2cd91db 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/DownloadAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/DownloadAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstallAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/InstallAction.java
index 2edb6a0802a..2edb6a0802a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstallAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/InstallAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java
index 7b0688bf94f..7b0688bf94f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PendingAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/PendingAction.java
index 1c849b45358..1c849b45358 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PendingAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/PendingAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginUpdateAggregator.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/PluginUpdateAggregator.java
index 50efcf6588d..50efcf6588d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginUpdateAggregator.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/PluginUpdateAggregator.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java
index a9320dcc867..a9320dcc867 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginsWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/PluginsWs.java
index 01d959a7b95..01d959a7b95 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginsWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/PluginsWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginsWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/PluginsWsAction.java
index 4fefb93b6e2..4fefb93b6e2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginsWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/PluginsWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UninstallAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/UninstallAction.java
index 1dee3ab193a..1dee3ab193a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UninstallAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/UninstallAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/UpdateAction.java
index ca98ce40d47..ca98ce40d47 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/UpdateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java
index 094d974bad9..094d974bad9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/package-info.java
index 69121bbc2be..69121bbc2be 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/plugins/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java
index ac22ae8011d..ac22ae8011d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/BulkUpdateKeyAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/BulkUpdateKeyAction.java
index fd7a9187211..fd7a9187211 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/BulkUpdateKeyAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/BulkUpdateKeyAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/CreateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/CreateAction.java
index e00eb10bc24..e00eb10bc24 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/CreateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/CreateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/DeleteAction.java
index 6f4543b58d2..69a3fd525e6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/DeleteAction.java
@@ -33,11 +33,9 @@ import org.sonar.server.project.ProjectLifeCycleListeners;
 import org.sonar.server.user.UserSession;
 
 import static java.util.Collections.singleton;
-import static org.sonar.server.component.ComponentFinder.ParamNames.PROJECT_ID_AND_PROJECT;
 import static org.sonar.server.project.Project.from;
 import static org.sonar.server.ws.KeyExamples.KEY_PROJECT_EXAMPLE_001;
 import static org.sonarqube.ws.client.project.ProjectsWsParameters.PARAM_PROJECT;
-import static org.sonarqube.ws.client.project.ProjectsWsParameters.PARAM_PROJECT_ID;
 
 public class DeleteAction implements ProjectsWsAction {
   private static final String ACTION = "delete";
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/ProjectsWs.java
index 57abf9c682c..57abf9c682c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/ProjectsWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/ProjectsWsAction.java
index 648bdc762a5..648bdc762a5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/ProjectsWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/ProjectsWsModule.java
index d23b37459b7..d23b37459b7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/ProjectsWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsSupport.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/ProjectsWsSupport.java
index fcbfe4cf3b4..fcbfe4cf3b4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsSupport.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/ProjectsWsSupport.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/SearchAction.java
index 9d843421db6..9d843421db6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/SearchAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchMyProjectsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/SearchMyProjectsAction.java
index dc8a7b4904d..dc8a7b4904d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchMyProjectsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/SearchMyProjectsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchMyProjectsData.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/SearchMyProjectsData.java
index d484a048975..d484a048975 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchMyProjectsData.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/SearchMyProjectsData.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchRequest.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/SearchRequest.java
index 648626972c9..648626972c9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchRequest.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/SearchRequest.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/UpdateDefaultVisibilityAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/UpdateDefaultVisibilityAction.java
index 88a695b7a8b..88a695b7a8b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/UpdateDefaultVisibilityAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/UpdateDefaultVisibilityAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/UpdateKeyAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/UpdateKeyAction.java
index 3d7d955a76b..3d7d955a76b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/UpdateKeyAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/UpdateKeyAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/UpdateVisibilityAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/UpdateVisibilityAction.java
index f5416d4671d..f5416d4671d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/UpdateVisibilityAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/UpdateVisibilityAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/package-info.java
index 03ab14fc81b..03ab14fc81b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/CreateEventAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/CreateEventAction.java
index a3dbb8e75a0..a3dbb8e75a0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/CreateEventAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/CreateEventAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/DeleteAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/DeleteAction.java
index 661b425c872..661b425c872 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/DeleteAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/DeleteAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/DeleteEventAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/DeleteEventAction.java
index e02e5c5a9b4..e02e5c5a9b4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/DeleteEventAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/DeleteEventAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/EventCategory.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/EventCategory.java
index 4429ccae17c..4429ccae17c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/EventCategory.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/EventCategory.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/EventValidator.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/EventValidator.java
index c6f293eb819..c6f293eb819 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/EventValidator.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/EventValidator.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWs.java
index c8172d14c58..c8172d14c58 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWsAction.java
index c4e3e1af276..c4e3e1af276 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWsParameters.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWsParameters.java
index c372e1b46bc..c372e1b46bc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWsParameters.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysesWsParameters.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ProjectAnalysisModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysisWsModule.java
index bf6642e45b4..fb57094a4df 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ProjectAnalysisModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/ProjectAnalysisWsModule.java
@@ -17,19 +17,11 @@
  * 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.projectanalysis;
+package org.sonar.server.projectanalysis.ws;
 
 import org.sonar.core.platform.Module;
-import org.sonar.server.projectanalysis.ws.CreateEventAction;
-import org.sonar.server.projectanalysis.ws.DeleteAction;
-import org.sonar.server.projectanalysis.ws.DeleteEventAction;
-import org.sonar.server.projectanalysis.ws.ProjectAnalysesWs;
-import org.sonar.server.projectanalysis.ws.SearchAction;
-import org.sonar.server.projectanalysis.ws.SetBaselineAction;
-import org.sonar.server.projectanalysis.ws.UnsetBaselineAction;
-import org.sonar.server.projectanalysis.ws.UpdateEventAction;
 
-public class ProjectAnalysisModule extends Module {
+public class ProjectAnalysisWsModule extends Module {
 
   @Override
   protected void configureModule() {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/SearchAction.java
index 37384b8ffdd..9a5f012f502 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/SearchAction.java
@@ -58,7 +58,6 @@ import static org.sonar.server.projectanalysis.ws.ProjectAnalysesWsParameters.PA
 import static org.sonar.server.projectanalysis.ws.ProjectAnalysesWsParameters.PARAM_CATEGORY;
 import static org.sonar.server.projectanalysis.ws.ProjectAnalysesWsParameters.PARAM_FROM;
 import static org.sonar.server.projectanalysis.ws.ProjectAnalysesWsParameters.PARAM_PROJECT;
-import static org.sonar.server.projectanalysis.ws.ProjectAnalysesWsParameters.PARAM_PULL_REQUEST;
 import static org.sonar.server.projectanalysis.ws.ProjectAnalysesWsParameters.PARAM_TO;
 import static org.sonar.server.projectanalysis.ws.SearchRequest.DEFAULT_PAGE_SIZE;
 import static org.sonar.server.ws.KeyExamples.KEY_BRANCH_EXAMPLE_001;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchData.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/SearchData.java
index 14f79cbd1ca..14f79cbd1ca 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchData.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/SearchData.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchRequest.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/SearchRequest.java
index a6bdfbf4c82..a6bdfbf4c82 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchRequest.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/SearchRequest.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchResponseBuilder.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/SearchResponseBuilder.java
index c1529b9de0b..c1529b9de0b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchResponseBuilder.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/SearchResponseBuilder.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SetBaselineAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/SetBaselineAction.java
index 981cf8659f0..981cf8659f0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SetBaselineAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/SetBaselineAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/UnsetBaselineAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/UnsetBaselineAction.java
index 869f434f2bc..869f434f2bc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/UnsetBaselineAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/UnsetBaselineAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/UpdateEventAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/UpdateEventAction.java
index d9ac06544dc..d9ac06544dc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/UpdateEventAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/UpdateEventAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/package-info.java
index f8a5c59ee8b..f8a5c59ee8b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectanalysis/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/CreateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectlink/ws/CreateAction.java
index 37c26b8fe6e..37c26b8fe6e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/CreateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectlink/ws/CreateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/DeleteAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectlink/ws/DeleteAction.java
index 58d3ed3a5a5..58d3ed3a5a5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/DeleteAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectlink/ws/DeleteAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksModule.java
index 91329b7958d..91329b7958d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWs.java
index de038d84183..de038d84183 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWsAction.java
index cd3639b8d4f..cd3639b8d4f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWsParameters.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWsParameters.java
index 053e2bb3a6e..053e2bb3a6e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWsParameters.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWsParameters.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectlink/ws/SearchAction.java
index e3bef423b0d..e3bef423b0d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectlink/ws/SearchAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectlink/ws/package-info.java
index 18da0f518d8..18da0f518d8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectlink/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projectlink/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWs.java
index fb4d16d08a1..fb4d16d08a1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsAction.java
index 967920d2516..967920d2516 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsModule.java
index e7e158868d0..e7e158868d0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projecttag/ws/ProjectTagsWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projecttag/ws/SearchAction.java
index dafe6c0a5f1..dafe6c0a5f1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projecttag/ws/SearchAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/SetAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projecttag/ws/SetAction.java
index d2812b0cb48..d2812b0cb48 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/SetAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projecttag/ws/SetAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projecttag/ws/package-info.java
index 3808edea7f7..3808edea7f7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projecttag/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/projecttag/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/property/ws/IndexAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/property/ws/IndexAction.java
index a07b1e8c336..a07b1e8c336 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/property/ws/IndexAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/property/ws/IndexAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/property/ws/PropertiesWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/property/ws/PropertiesWs.java
index 6908cfc5ef1..6908cfc5ef1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/property/ws/PropertiesWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/property/ws/PropertiesWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/property/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/property/ws/package-info.java
index a8ce783fbc6..a8ce783fbc6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/property/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/property/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java
index d95f64fd6c4..d95f64fd6c4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java
index b9d9892f924..b9d9892f924 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateConditionAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/CreateConditionAction.java
index bba2eda8d2c..bba2eda8d2c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateConditionAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/CreateConditionAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeleteConditionAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/DeleteConditionAction.java
index 7fa14e3d463..7fa14e3d463 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeleteConditionAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/DeleteConditionAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java
index 9ded531b6b2..9ded531b6b2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DestroyAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/DestroyAction.java
index 9b50241c227..9b50241c227 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DestroyAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/DestroyAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/GetByProjectAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/GetByProjectAction.java
index ef3da24ed3b..ef3da24ed3b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/GetByProjectAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/GetByProjectAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java
index 109da2d6321..109da2d6321 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ProjectStatusAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/ProjectStatusAction.java
index 904ade20796..904ade20796 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ProjectStatusAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/ProjectStatusAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatter.java
index ff8008f16ef..ff8008f16ef 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatter.java
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/QualityGateWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/QualityGateWsModule.java
new file mode 100644
index 00000000000..9d376ac9ec7
--- /dev/null
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/QualityGateWsModule.java
@@ -0,0 +1,48 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info 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.qualitygate.ws;
+
+import org.sonar.core.platform.Module;
+
+public class QualityGateWsModule extends Module {
+  @Override
+  protected void configureModule() {
+    add(
+      QualityGatesWsSupport.class,
+      QualityGatesWs.class,
+      ListAction.class,
+      SearchAction.class,
+      ShowAction.class,
+      CreateAction.class,
+      RenameAction.class,
+      CopyAction.class,
+      DestroyAction.class,
+      SetAsDefaultAction.class,
+      SelectAction.class,
+      DeselectAction.class,
+      CreateConditionAction.class,
+      DeleteConditionAction.class,
+      UpdateConditionAction.class,
+      ProjectStatusAction.class,
+      GetByProjectAction.class
+
+    );
+  }
+}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWs.java
index ef8a3561bfc..ef8a3561bfc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWsAction.java
index 3a26df8b60b..3a26df8b60b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWsParameters.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWsParameters.java
index 608e18a8b7d..608e18a8b7d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWsParameters.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWsParameters.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWsSupport.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWsSupport.java
index 92170f83fd1..92170f83fd1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWsSupport.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/QualityGatesWsSupport.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/RenameAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/RenameAction.java
index ea6faab78fc..ea6faab78fc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/RenameAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/RenameAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java
index 743b0e65370..743b0e65370 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SelectAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/SelectAction.java
index 9dd6a1f5ab0..9dd6a1f5ab0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SelectAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/SelectAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SetAsDefaultAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/SetAsDefaultAction.java
index 5dc154ce8e2..5dc154ce8e2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SetAsDefaultAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/SetAsDefaultAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ShowAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/ShowAction.java
index d751010d5ff..d751010d5ff 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ShowAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/ShowAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/UpdateConditionAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/UpdateConditionAction.java
index a469c320141..a469c320141 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/UpdateConditionAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/UpdateConditionAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/package-info.java
index 91fa09c29be..91fa09c29be 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRuleAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRuleAction.java
index 3ab2fee8ad9..3ab2fee8ad9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRuleAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRuleAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRulesAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRulesAction.java
index 4604753938b..4604753938b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRulesAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRulesAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/AddGroupAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/AddGroupAction.java
index bcf66f785c1..bcf66f785c1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/AddGroupAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/AddGroupAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/AddProjectAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/AddProjectAction.java
index 7bcabfd2887..7bcabfd2887 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/AddProjectAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/AddProjectAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/AddUserAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/AddUserAction.java
index 59451223b0a..59451223b0a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/AddUserAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/AddUserAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java
index 0cd9f483237..0cd9f483237 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkChangeWsResponse.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/BulkChangeWsResponse.java
index f48ffd5abef..f48ffd5abef 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkChangeWsResponse.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/BulkChangeWsResponse.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangeParentAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ChangeParentAction.java
index c43c283b7d8..c43c283b7d8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangeParentAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ChangeParentAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogAction.java
index 22150b14b3c..22150b14b3c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java
index 57766279f9d..57766279f9d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CopyAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/CopyAction.java
index cb76d699690..cb76d699690 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CopyAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/CopyAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java
index 66d1217bdb6..66d1217bdb6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRuleAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRuleAction.java
index 2475395eb02..2475395eb02 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRuleAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRuleAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRulesAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRulesAction.java
index 661debe20fe..661debe20fe 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRulesAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/DeactivateRulesAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeleteAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/DeleteAction.java
index b957b37c084..b957b37c084 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeleteAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/DeleteAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java
index 114baed2168..114baed2168 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportersAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ExportersAction.java
index a9dbe58cea8..a9dbe58cea8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportersAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ExportersAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ImportersAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ImportersAction.java
index d333d7c97a1..d333d7c97a1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ImportersAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ImportersAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/InheritanceAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/InheritanceAction.java
index 458c6dd0aed..458c6dd0aed 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/InheritanceAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/InheritanceAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProjectsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ProjectsAction.java
index 3ded50637ea..3ded50637ea 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProjectsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ProjectsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileReference.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/QProfileReference.java
index 4f14e909639..4f14e909639 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileReference.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/QProfileReference.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsAction.java
index ec9f03f7ce9..ec9f03f7ce9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsSupport.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsSupport.java
index 7b41142f03a..7b41142f03a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsSupport.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsSupport.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java
index 587c94c3986..587c94c3986 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWsModule.java
index 1a1b82453bd..1a1b82453bd 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RemoveGroupAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/RemoveGroupAction.java
index 468f8f66132..468f8f66132 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RemoveGroupAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/RemoveGroupAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RemoveProjectAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/RemoveProjectAction.java
index 5fd81105995..5fd81105995 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RemoveProjectAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/RemoveProjectAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RemoveUserAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/RemoveUserAction.java
index 88d4b84237d..88d4b84237d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RemoveUserAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/RemoveUserAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RenameAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/RenameAction.java
index 05e8497628e..05e8497628e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RenameAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/RenameAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/RestoreAction.java
index fbd160573dd..fbd160573dd 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/RestoreAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInAction.java
index 67358c9ce1d..67358c9ce1d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java
index 589298e48dc..589298e48dc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchData.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchData.java
index 12aec4b7ae0..12aec4b7ae0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchData.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchData.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchGroupsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchGroupsAction.java
index bd44ca33f0a..bd44ca33f0a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchGroupsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchGroupsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchUsersAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchUsersAction.java
index a60f5a40058..5e3acd72690 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchUsersAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchUsersAction.java
@@ -36,7 +36,7 @@ import org.sonar.db.qualityprofile.QProfileDto;
 import org.sonar.db.qualityprofile.SearchUsersQuery;
 import org.sonar.db.qualityprofile.UserMembershipDto;
 import org.sonar.db.user.UserDto;
-import org.sonar.server.issue.ws.AvatarResolver;
+import org.sonar.server.issue.AvatarResolver;
 import org.sonarqube.ws.Common;
 import org.sonarqube.ws.Qualityprofiles.SearchUsersResponse;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchUsersRequest.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchUsersRequest.java
index e89cf7d6505..e89cf7d6505 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchUsersRequest.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchUsersRequest.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SetDefaultAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SetDefaultAction.java
index 7832cfc51d1..7832cfc51d1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SetDefaultAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SetDefaultAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ShowAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ShowAction.java
index 24946d83c68..24946d83c68 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ShowAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ShowAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/package-info.java
index 88c33a7b8f8..88c33a7b8f8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/root/ws/RootWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/root/ws/RootWsModule.java
index bec17fcc5e4..bec17fcc5e4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/root/ws/RootWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/root/ws/RootWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/root/ws/RootsWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/root/ws/RootsWs.java
index 87372795a88..87372795a88 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/root/ws/RootsWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/root/ws/RootsWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/root/ws/RootsWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/root/ws/RootsWsAction.java
index 1f944504d44..1f944504d44 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/root/ws/RootsWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/root/ws/RootsWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/root/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/root/ws/SearchAction.java
index da697d3317a..da697d3317a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/root/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/root/ws/SearchAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/root/ws/SetRootAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/root/ws/SetRootAction.java
index d965587b2f8..d965587b2f8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/root/ws/SetRootAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/root/ws/SetRootAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/root/ws/UnsetRootAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/root/ws/UnsetRootAction.java
index be8a0d83d70..be8a0d83d70 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/root/ws/UnsetRootAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/root/ws/UnsetRootAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/root/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/root/ws/package-info.java
index 9778c06413e..9778c06413e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/root/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/root/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java
index 2bf0d378c59..2bf0d378c59 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/AppAction.java
index a44e8ecdb95..a44e8ecdb95 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/AppAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/CreateAction.java
index 6cae5e46adf..6cae5e46adf 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/CreateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/DeleteAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/DeleteAction.java
index 13d3d17058f..13d3d17058f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/DeleteAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/DeleteAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ListAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/ListAction.java
index 93ead783511..93ead783511 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ListAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/ListAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java
index e314e6b07bf..e314e6b07bf 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapper.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RuleMapper.java
index 05739d7ab56..05739d7ab56 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapper.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RuleMapper.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleQueryFactory.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RuleQueryFactory.java
index 35482f639be..35482f639be 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleQueryFactory.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RuleQueryFactory.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleWsSupport.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RuleWsSupport.java
index 551548eee01..551548eee01 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleWsSupport.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RuleWsSupport.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RulesWs.java
index 4b60b314ef1..4b60b314ef1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RulesWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RulesWsAction.java
index cb9a1f0d4a1..cb9a1f0d4a1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RulesWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWsParameters.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RulesWsParameters.java
index bf420fe8347..bf420fe8347 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWsParameters.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RulesWsParameters.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/SearchAction.java
index 6b13e86e350..6b13e86e350 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/SearchAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/ShowAction.java
index d3ce556fba8..d3ce556fba8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/ShowAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/TagsAction.java
index c1295b40356..c1295b40356 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/TagsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/UpdateAction.java
index 39eb128af3c..39eb128af3c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/UpdateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/package-info.java
index ee4b4aae699..ee4b4aae699 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/CheckSecretKeyAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/CheckSecretKeyAction.java
index 732b72a0958..732b72a0958 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/CheckSecretKeyAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/CheckSecretKeyAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/EncryptAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/EncryptAction.java
index 314fff12448..314fff12448 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/EncryptAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/EncryptAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/GenerateSecretKeyAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/GenerateSecretKeyAction.java
index 0e3f5813f81..0e3f5813f81 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/GenerateSecretKeyAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/GenerateSecretKeyAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ListDefinitionsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/ListDefinitionsAction.java
index 23c5936382c..23c5936382c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ListDefinitionsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/ListDefinitionsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/PropertySetExtractor.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/PropertySetExtractor.java
index c1997e6c0ad..c1997e6c0ad 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/PropertySetExtractor.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/PropertySetExtractor.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ResetAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/ResetAction.java
index 292a4682dea..292a4682dea 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ResetAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/ResetAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SetAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SetAction.java
index 346d367a2ac..346d367a2ac 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SetAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SetAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/Setting.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/Setting.java
index 7edd7675b93..7edd7675b93 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/Setting.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/Setting.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingValidations.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SettingValidations.java
index e8aeae8218c..e8aeae8218c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingValidations.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SettingValidations.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsUpdater.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SettingsUpdater.java
index 4152b18c59f..4152b18c59f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsUpdater.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SettingsUpdater.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SettingsWs.java
index 81674c2a45b..81674c2a45b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SettingsWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SettingsWsAction.java
index 4b34673f716..4b34673f716 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SettingsWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SettingsWsModule.java
index 61371ee1e3d..61371ee1e3d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SettingsWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsParameters.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SettingsWsParameters.java
index 93eb2820789..93eb2820789 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsParameters.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SettingsWsParameters.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsSupport.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SettingsWsSupport.java
index 5572c4cf9c7..5572c4cf9c7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsSupport.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SettingsWsSupport.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ValuesAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/ValuesAction.java
index da397caf774..da397caf774 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ValuesAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/ValuesAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/package-info.java
index eeb8e956d82..eeb8e956d82 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/HashAction.java
index 3fe0039e44c..3fe0039e44c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/HashAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/IndexAction.java
index bd6386ca96c..bd6386ca96c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/IndexAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/IssueSnippetsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/IssueSnippetsAction.java
index 80b5114dba8..80b5114dba8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/IssueSnippetsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/IssueSnippetsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/LinesAction.java
index a7ecc8cb5ee..a7ecc8cb5ee 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/LinesAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesJsonWriter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/LinesJsonWriter.java
index 3fba15c87c7..3fba15c87c7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesJsonWriter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/LinesJsonWriter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/RawAction.java
index 95a21e614e0..95a21e614e0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/RawAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/ScmAction.java
index 1112ef9b273..1112ef9b273 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/ScmAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/ShowAction.java
index 6d9208856f8..6d9208856f8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/ShowAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourceWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/SourceWsModule.java
index 8f4fc07b0fc..8f4fc07b0fc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourceWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/SourceWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/SourcesWs.java
index b4f8dc9cf77..b4f8dc9cf77 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/SourcesWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/SourcesWsAction.java
index 9cf158402d1..9cf158402d1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/SourcesWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/package-info.java
index 8ed6cf6603c..8ed6cf6603c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/ComponentAction.java
index 3083e4e34e1..3083e4e34e1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/ComponentAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/GlobalAction.java
index cd363fb12fd..cd363fb12fd 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/GlobalAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/MarketplaceAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/MarketplaceAction.java
index 49f3205b52b..49f3205b52b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/MarketplaceAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/MarketplaceAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/NavigationWs.java
index 7199da47662..7199da47662 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/NavigationWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/NavigationWsAction.java
index 7a7824505ff..7a7824505ff 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/NavigationWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/NavigationWsModule.java
index a5fbdb449bb..a5fbdb449bb 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/NavigationWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/OrganizationAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/OrganizationAction.java
index 19d4b8a9a19..19d4b8a9a19 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/OrganizationAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/OrganizationAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/SettingsAction.java
index 614f3d3ca4a..614f3d3ca4a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/SettingsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/package-info.java
index cef56238a5c..cef56238a5c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/InstalledPluginsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/updatecenter/ws/InstalledPluginsAction.java
index 794cf66e027..794cf66e027 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/InstalledPluginsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/updatecenter/ws/InstalledPluginsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWs.java
index 35e749de253..35e749de253 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWsAction.java
index d0446b0bfd3..d0446b0bfd3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWsModule.java
index d4209ca34a5..a9af13ec956 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWsModule.java
@@ -17,8 +17,18 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-@ParametersAreNonnullByDefault
-package org.sonar.server.ws;
+package org.sonar.server.updatecenter.ws;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import org.sonar.core.platform.Module;
 
+public class UpdateCenterWsModule extends Module {
+  @Override
+  protected void configureModule() {
+    add(
+      UploadAction.class,
+      InstalledPluginsAction.class,
+      UpdateCenterWs.class
+
+    );
+  }
+}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UploadAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/updatecenter/ws/UploadAction.java
index c30ccacb222..c30ccacb222 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UploadAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/updatecenter/ws/UploadAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/updatecenter/ws/package-info.java
index 7f76a29d3c4..7f76a29d3c4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/updatecenter/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/ChangePasswordAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/ChangePasswordAction.java
index d9e0c243e1d..d9e0c243e1d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/ChangePasswordAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/ChangePasswordAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/CreateAction.java
index dfc25e18ef8..dfc25e18ef8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/CreateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/CurrentAction.java
index 627ef9234e9..94d70e4ba5f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/CurrentAction.java
@@ -34,7 +34,7 @@ import org.sonar.db.component.ComponentDto;
 import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.permission.OrganizationPermission;
 import org.sonar.db.user.UserDto;
-import org.sonar.server.issue.ws.AvatarResolver;
+import org.sonar.server.issue.AvatarResolver;
 import org.sonar.server.organization.DefaultOrganizationProvider;
 import org.sonar.server.permission.PermissionService;
 import org.sonar.server.user.UserSession;
@@ -42,7 +42,6 @@ import org.sonarqube.ws.Users.CurrentWsResponse;
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Strings.emptyToNull;
-import static java.lang.String.format;
 import static java.util.Collections.singletonList;
 import static java.util.Optional.empty;
 import static java.util.Optional.of;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/DeactivateAction.java
index b14463ecd7c..b14463ecd7c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/DeactivateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/EmailValidator.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/EmailValidator.java
index 0eac82c1eeb..0eac82c1eeb 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/EmailValidator.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/EmailValidator.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/GroupsAction.java
index 2e55570e902..2e55570e902 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/GroupsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/HomepageTypes.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/HomepageTypes.java
index 5f211e27e9e..5f211e27e9e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/HomepageTypes.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/HomepageTypes.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/HomepageTypesImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/HomepageTypesImpl.java
index 0702521b768..0702521b768 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/HomepageTypesImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/HomepageTypesImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/IdentityProvidersAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/IdentityProvidersAction.java
index 60fe8658a1d..60fe8658a1d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/IdentityProvidersAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/IdentityProvidersAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/SearchAction.java
index 1fc93cb4f1a..625475d9b8b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/SearchAction.java
@@ -36,7 +36,7 @@ import org.sonar.db.DbSession;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.es.SearchOptions;
 import org.sonar.server.es.SearchResult;
-import org.sonar.server.issue.ws.AvatarResolver;
+import org.sonar.server.issue.AvatarResolver;
 import org.sonar.server.user.UserSession;
 import org.sonar.server.user.index.UserDoc;
 import org.sonar.server.user.index.UserIndex;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/SetHomepageAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/SetHomepageAction.java
index f6837a3f448..f6837a3f448 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/SetHomepageAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/SetHomepageAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/SetSettingAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/SetSettingAction.java
index a98aaa6c553..a98aaa6c553 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/SetSettingAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/SetSettingAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/SkipOnboardingTutorialAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/SkipOnboardingTutorialAction.java
index 0215ec2b48c..0215ec2b48c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/SkipOnboardingTutorialAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/SkipOnboardingTutorialAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/UpdateAction.java
index 84ad9580067..84ad9580067 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/UpdateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateLoginAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/UpdateLoginAction.java
index 21410bf8a2f..21410bf8a2f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateLoginAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/UpdateLoginAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserJsonWriter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/UserJsonWriter.java
index a9925a1bf63..a9925a1bf63 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserJsonWriter.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/UserJsonWriter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserPropertiesWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/UserPropertiesWs.java
index b8cf7228810..b8cf7228810 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserPropertiesWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/UserPropertiesWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/UsersWs.java
index 6bb7b03831f..6bb7b03831f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/UsersWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/UsersWsAction.java
index 4b40b7a3acf..4b40b7a3acf 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/UsersWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/UsersWsModule.java
index 8e94362ab4b..8e94362ab4b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/UsersWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/package-info.java
index bb686dedd86..bb686dedd86 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java
index b17c549cc5b..b17c549cc5b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/CreateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/CreateAction.java
index 54c6eb05f41..54c6eb05f41 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/CreateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/CreateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java
index bb2510e1afb..bb2510e1afb 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupWsRef.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/GroupWsRef.java
index 2ab9f0d040d..22d8bb9338e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupWsRef.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/GroupWsRef.java
@@ -23,6 +23,8 @@ import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import org.sonar.api.security.DefaultGroups;
+import org.sonar.server.permission.GroupId;
+import org.sonar.server.permission.GroupIdOrAnyone;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupWsSupport.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/GroupWsSupport.java
index a3de38da449..725c033b37f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupWsSupport.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/GroupWsSupport.java
@@ -29,6 +29,8 @@ import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.user.GroupDto;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.organization.DefaultOrganizationProvider;
+import org.sonar.server.permission.GroupId;
+import org.sonar.server.permission.GroupIdOrAnyone;
 import org.sonar.server.usergroups.DefaultGroupFinder;
 import org.sonarqube.ws.UserGroups;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java
index bcca168e355..bcca168e355 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java
index f997261d1e7..f997261d1e7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UpdateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/UpdateAction.java
index dde339ad21d..dde339ad21d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UpdateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/UpdateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/UserGroupsModule.java
index 995526ad9d7..995526ad9d7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/UserGroupsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWs.java
index af2c4d7ebd8..af2c4d7ebd8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWsAction.java
index 18924fc956b..18924fc956b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/UserGroupsWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java
index 9ed71fed219..006fdad967a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java
@@ -33,6 +33,7 @@ import org.sonar.db.DbSession;
 import org.sonar.db.permission.OrganizationPermission;
 import org.sonar.db.user.UserMembershipDto;
 import org.sonar.db.user.UserMembershipQuery;
+import org.sonar.server.permission.GroupId;
 import org.sonar.server.user.UserSession;
 
 import static org.sonar.api.utils.Paging.forPageIndex;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/package-info.java
index f6fbce00776..f6fbce00776 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/GenerateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/GenerateAction.java
index 9e405d6696c..9e405d6696c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/GenerateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/GenerateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/RevokeAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/RevokeAction.java
index 162344d1fc9..162344d1fc9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/RevokeAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/RevokeAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/SearchAction.java
index 04414b6d63e..04414b6d63e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/SearchAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/UserTokenSupport.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/UserTokenSupport.java
index 107cd827607..107cd827607 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/UserTokenSupport.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/UserTokenSupport.java
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/UserTokenWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/UserTokenWsModule.java
new file mode 100644
index 00000000000..ab2fef46a75
--- /dev/null
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/UserTokenWsModule.java
@@ -0,0 +1,36 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info 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.usertoken.ws;
+
+import org.sonar.core.platform.Module;
+
+public class UserTokenWsModule extends Module {
+  @Override
+  protected void configureModule() {
+    add(
+      UserTokensWs.class,
+      UserTokenSupport.class,
+      GenerateAction.class,
+      RevokeAction.class,
+      SearchAction.class
+
+    );
+  }
+}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/UserTokensWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/UserTokensWs.java
index 01659bd91d9..01659bd91d9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/UserTokensWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/UserTokensWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/UserTokensWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/UserTokensWsAction.java
index 5c5cc5b4f7a..5c5cc5b4f7a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/UserTokensWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/UserTokensWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/UserTokensWsParameters.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/UserTokensWsParameters.java
index 037b695bd7a..037b695bd7a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/UserTokensWsParameters.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/UserTokensWsParameters.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/package-info.java
index c9f1f8c9474..c9f1f8c9474 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usertoken/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usertoken/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/CreateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/CreateAction.java
index 9f485ee9e7d..9f485ee9e7d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/CreateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/CreateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/DeleteAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/DeleteAction.java
index d88edc6149d..d88edc6149d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/DeleteAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/DeleteAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/ListAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/ListAction.java
index 5b698ec4101..5b698ec4101 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/ListAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/ListAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/UpdateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/UpdateAction.java
index 8ca9ac95c35..8ca9ac95c35 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/UpdateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/UpdateAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveriesAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveriesAction.java
index 1207f67864d..1207f67864d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveriesAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveriesAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveryAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveryAction.java
index 040856eb99f..040856eb99f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveryAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/WebhookDeliveryAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookSupport.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/WebhookSupport.java
index 3a31239648d..3a31239648d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookSupport.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/WebhookSupport.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookWsSupport.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/WebhookWsSupport.java
index 00982a416f1..00982a416f1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhookWsSupport.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/WebhookWsSupport.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/WebhooksWs.java
index 0ac8a54f686..0ac8a54f686 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/WebhooksWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/WebhooksWsAction.java
index 01435298b90..01435298b90 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/WebhooksWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/WebhooksWsModule.java
index 37f2c9f2a5a..37f2c9f2a5a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/WebhooksWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWsParameters.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/WebhooksWsParameters.java
index ec847a6d3e3..ec847a6d3e3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/WebhooksWsParameters.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/WebhooksWsParameters.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/package-info.java
index 94357cf8331..94357cf8331 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/webhook/ws/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/ws/ListAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ws/ws/ListAction.java
index cb6ae48ad65..cb6ae48ad65 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/ws/ListAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ws/ws/ListAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/ws/ResponseExampleAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ws/ws/ResponseExampleAction.java
index fef217442dc..fef217442dc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/ws/ResponseExampleAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ws/ws/ResponseExampleAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWs.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ws/ws/WebServicesWs.java
index 8d019552f12..8d019552f12 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWs.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ws/ws/WebServicesWs.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ws/ws/WebServicesWsAction.java
index 631ef5f0799..631ef5f0799 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ws/ws/WebServicesWsAction.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ws/ws/WebServicesWsModule.java
index 00ead379c2a..00ead379c2a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/ws/WebServicesWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ws/ws/WebServicesWsModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/ws/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ws/ws/package-info.java
index a56f2a3a392..a56f2a3a392 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/ws/package-info.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ws/ws/package-info.java
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/authentication/ws/example-validate.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/authentication/ws/example-validate.json
index 00566d10712..00566d10712 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/authentication/ws/example-validate.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/authentication/ws/example-validate.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/measure-example.svg b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/measure-example.svg
index afe58ce92e4..afe58ce92e4 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/measure-example.svg
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/measure-example.svg
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/quality_gate-example.svg b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/quality_gate-example.svg
index 957e85063dd..957e85063dd 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/quality_gate-example.svg
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/quality_gate-example.svg
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/error.svg b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/error.svg
index f088f6fc5a6..f088f6fc5a6 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/error.svg
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/error.svg
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/sonarcloud/badge.svg b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/sonarcloud/badge.svg
index 68877b16b1a..68877b16b1a 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/sonarcloud/badge.svg
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/sonarcloud/badge.svg
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/sonarcloud/quality_gate_failed.svg b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/sonarcloud/quality_gate_failed.svg
index 629d3b34baf..629d3b34baf 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/sonarcloud/quality_gate_failed.svg
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/sonarcloud/quality_gate_failed.svg
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/sonarcloud/quality_gate_passed.svg b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/sonarcloud/quality_gate_passed.svg
index f8267221aa6..f8267221aa6 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/sonarcloud/quality_gate_passed.svg
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/sonarcloud/quality_gate_passed.svg
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/sonarcloud/quality_gate_warn.svg b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/sonarcloud/quality_gate_warn.svg
index 386c518bc23..386c518bc23 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/sonarcloud/quality_gate_warn.svg
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/sonarcloud/quality_gate_warn.svg
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/sonarqube/badge.svg b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/sonarqube/badge.svg
index 4d25c408873..4d25c408873 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/sonarqube/badge.svg
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/sonarqube/badge.svg
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/sonarqube/quality_gate_failed.svg b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/sonarqube/quality_gate_failed.svg
index e04aac0bc93..e04aac0bc93 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/sonarqube/quality_gate_failed.svg
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/sonarqube/quality_gate_failed.svg
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/sonarqube/quality_gate_passed.svg b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/sonarqube/quality_gate_passed.svg
index 23b835da71d..23b835da71d 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/sonarqube/quality_gate_passed.svg
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/sonarqube/quality_gate_passed.svg
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/sonarqube/quality_gate_warn.svg b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/sonarqube/quality_gate_warn.svg
index a0c22703d15..a0c22703d15 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/badge/ws/templates/sonarqube/quality_gate_warn.svg
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/badge/ws/templates/sonarqube/quality_gate_warn.svg
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/batch/batch-file-example.txt b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/batch/batch-file-example.txt
index 335ff55c5e6..335ff55c5e6 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/batch/batch-file-example.txt
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/batch/batch-file-example.txt
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/batch/index-example.txt b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/batch/index-example.txt
index fe0e4772a8c..fe0e4772a8c 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/batch/index-example.txt
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/batch/index-example.txt
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/batch/issues-example.proto b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/batch/issues-example.proto
index f7044b5996a..f7044b5996a 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/batch/issues-example.proto
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/batch/issues-example.proto
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/batch/project-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/batch/project-example.json
index 2d2be1c3c90..2d2be1c3c90 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/batch/project-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/batch/project-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/branch/pr/ws/list-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/branch/pr/ws/list-example.json
index 877d25c17ef..877d25c17ef 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/branch/pr/ws/list-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/branch/pr/ws/list-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/branch/ws/list-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/branch/ws/list-example.json
index 2e95cea4b2e..2e95cea4b2e 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/branch/ws/list-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/branch/ws/list-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/activity-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/activity-example.json
index 8b4b298e59a..8b4b298e59a 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/activity-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/activity-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/activity_status-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/activity_status-example.json
index e6fdfa8b7e6..e6fdfa8b7e6 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/activity_status-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/activity_status-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/analysis_status-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/analysis_status-example.json
index 33a06b140c3..33a06b140c3 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/analysis_status-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/analysis_status-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/component-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/component-example.json
index 2c2dfe3ca15..2c2dfe3ca15 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/component-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/component-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/info-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/info-example.json
index 840ce8325fe..840ce8325fe 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/info-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/info-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/is_queue_empty-example.txt b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/is_queue_empty-example.txt
index 27ba77ddaf6..27ba77ddaf6 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/is_queue_empty-example.txt
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/is_queue_empty-example.txt
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/submit-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/submit-example.json
index 7cee04f5da8..7cee04f5da8 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/submit-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/submit-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/task-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/task-example.json
index 9bd6f326ae6..9bd6f326ae6 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/task-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/task-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/task_types-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/task_types-example.json
index 6dd30192bea..6dd30192bea 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/task_types-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/task_types-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/worker_count-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/worker_count-example.json
index 0b54c6d1dc4..0b54c6d1dc4 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/worker_count-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/worker_count-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/app-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/component/ws/app-example.json
index d06748ba5e9..d06748ba5e9 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/app-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/component/ws/app-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/events-index-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/component/ws/events-index-example.json
index 573397d36aa..573397d36aa 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/events-index-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/component/ws/events-index-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/resources-example-index.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/component/ws/resources-example-index.json
index 5ee255d0324..5ee255d0324 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/resources-example-index.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/component/ws/resources-example-index.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search-components-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/component/ws/search-components-example.json
index 0eb71aa1f14..0eb71aa1f14 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search-components-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/component/ws/search-components-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search_projects-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/component/ws/search_projects-example.json
index ca957b47819..ca957b47819 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search_projects-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/component/ws/search_projects-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/show-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/component/ws/show-example.json
index 835b437f6c2..835b437f6c2 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/show-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/component/ws/show-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/suggestions-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/component/ws/suggestions-example.json
index 48a24e137b7..48a24e137b7 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/suggestions-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/component/ws/suggestions-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/tree-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/component/ws/tree-example.json
index 522daffccc0..522daffccc0 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/tree-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/component/ws/tree-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/duplication/ws/show-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/duplication/ws/show-example.json
index 64f3fb78903..64f3fb78903 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/duplication/ws/show-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/duplication/ws/show-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/favorite/ws/search-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/favorite/ws/search-example.json
index 414b8d7d4a9..414b8d7d4a9 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/favorite/ws/search-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/favorite/ws/search-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/add_comment-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/add_comment-example.json
index 6f52df0df9d..6f52df0df9d 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/add_comment-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/add_comment-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/assign-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/assign-example.json
index 16269e44266..16269e44266 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/assign-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/assign-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/authors-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/authors-example.json
index 67f3e8330eb..67f3e8330eb 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/authors-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/authors-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/bulk_change-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/bulk_change-example.json
index cfd9f3a8a7c..cfd9f3a8a7c 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/bulk_change-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/bulk_change-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/changelog-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/changelog-example.json
index 45a0a287e07..45a0a287e07 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/changelog-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/changelog-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/component-tags-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/component-tags-example.json
index f2c89f9c709..f2c89f9c709 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/component-tags-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/component-tags-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/delete_comment-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/delete_comment-example.json
index 16269e44266..16269e44266 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/delete_comment-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/delete_comment-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/do_transition-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/do_transition-example.json
index 16269e44266..16269e44266 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/do_transition-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/do_transition-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/edit_comment-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/edit_comment-example.json
index 16269e44266..16269e44266 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/edit_comment-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/edit_comment-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/search-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/search-example.json
index 59325f9a192..59325f9a192 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/search-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/search-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/set_severity-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/set_severity-example.json
index 16269e44266..16269e44266 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/set_severity-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/set_severity-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/set_tags-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/set_tags-example.json
index 1ccdedc6d71..1ccdedc6d71 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/set_tags-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/set_tags-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/set_type-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/set_type-example.json
index 16269e44266..16269e44266 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/set_type-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/set_type-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/tags-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/tags-example.json
index 4b25b0ce852..4b25b0ce852 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/tags-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/issue/ws/tags-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/language/ws/example-list.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/language/ws/example-list.json
index 0ead938d72f..0ead938d72f 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/language/ws/example-list.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/language/ws/example-list.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/measure/custom/ws/example-metrics.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/measure/custom/ws/example-metrics.json
index 773fdc7b154..773fdc7b154 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/measure/custom/ws/example-metrics.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/measure/custom/ws/example-metrics.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/measure/custom/ws/example-search.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/measure/custom/ws/example-search.json
index bfe0c9891d0..bfe0c9891d0 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/measure/custom/ws/example-search.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/measure/custom/ws/example-search.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/component-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/measure/ws/component-example.json
index dbac846a7e7..dbac846a7e7 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/component-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/measure/ws/component-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/component_tree-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/measure/ws/component_tree-example.json
index 701f30a3970..701f30a3970 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/component_tree-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/measure/ws/component_tree-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/search-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/measure/ws/search-example.json
index 2ee709129e6..2ee709129e6 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/search-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/measure/ws/search-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/search_history-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/measure/ws/search_history-example.json
index 5e0f96fa966..5e0f96fa966 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/search_history-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/measure/ws/search_history-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/metric/ws/example-domains.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/metric/ws/example-domains.json
index 137bdfd443f..137bdfd443f 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/metric/ws/example-domains.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/metric/ws/example-domains.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/metric/ws/example-search.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/metric/ws/example-search.json
index 608ba77048c..608ba77048c 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/metric/ws/example-search.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/metric/ws/example-search.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/metric/ws/example-types.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/metric/ws/example-types.json
index 2952cbd2e18..2952cbd2e18 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/metric/ws/example-types.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/metric/ws/example-types.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/notification/ws/list-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/notification/ws/list-example.json
index 0ebee0c1963..0ebee0c1963 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/notification/ws/list-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/notification/ws/list-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/add_member-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/organization/ws/add_member-example.json
index a380dce9df6..a380dce9df6 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/add_member-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/organization/ws/add_member-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/create-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/organization/ws/create-example.json
index a350af2f7a4..a350af2f7a4 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/create-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/organization/ws/create-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/prevent_user_deletion-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/organization/ws/prevent_user_deletion-example.json
index 149a283b943..149a283b943 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/prevent_user_deletion-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/organization/ws/prevent_user_deletion-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/search-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/organization/ws/search-example.json
index f21be6f9871..f21be6f9871 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/search-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/organization/ws/search-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/search_members-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/organization/ws/search_members-example.json
index 26b7786c7a7..26b7786c7a7 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/search_members-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/organization/ws/search_members-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/search_my_organization-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/organization/ws/search_my_organization-example.json
index 4d2fe03957c..4d2fe03957c 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/organization/ws/search_my_organization-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/organization/ws/search_my_organization-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/groups-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/groups-example.json
index 4d85eb8b44a..4d85eb8b44a 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/groups-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/groups-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_global_permissions-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/search_global_permissions-example.json
index 6663b287091..6663b287091 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_global_permissions-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/search_global_permissions-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json
index 8d936d8d7f4..8d936d8d7f4 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/create_template-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/template/create_template-example.json
index c25e059764d..c25e059764d 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/create_template-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/template/create_template-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/search_templates-example-with-views.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/template/search_templates-example-with-views.json
index 79ed0083e90..79ed0083e90 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/search_templates-example-with-views.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/template/search_templates-example-with-views.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/search_templates-example-without-views.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/template/search_templates-example-without-views.json
index 8213c7ee53a..8213c7ee53a 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/search_templates-example-without-views.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/template/search_templates-example-without-views.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/template_groups-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/template/template_groups-example.json
index 7a8ead45905..7a8ead45905 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/template_groups-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/template/template_groups-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/template_users-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/template/template_users-example.json
index f33861b4444..f33861b4444 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/template_users-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/template/template_users-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/update_template-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/template/update_template-example.json
index 3ef72119a12..3ef72119a12 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/template/update_template-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/template/update_template-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/users-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/users-example.json
index 3c4e357f176..3c4e357f176 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/users-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/permission/ws/users-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-health.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/example-health.json
index 28c8b37cc84..28c8b37cc84 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-health.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/example-health.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-migrate_db.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/example-migrate_db.json
index dd137d7cd21..dd137d7cd21 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-migrate_db.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/example-migrate_db.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-server-version.txt b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/example-server-version.txt
index 67eadace32b..67eadace32b 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-server-version.txt
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/example-server-version.txt
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-status.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/example-status.json
index c73b420dcbd..c73b420dcbd 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-status.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/example-status.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-upgrades_plugins.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/example-upgrades_plugins.json
index 7364af7a584..7364af7a584 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-upgrades_plugins.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/example-upgrades_plugins.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/info-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/info-example.json
index f7bb42019c2..f7bb42019c2 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/info-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/info-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/l10n-index-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/l10n-index-example.json
index e4ce8a21d1d..e4ce8a21d1d 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/l10n-index-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/l10n-index-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/logs-example.log b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/logs-example.log
index c5cc421ffd5..c5cc421ffd5 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/logs-example.log
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/logs-example.log
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/ping-example.txt b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/ping-example.txt
index 8e5546941b0..8e5546941b0 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/ping-example.txt
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/platform/ws/ping-example.txt
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-available_plugins.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/plugins/ws/example-available_plugins.json
index f6453bc3008..f6453bc3008 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-available_plugins.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/plugins/ws/example-available_plugins.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json
index 19934ee780a..19934ee780a 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json
index 9bb8f01b8a1..9bb8f01b8a1 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-updates_plugins.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/plugins/ws/example-updates_plugins.json
index 8adb9a7226a..8adb9a7226a 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-updates_plugins.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/plugins/ws/example-updates_plugins.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/project/ws/bulk_update_key-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/project/ws/bulk_update_key-example.json
index 7ad4b3d8a2c..7ad4b3d8a2c 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/project/ws/bulk_update_key-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/project/ws/bulk_update_key-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/project/ws/create-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/project/ws/create-example.json
index 077da7925c5..077da7925c5 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/project/ws/create-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/project/ws/create-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/project/ws/ghosts-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/project/ws/ghosts-example.json
index 87444dadeaa..87444dadeaa 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/project/ws/ghosts-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/project/ws/ghosts-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/project/ws/index-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/project/ws/index-example.json
index a5d82ab23c3..a5d82ab23c3 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/project/ws/index-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/project/ws/index-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/project/ws/provisioned-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/project/ws/provisioned-example.json
index 6361d3cd0ec..6361d3cd0ec 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/project/ws/provisioned-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/project/ws/provisioned-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/project/ws/search-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/project/ws/search-example.json
index adcedb935d1..adcedb935d1 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/project/ws/search-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/project/ws/search-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/project/ws/search_my_projects-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/project/ws/search_my_projects-example.json
index 3f98a8e6164..3f98a8e6164 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/project/ws/search_my_projects-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/project/ws/search_my_projects-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/create_event-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/projectanalysis/ws/create_event-example.json
index f728e0a09bd..f728e0a09bd 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/create_event-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/projectanalysis/ws/create_event-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/search-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/projectanalysis/ws/search-example.json
index 841ac0d14a1..841ac0d14a1 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/search-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/projectanalysis/ws/search-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/update_event-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/projectanalysis/ws/update_event-example.json
index f728e0a09bd..f728e0a09bd 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/projectanalysis/ws/update_event-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/projectanalysis/ws/update_event-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/projectlink/ws/create-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/projectlink/ws/create-example.json
index afe211f0fb9..afe211f0fb9 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/projectlink/ws/create-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/projectlink/ws/create-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/projectlink/ws/search-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/projectlink/ws/search-example.json
index 5f0afb8c2db..5f0afb8c2db 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/projectlink/ws/search-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/projectlink/ws/search-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/projecttag/ws/search-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/projecttag/ws/search-example.json
index 79656739879..79656739879 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/projecttag/ws/search-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/projecttag/ws/search-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/property/ws/index-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/property/ws/index-example.json
index 9574238f574..9574238f574 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/property/ws/index-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/property/ws/index-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/create-condition-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualitygate/ws/create-condition-example.json
index e53dcdd1fb1..e53dcdd1fb1 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/create-condition-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualitygate/ws/create-condition-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/create-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualitygate/ws/create-example.json
index f362b98bd3f..f362b98bd3f 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/create-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualitygate/ws/create-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/get_by_project-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualitygate/ws/get_by_project-example.json
index 3cf49b85ded..3cf49b85ded 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/get_by_project-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualitygate/ws/get_by_project-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/list-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualitygate/ws/list-example.json
index e29de1d7dfa..e29de1d7dfa 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/list-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualitygate/ws/list-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/project_status-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualitygate/ws/project_status-example.json
index e5c5610b29d..e5c5610b29d 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/project_status-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualitygate/ws/project_status-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/search-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualitygate/ws/search-example.json
index 97332a0480b..97332a0480b 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/search-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualitygate/ws/search-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/show-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualitygate/ws/show-example.json
index 0e2b63cc310..0e2b63cc310 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/show-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualitygate/ws/show-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/backup-example.xml b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/backup-example.xml
index 6ad8d08b63c..6ad8d08b63c 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/backup-example.xml
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/backup-example.xml
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/changelog-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/changelog-example.json
index 50ba1e571d9..50ba1e571d9 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/changelog-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/changelog-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/compare-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/compare-example.json
index 82f84ee0446..82f84ee0446 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/compare-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/compare-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/copy-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/copy-example.json
index 72b96f9aac9..72b96f9aac9 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/copy-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/copy-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/create-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/create-example.json
index b154d6233ae..b154d6233ae 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/create-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/create-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/export-example.xml b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/export-example.xml
index cdc4a38d4bd..cdc4a38d4bd 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/export-example.xml
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/export-example.xml
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/exporters-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/exporters-example.json
index 642a2bde09d..642a2bde09d 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/exporters-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/exporters-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/importers-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/importers-example.json
index 8750609887a..8750609887a 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/importers-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/importers-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/inheritance-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/inheritance-example.json
index 7bc92893843..7bc92893843 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/inheritance-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/inheritance-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/projects-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/projects-example.json
index d1993655b57..d1993655b57 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/projects-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/projects-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/search-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/search-example.json
index eb13119b881..eb13119b881 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/search-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/search-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/search_groups-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/search_groups-example.json
index a8fdbcf1066..a8fdbcf1066 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/search_groups-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/search_groups-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/search_users-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/search_users-example.json
index b6f08a35742..b6f08a35742 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/search_users-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/search_users-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/show-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/show-example.json
index 3d047742da6..3d047742da6 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/show-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/qualityprofile/ws/show-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/root/ws/search-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/root/ws/search-example.json
index 3299aa305ff..3299aa305ff 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/root/ws/search-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/root/ws/search-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/app-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/rule/ws/app-example.json
index b8dc5cbc67c..b8dc5cbc67c 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/app-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/rule/ws/app-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/create-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/rule/ws/create-example.json
index 7fab5a09713..7fab5a09713 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/create-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/rule/ws/create-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/list-example.txt b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/rule/ws/list-example.txt
index 556550e9aab..556550e9aab 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/list-example.txt
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/rule/ws/list-example.txt
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/repositories-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/rule/ws/repositories-example.json
index e73c41171c5..e73c41171c5 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/repositories-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/rule/ws/repositories-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/search-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/rule/ws/search-example.json
index b6b8279303d..b6b8279303d 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/search-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/rule/ws/search-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/show-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/rule/ws/show-example.json
index 8664d1509fa..8664d1509fa 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/show-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/rule/ws/show-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/tags-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/rule/ws/tags-example.json
index a6e6ea9f4a1..a6e6ea9f4a1 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/tags-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/rule/ws/tags-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/update-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/rule/ws/update-example.json
index 1b8d109ce6e..1b8d109ce6e 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/update-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/rule/ws/update-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/check_secret_key-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/setting/ws/check_secret_key-example.json
index 38ce4256389..38ce4256389 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/check_secret_key-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/setting/ws/check_secret_key-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/encrypt-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/setting/ws/encrypt-example.json
index ae4fd4cfca4..ae4fd4cfca4 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/encrypt-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/setting/ws/encrypt-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/generate_secret_key-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/setting/ws/generate_secret_key-example.json
index 775c80c3fe1..775c80c3fe1 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/generate_secret_key-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/setting/ws/generate_secret_key-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/list_definitions-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/setting/ws/list_definitions-example.json
index e69a3aeffaa..e69a3aeffaa 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/list_definitions-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/setting/ws/list_definitions-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/values-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/setting/ws/values-example.json
index f6c39e5a6dc..f6c39e5a6dc 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/values-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/setting/ws/values-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-hash.txt b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/source/ws/example-hash.txt
index 29b3fc4dccc..29b3fc4dccc 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-hash.txt
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/source/ws/example-hash.txt
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-index.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/source/ws/example-index.json
index 89745d72612..89745d72612 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-index.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/source/ws/example-index.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-raw.txt b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/source/ws/example-raw.txt
index f93f54c9e32..f93f54c9e32 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-raw.txt
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/source/ws/example-raw.txt
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-scm.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/source/ws/example-scm.json
index c2a14f0246d..c2a14f0246d 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-scm.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/source/ws/example-scm.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-show.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/source/ws/example-show.json
index 74ef52f4510..74ef52f4510 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-show.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/source/ws/example-show.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/source/ws/lines-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/source/ws/lines-example.json
index 3ecb866a8cd..3ecb866a8cd 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/source/ws/lines-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/source/ws/lines-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/component-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ui/ws/component-example.json
index b6968301a3c..b6968301a3c 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/component-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ui/ws/component-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/global-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ui/ws/global-example.json
index 97dd61de33f..97dd61de33f 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/global-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ui/ws/global-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/marketplace-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ui/ws/marketplace-example.json
index ef30daefc92..ef30daefc92 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/marketplace-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ui/ws/marketplace-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/organization-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ui/ws/organization-example.json
index 1f3cc604bb8..1f3cc604bb8 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/organization-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ui/ws/organization-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/settings-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ui/ws/settings-example.json
index bd5bb3de19d..bd5bb3de19d 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/settings-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ui/ws/settings-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/updatecenter/ws/installed_plugins-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/updatecenter/ws/installed_plugins-example.json
index ca65c9072da..ca65c9072da 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/updatecenter/ws/installed_plugins-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/updatecenter/ws/installed_plugins-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/create-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/user/ws/create-example.json
index b4bdfda4fe5..b4bdfda4fe5 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/create-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/user/ws/create-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/current-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/user/ws/current-example.json
index 7bd1e6b84e0..7bd1e6b84e0 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/current-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/user/ws/current-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/deactivate-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/user/ws/deactivate-example.json
index e45bb206694..e45bb206694 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/deactivate-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/user/ws/deactivate-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/groups-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/user/ws/groups-example.json
index fcf4d68e287..fcf4d68e287 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/groups-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/user/ws/groups-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/identity_providers-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/user/ws/identity_providers-example.json
index e39ba1da119..e39ba1da119 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/identity_providers-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/user/ws/identity_providers-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/search-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/user/ws/search-example.json
index 1666ecb556a..1666ecb556a 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/search-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/user/ws/search-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/update-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/user/ws/update-example.json
index b4bdfda4fe5..b4bdfda4fe5 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/update-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/user/ws/update-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/create-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/usergroups/ws/create-example.json
index 909f1491ab6..909f1491ab6 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/create-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/usergroups/ws/create-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/search-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/usergroups/ws/search-example.json
index 3749028681f..3749028681f 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/search-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/usergroups/ws/search-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/update-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/usergroups/ws/update-example.json
index 9380f8a0a9b..9380f8a0a9b 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/update-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/usergroups/ws/update-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/users-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/usergroups/ws/users-example.json
index d90046c4686..d90046c4686 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/users-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/usergroups/ws/users-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/usertoken/ws/generate-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/usertoken/ws/generate-example.json
index cbf4aacb362..cbf4aacb362 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/usertoken/ws/generate-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/usertoken/ws/generate-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/usertoken/ws/search-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/usertoken/ws/search-example.json
index b19fd6032ba..b19fd6032ba 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/usertoken/ws/search-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/usertoken/ws/search-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/webhook/ws/example-deliveries.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/webhook/ws/example-deliveries.json
index d95c99d3ba3..d95c99d3ba3 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/webhook/ws/example-deliveries.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/webhook/ws/example-deliveries.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/webhook/ws/example-delivery.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/webhook/ws/example-delivery.json
index d4da8033df5..d4da8033df5 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/webhook/ws/example-delivery.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/webhook/ws/example-delivery.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/webhook/ws/example-webhook-create.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/webhook/ws/example-webhook-create.json
index 29b4ee4762e..29b4ee4762e 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/webhook/ws/example-webhook-create.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/webhook/ws/example-webhook-create.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/webhook/ws/example-webhooks-list.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/webhook/ws/example-webhooks-list.json
index 008bfd0f624..008bfd0f624 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/webhook/ws/example-webhooks-list.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/webhook/ws/example-webhooks-list.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ws/ws/list-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ws/ws/list-example.json
index a01a7493008..a01a7493008 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ws/ws/list-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ws/ws/list-example.json
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ws/ws/response_example-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ws/ws/response_example-example.json
index 86a6548d865..86a6548d865 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ws/ws/response_example-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ws/ws/response_example-example.json
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/authentication/ws/AuthenticationWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/authentication/ws/AuthenticationWsModuleTest.java
new file mode 100644
index 00000000000..cdf279fa3b7
--- /dev/null
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/authentication/ws/AuthenticationWsModuleTest.java
@@ -0,0 +1,36 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info 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.authentication.ws;
+
+import org.junit.Test;
+import org.sonar.core.platform.ComponentContainer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER;
+
+public class AuthenticationWsModuleTest {
+
+  @Test
+  public void verify_count_of_added_components() {
+    ComponentContainer container = new ComponentContainer();
+    new AuthenticationWsModule().configure(container);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 4);
+  }
+}
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/AuthenticationWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/authentication/ws/AuthenticationWsTest.java
index 2e6612c685c..2e6612c685c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/AuthenticationWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/authentication/ws/AuthenticationWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/LoginActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/authentication/ws/LoginActionTest.java
index 05f5b9c0e71..05f5b9c0e71 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/LoginActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/authentication/ws/LoginActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/LogoutActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/authentication/ws/LogoutActionTest.java
index 0593331dbbe..0593331dbbe 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/LogoutActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/authentication/ws/LogoutActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/ValidateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/authentication/ws/ValidateActionTest.java
index 649818cbc64..649818cbc64 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/ValidateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/authentication/ws/ValidateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/badge/ws/ETagUtilsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/ETagUtilsTest.java
index 9fd64e1403f..9fd64e1403f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/badge/ws/ETagUtilsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/ETagUtilsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/badge/ws/MeasureActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/MeasureActionTest.java
index 59ddc6217ab..59ddc6217ab 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/badge/ws/MeasureActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/MeasureActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/badge/ws/ProjectBadgesWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/ProjectBadgesWsModuleTest.java
index fc136819db3..fc136819db3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/badge/ws/ProjectBadgesWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/ProjectBadgesWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/badge/ws/ProjectBadgesWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/ProjectBadgesWsTest.java
index 4f052607d1c..4f052607d1c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/badge/ws/ProjectBadgesWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/ProjectBadgesWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/badge/ws/QualityGateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/QualityGateActionTest.java
index d1897463493..d1897463493 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/badge/ws/QualityGateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/QualityGateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/badge/ws/SvgFormatterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/SvgFormatterTest.java
index c1f0f48a3d2..c1f0f48a3d2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/badge/ws/SvgFormatterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/SvgFormatterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/badge/ws/SvgGeneratorTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/SvgGeneratorTest.java
index d34710a619e..d34710a619e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/badge/ws/SvgGeneratorTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/SvgGeneratorTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/BatchIndexTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/batch/BatchIndexTest.java
index ea524e66dea..ea524e66dea 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/batch/BatchIndexTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/batch/BatchIndexTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/BatchWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/batch/BatchWsModuleTest.java
index 15a9ac25a8b..15a9ac25a8b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/batch/BatchWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/batch/BatchWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/FileActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/batch/FileActionTest.java
index 8232d373655..8232d373655 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/batch/FileActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/batch/FileActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/IndexActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/batch/IndexActionTest.java
index 90771156a59..90771156a59 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/batch/IndexActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/batch/IndexActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/batch/IssuesActionTest.java
index f8b0c85863c..f8b0c85863c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/batch/IssuesActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/batch/ProjectActionTest.java
index 8e412ec5563..8e412ec5563 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/batch/ProjectActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/batch/ProjectDataLoaderTest.java
index c357b96495c..c357b96495c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/batch/ProjectDataLoaderTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/branch/pr/ws/DeleteActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/pr/ws/DeleteActionTest.java
index 970a88a6171..970a88a6171 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/branch/pr/ws/DeleteActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/pr/ws/DeleteActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/branch/pr/ws/ListActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/pr/ws/ListActionTest.java
index 6c4027f55f5..6c4027f55f5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/branch/pr/ws/ListActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/pr/ws/ListActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/branch/pr/ws/PullRequestWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/pr/ws/PullRequestWsModuleTest.java
index 87e087f3d4b..87e087f3d4b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/branch/pr/ws/PullRequestWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/pr/ws/PullRequestWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/branch/pr/ws/PullRequestsWsParametersTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/pr/ws/PullRequestsWsParametersTest.java
index b5c409a955a..b5c409a955a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/branch/pr/ws/PullRequestsWsParametersTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/pr/ws/PullRequestsWsParametersTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/branch/pr/ws/PullRequestsWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/pr/ws/PullRequestsWsTest.java
index 9423d202648..9423d202648 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/branch/pr/ws/PullRequestsWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/pr/ws/PullRequestsWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/branch/ws/BranchWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/ws/BranchWsModuleTest.java
index cf5884296e5..cf5884296e5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/branch/ws/BranchWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/ws/BranchWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/branch/ws/BranchesWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/ws/BranchesWsTest.java
index bce53818f32..bce53818f32 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/branch/ws/BranchesWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/ws/BranchesWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/branch/ws/DeleteActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/ws/DeleteActionTest.java
index 69f109e3bc6..69f109e3bc6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/branch/ws/DeleteActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/ws/DeleteActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/branch/ws/ListActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/ws/ListActionTest.java
index 091cb5079e4..091cb5079e4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/branch/ws/ListActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/ws/ListActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/branch/ws/RenameActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/ws/RenameActionTest.java
index 4e515e567a4..4e515e567a4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/branch/ws/RenameActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/branch/ws/RenameActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java
index 417ff3ea812..417ff3ea812 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityStatusActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/ActivityStatusActionTest.java
index 8e5f8f5ce58..8e5f8f5ce58 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityStatusActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/ActivityStatusActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/AnalysisStatusActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/AnalysisStatusActionTest.java
index 2585a7e8723..2585a7e8723 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/AnalysisStatusActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/AnalysisStatusActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/CancelActionTest.java
index 002d03aba0f..002d03aba0f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/CancelActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelAllActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/CancelAllActionTest.java
index 9208c821939..9208c821939 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelAllActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/CancelAllActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/CeWsModuleTest.java
index 287bf8090a4..287bf8090a4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/CeWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/CeWsTest.java
index b43f35cf256..b43f35cf256 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/CeWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java
index ab40701362b..ab40701362b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/InfoActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/InfoActionTest.java
index dd8672dd7fe..dd8672dd7fe 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/InfoActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/InfoActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/PauseActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/PauseActionTest.java
index 0bdb133819f..0bdb133819f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/PauseActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/PauseActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ResumeActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/ResumeActionTest.java
index 325efa2b302..325efa2b302 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ResumeActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/ResumeActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/SubmitActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/SubmitActionTest.java
index c6285debe5e..c6285debe5e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/SubmitActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/SubmitActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java
index bab303b4755..bab303b4755 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java
index 099874e2161..099874e2161 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskTypesActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/TaskTypesActionTest.java
index 5b92b2fc3e3..5b92b2fc3e3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskTypesActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/TaskTypesActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/WorkerCountActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/WorkerCountActionTest.java
index f5d260a1a94..f5d260a1a94 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/WorkerCountActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/WorkerCountActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/AppActionTest.java
index b9a26f11ae0..b9a26f11ae0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/AppActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentDtoToWsComponentTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/ComponentDtoToWsComponentTest.java
index 57eb5023b75..57eb5023b75 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentDtoToWsComponentTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/ComponentDtoToWsComponentTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/ComponentsWsModuleTest.java
index f209f3c21b5..f209f3c21b5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/ComponentsWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java
index 98185fdb059..98185fdb059 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/FilterParserTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/FilterParserTest.java
index c6b9962a076..c6b9962a076 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/FilterParserTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/FilterParserTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactoryTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactoryTest.java
index 402dca62714..402dca62714 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactoryTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactoryTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidatorTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidatorTest.java
index 3cff88b0c15..3cff88b0c15 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidatorTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidatorTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/SearchActionTest.java
index f7825ddc42d..f7825ddc42d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/SearchActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java
index 2fb20536bf0..2fb20536bf0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ShowActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/ShowActionTest.java
index 9b8a0b48bc1..9b8a0b48bc1 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ShowActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/ShowActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java
index 4e220848654..4e220848654 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/TreeActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/TreeActionTest.java
index 8c5d67906f6..8c5d67906f6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/TreeActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/TreeActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java
index f071f8b2052..f071f8b2052 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java
index 579484364bb..579484364bb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowResponseBuilderTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/duplication/ws/ShowResponseBuilderTest.java
index 2c15c536e34..2c15c536e34 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowResponseBuilderTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/duplication/ws/ShowResponseBuilderTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/email/ws/EmailsWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/email/ws/EmailsWsModuleTest.java
index ebf3a270680..ebf3a270680 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/email/ws/EmailsWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/email/ws/EmailsWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/email/ws/SendActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/email/ws/SendActionTest.java
index b52738519cb..b52738519cb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/email/ws/SendActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/email/ws/SendActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/favorite/ws/AddActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/favorite/ws/AddActionTest.java
index e16069b3233..e16069b3233 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/favorite/ws/AddActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/favorite/ws/AddActionTest.java
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/favorite/ws/FavoriteWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/favorite/ws/FavoriteWsModuleTest.java
new file mode 100644
index 00000000000..c107311b720
--- /dev/null
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/favorite/ws/FavoriteWsModuleTest.java
@@ -0,0 +1,37 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info 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.favorite.ws;
+
+import org.junit.Test;
+import org.sonar.core.platform.ComponentContainer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER;
+
+public class FavoriteWsModuleTest {
+  @Test
+  public void verify_count_of_added_components() {
+    ComponentContainer container = new ComponentContainer();
+    new FavoriteWsModule().configure(container);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 5);
+  }
+
+
+}
diff --git a/server/sonar-server/src/test/java/org/sonar/server/favorite/ws/FavoritesWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/favorite/ws/FavoritesWsTest.java
index 474cc50f8bb..474cc50f8bb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/favorite/ws/FavoritesWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/favorite/ws/FavoritesWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/favorite/ws/RemoveActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/favorite/ws/RemoveActionTest.java
index 05e050e2e63..05e050e2e63 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/favorite/ws/RemoveActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/favorite/ws/RemoveActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/favorite/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/favorite/ws/SearchActionTest.java
index e4f23df7342..e4f23df7342 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/favorite/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/favorite/ws/SearchActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AddCommentActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/AddCommentActionTest.java
index 5bcfb594eb0..d5f01f3cf05 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AddCommentActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/AddCommentActionTest.java
@@ -43,9 +43,8 @@ import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.exceptions.UnauthorizedException;
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.IssueFinder;
-import org.sonar.server.issue.WebIssueStorage;
-import org.sonar.server.issue.IssueUpdater;
 import org.sonar.server.issue.TestIssueChangePostProcessor;
+import org.sonar.server.issue.WebIssueStorage;
 import org.sonar.server.issue.index.IssueIndexer;
 import org.sonar.server.issue.index.IssueIteratorFactory;
 import org.sonar.server.issue.notification.IssuesChangesNotificationSerializer;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AssignActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/AssignActionTest.java
index aa81a36fdc9..3919c8fea27 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AssignActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/AssignActionTest.java
@@ -37,7 +37,6 @@ import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.exceptions.UnauthorizedException;
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.IssueFinder;
-import org.sonar.server.issue.IssueUpdater;
 import org.sonar.server.issue.TestIssueChangePostProcessor;
 import org.sonar.server.issue.WebIssueStorage;
 import org.sonar.server.issue.index.IssueIndexer;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AuthorsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/AuthorsActionTest.java
index 03b62e1bd11..03b62e1bd11 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AuthorsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/AuthorsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/BulkChangeActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/BulkChangeActionTest.java
index d4d4bc6375e..d4d4bc6375e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/BulkChangeActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/BulkChangeActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java
index 918feb3e52f..158ff824d0f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java
@@ -37,6 +37,7 @@ import org.sonar.db.rule.RuleDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.db.user.UserTesting;
 import org.sonar.server.exceptions.ForbiddenException;
+import org.sonar.server.issue.AvatarResolverImpl;
 import org.sonar.server.issue.IssueFinder;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestRequest;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ComponentTagsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/ComponentTagsActionTest.java
index d168cddfd88..d168cddfd88 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ComponentTagsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/ComponentTagsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/DeleteCommentActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/DeleteCommentActionTest.java
index 862955f2ae3..862955f2ae3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/DeleteCommentActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/DeleteCommentActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/DoTransitionActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/DoTransitionActionTest.java
index 4c755e96cbc..3273b655b5a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/DoTransitionActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/DoTransitionActionTest.java
@@ -25,10 +25,10 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.ArgumentCaptor;
+import org.sonar.api.impl.utils.TestSystem2;
 import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.utils.System2;
-import org.sonar.api.impl.utils.TestSystem2;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbTester;
 import org.sonar.db.component.ComponentDto;
@@ -40,7 +40,6 @@ import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.exceptions.UnauthorizedException;
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.IssueFinder;
-import org.sonar.server.issue.IssueUpdater;
 import org.sonar.server.issue.TestIssueChangePostProcessor;
 import org.sonar.server.issue.TransitionService;
 import org.sonar.server.issue.WebIssueStorage;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/EditCommentActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/EditCommentActionTest.java
index c7dddea00e7..c7dddea00e7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/EditCommentActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/EditCommentActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueUpdaterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/IssueUpdaterTest.java
index d48efd5e36c..6508cb1a83b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueUpdaterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/IssueUpdaterTest.java
@@ -17,7 +17,7 @@
  * 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;
+package org.sonar.server.issue.ws;
 
 import java.util.Date;
 import org.junit.Rule;
@@ -39,6 +39,9 @@ import org.sonar.db.rule.RuleDefinitionDto;
 import org.sonar.db.rule.RuleDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.es.EsTester;
+import org.sonar.server.issue.IssueFieldsSetter;
+import org.sonar.server.issue.TestIssueChangePostProcessor;
+import org.sonar.server.issue.WebIssueStorage;
 import org.sonar.server.issue.index.IssueIndexer;
 import org.sonar.server.issue.index.IssueIteratorFactory;
 import org.sonar.server.issue.notification.IssuesChangesNotification;
@@ -46,7 +49,6 @@ import org.sonar.server.issue.notification.IssuesChangesNotificationBuilder;
 import org.sonar.server.issue.notification.IssuesChangesNotificationBuilder.ChangedIssue;
 import org.sonar.server.issue.notification.IssuesChangesNotificationBuilder.UserChange;
 import org.sonar.server.issue.notification.IssuesChangesNotificationSerializer;
-import org.sonar.server.issue.ws.SearchResponseData;
 import org.sonar.server.notification.NotificationManager;
 import org.sonar.server.organization.DefaultOrganizationProvider;
 import org.sonar.server.organization.TestDefaultOrganizationProvider;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java
index b9c68da85d3..b9c68da85d3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsTest.java
index 1dd9477158e..9834d7cf009 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsTest.java
@@ -38,6 +38,7 @@ import org.sonar.db.issue.IssueDto;
 import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.rule.RuleDefinitionDto;
 import org.sonar.server.es.EsTester;
+import org.sonar.server.issue.AvatarResolverImpl;
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.TransitionService;
 import org.sonar.server.issue.index.IssueIndex;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionFacetsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SearchActionFacetsTest.java
index 3a1c6530e73..da8c2f95595 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionFacetsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SearchActionFacetsTest.java
@@ -39,6 +39,7 @@ import org.sonar.db.rule.RuleDefinitionDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.es.EsTester;
 import org.sonar.server.es.StartupIndexer;
+import org.sonar.server.issue.AvatarResolverImpl;
 import org.sonar.server.issue.TransitionService;
 import org.sonar.server.issue.index.IssueIndex;
 import org.sonar.server.issue.index.IssueIndexer;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java
index f3768030a5e..0b13ef9a30a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java
@@ -54,6 +54,7 @@ import org.sonar.db.user.UserDto;
 import org.sonar.server.es.EsTester;
 import org.sonar.server.es.SearchOptions;
 import org.sonar.server.es.StartupIndexer;
+import org.sonar.server.issue.AvatarResolverImpl;
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.TransitionService;
 import org.sonar.server.issue.index.IssueIndex;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionTestOnSonarCloud.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SearchActionTestOnSonarCloud.java
index 6b1aef9fd63..0d7aceca917 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionTestOnSonarCloud.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SearchActionTestOnSonarCloud.java
@@ -38,6 +38,7 @@ import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.rule.RuleDefinitionDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.es.EsTester;
+import org.sonar.server.issue.AvatarResolverImpl;
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.TransitionService;
 import org.sonar.server.issue.index.IssueIndex;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetSeverityActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SetSeverityActionTest.java
index b7b4afa7f06..2a8dc375e23 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetSeverityActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SetSeverityActionTest.java
@@ -43,9 +43,8 @@ import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.UnauthorizedException;
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.IssueFinder;
-import org.sonar.server.issue.WebIssueStorage;
-import org.sonar.server.issue.IssueUpdater;
 import org.sonar.server.issue.TestIssueChangePostProcessor;
+import org.sonar.server.issue.WebIssueStorage;
 import org.sonar.server.issue.index.IssueIndexer;
 import org.sonar.server.issue.index.IssueIteratorFactory;
 import org.sonar.server.issue.notification.IssuesChangesNotificationSerializer;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java
index a9cfab721e7..c186d8f3ff9 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java
@@ -45,7 +45,6 @@ import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.UnauthorizedException;
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.IssueFinder;
-import org.sonar.server.issue.IssueUpdater;
 import org.sonar.server.issue.TestIssueChangePostProcessor;
 import org.sonar.server.issue.WebIssueStorage;
 import org.sonar.server.issue.index.IssueIndexer;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTypeActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SetTypeActionTest.java
index 57326fdd725..15e9cbfe3f7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTypeActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SetTypeActionTest.java
@@ -42,9 +42,8 @@ import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.UnauthorizedException;
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.IssueFinder;
-import org.sonar.server.issue.WebIssueStorage;
-import org.sonar.server.issue.IssueUpdater;
 import org.sonar.server.issue.TestIssueChangePostProcessor;
+import org.sonar.server.issue.WebIssueStorage;
 import org.sonar.server.issue.index.IssueIndexer;
 import org.sonar.server.issue.index.IssueIteratorFactory;
 import org.sonar.server.issue.notification.IssuesChangesNotificationSerializer;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java
index b3b9939118f..b3b9939118f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/language/ws/LanguageWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/language/ws/LanguageWsTest.java
index 23139cfffa9..23139cfffa9 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/language/ws/LanguageWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/language/ws/LanguageWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java
index 26a42f9fad1..26a42f9fad1 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasureValidatorTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasureValidatorTest.java
index d9d8b8fe7ea..d9d8b8fe7ea 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasureValidatorTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasureValidatorTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModuleTest.java
index ef9a50d778a..ef9a50d778a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsTest.java
index 746ba88a4d3..746ba88a4d3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java
index 0c50b9147d4..0c50b9147d4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java
index bd458853ec0..bd458853ec0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java
index b7cc38d3525..b7cc38d3525 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java
index 63257d007b9..63257d007b9 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/ComponentActionTest.java
index 780cfc9333d..780cfc9333d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/ComponentActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/ComponentTreeActionTest.java
index 57fd73c38d5..57fd73c38d5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/ComponentTreeActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeSortTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/ComponentTreeSortTest.java
index 4bcc338208d..4bcc338208d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeSortTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/ComponentTreeSortTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasureValueFormatterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/MeasureValueFormatterTest.java
index 6e6a88be554..6e6a88be554 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasureValueFormatterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/MeasureValueFormatterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasuresWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/MeasuresWsModuleTest.java
index a7990db50f8..a7990db50f8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasuresWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/MeasuresWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasuresWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/MeasuresWsTest.java
index 81e2ba59d65..81e2ba59d65 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasuresWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/MeasuresWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/SLBorPRMeasureFixTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/SLBorPRMeasureFixTest.java
index ca2c6a07898..ca2c6a07898 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/SLBorPRMeasureFixTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/SLBorPRMeasureFixTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/SearchActionTest.java
index 52899cdc48c..52899cdc48c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/SearchActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/SearchHistoryActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/SearchHistoryActionTest.java
index c06454e681d..c06454e681d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/SearchHistoryActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/SearchHistoryActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/TimeMachineWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/TimeMachineWsTest.java
index 58350cca5a3..58350cca5a3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/TimeMachineWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/TimeMachineWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java
index 5fa395b746b..5fa395b746b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java
index b17a2d8d02d..b17a2d8d02d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java
index 9ba13fa2031..9ba13fa2031 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/MetricsWsModuleTest.java
index 24a5692d1b0..24a5692d1b0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/MetricsWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/MetricsWsTest.java
index 5e5bd69af64..5e5bd69af64 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/MetricsWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/SearchActionTest.java
index ac22e97a59b..ac22e97a59b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/SearchActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/TypesActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/TypesActionTest.java
index 19f23062e21..19f23062e21 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/TypesActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/TypesActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java
index 4d7ad291ef6..4d7ad291ef6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/ws/AddActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/notification/ws/AddActionTest.java
index 3f3cb95b24d..c93517fbb0f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/notification/ws/AddActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/notification/ws/AddActionTest.java
@@ -34,9 +34,7 @@ import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.exceptions.UnauthorizedException;
-import org.sonar.server.notification.NotificationCenter;
 import org.sonar.server.notification.NotificationDispatcherMetadata;
-import org.sonar.server.notification.NotificationUpdater;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestRequest;
 import org.sonar.server.ws.TestResponse;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/ws/DispatchersImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/notification/ws/DispatchersImplTest.java
index a6354115e83..0152044acc0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/notification/ws/DispatchersImplTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/notification/ws/DispatchersImplTest.java
@@ -25,7 +25,6 @@ import org.sonar.api.notifications.NotificationChannel;
 import org.sonar.server.issue.notification.FPOrWontFixNotificationHandler;
 import org.sonar.server.issue.notification.MyNewIssuesNotificationHandler;
 import org.sonar.server.issue.notification.NewIssuesNotificationHandler;
-import org.sonar.server.notification.NotificationCenter;
 import org.sonar.server.notification.NotificationDispatcherMetadata;
 import org.sonar.server.qualitygate.notification.QGChangeNotificationHandler;
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/ws/ListActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/notification/ws/ListActionTest.java
index b8c4dbab953..bc7696f49c9 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/notification/ws/ListActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/notification/ws/ListActionTest.java
@@ -33,9 +33,7 @@ import org.sonar.db.user.UserDto;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.exceptions.UnauthorizedException;
-import org.sonar.server.notification.NotificationCenter;
 import org.sonar.server.notification.NotificationDispatcherMetadata;
-import org.sonar.server.notification.NotificationUpdater;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.WsActionTester;
 import org.sonarqube.ws.Notifications.ListResponse;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationCenterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/notification/ws/NotificationCenterTest.java
index a7afdfefb0c..3f867952f69 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationCenterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/notification/ws/NotificationCenterTest.java
@@ -17,11 +17,12 @@
  * 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.notification;
+package org.sonar.server.notification.ws;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.sonar.api.notifications.NotificationChannel;
+import org.sonar.server.notification.NotificationDispatcherMetadata;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/ws/NotificationWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/notification/ws/NotificationWsModuleTest.java
index ab3313a35b9..68c61aedcc0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/notification/ws/NotificationWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/notification/ws/NotificationWsModuleTest.java
@@ -23,12 +23,13 @@ import org.junit.Test;
 import org.sonar.core.platform.ComponentContainer;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER;
 
 public class NotificationWsModuleTest {
   @Test
   public void verify_count_of_added_components() {
     ComponentContainer container = new ComponentContainer();
     new NotificationWsModule().configure(container);
-    assertThat(container.size()).isEqualTo(5 + 2);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 7);
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/ws/NotificationsWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/notification/ws/NotificationsWsTest.java
index e703452d4f3..e703452d4f3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/notification/ws/NotificationsWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/notification/ws/NotificationsWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/ws/RemoveActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/notification/ws/RemoveActionTest.java
index 00135b70608..b08766bfbaa 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/notification/ws/RemoveActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/notification/ws/RemoveActionTest.java
@@ -34,9 +34,7 @@ import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.exceptions.UnauthorizedException;
-import org.sonar.server.notification.NotificationCenter;
 import org.sonar.server.notification.NotificationDispatcherMetadata;
-import org.sonar.server.notification.NotificationUpdater;
 import org.sonar.server.notification.ws.RemoveAction.RemoveRequest;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestRequest;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java
index 09fccc8e565..be8021ac6a3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java
@@ -36,7 +36,7 @@ import org.sonar.db.user.UserDto;
 import org.sonar.server.es.EsTester;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.NotFoundException;
-import org.sonar.server.issue.ws.AvatarResolverImpl;
+import org.sonar.server.issue.AvatarResolverImpl;
 import org.sonar.server.organization.MemberUpdater;
 import org.sonar.server.organization.OrganizationValidationImpl;
 import org.sonar.server.tester.UserSessionRule;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java
index 3d7c766ede8..3d7c766ede8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java
index 5f801accaad..5f801accaad 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java
index 54b5348f9b6..54b5348f9b6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationDeleterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/OrganizationDeleterTest.java
index 407e68eb0ae..407e68eb0ae 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationDeleterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/OrganizationDeleterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationsWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/OrganizationsWsModuleTest.java
index ce3eaed9160..ce3eaed9160 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationsWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/OrganizationsWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationsWsTestSupport.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/OrganizationsWsTestSupport.java
index d52ee8f732b..d52ee8f732b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/OrganizationsWsTestSupport.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/OrganizationsWsTestSupport.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/PreventUserDeletionActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/PreventUserDeletionActionTest.java
index 060e845fcd6..060e845fcd6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/PreventUserDeletionActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/PreventUserDeletionActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java
index bf6ba35c35a..bf6ba35c35a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java
index 9c229d7176a..9c229d7176a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchMembersActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/SearchMembersActionTest.java
index bcced6f8b57..643bd49c550 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchMembersActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/SearchMembersActionTest.java
@@ -35,7 +35,7 @@ import org.sonar.db.user.UserDto;
 import org.sonar.server.es.EsTester;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.NotFoundException;
-import org.sonar.server.issue.ws.AvatarResolverImpl;
+import org.sonar.server.issue.AvatarResolverImpl;
 import org.sonar.server.organization.DefaultOrganizationProvider;
 import org.sonar.server.organization.TestDefaultOrganizationProvider;
 import org.sonar.server.tester.UserSessionRule;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/UpdateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/UpdateActionTest.java
index 400d56b5817..400d56b5817 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/UpdateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/organization/ws/UpdateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java
index 51efdf27471..51efdf27471 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java
index c18be504182..c18be504182 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java
index a6516b61993..a6516b61993 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java
index a583f0916aa..a583f0916aa 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/PermissionsWsModuleTest.java
index 6d5fdf34e38..6d5fdf34e38 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/PermissionsWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/PermissionsWsTest.java
index 480692f66f5..d11aaada6cb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/PermissionsWsTest.java
@@ -26,10 +26,11 @@ import org.sonar.api.server.ws.WebService;
 import org.sonar.db.DbTester;
 import org.sonar.db.component.ResourceTypesRule;
 import org.sonar.server.component.ComponentFinder;
-import org.sonar.server.issue.ws.AvatarResolverImpl;
+import org.sonar.server.issue.AvatarResolverImpl;
 import org.sonar.server.organization.TestDefaultOrganizationProvider;
 import org.sonar.server.permission.PermissionService;
 import org.sonar.server.permission.PermissionServiceImpl;
+import org.sonar.server.permission.RequestValidator;
 import org.sonar.server.permission.ws.template.TemplateGroupsAction;
 import org.sonar.server.permission.ws.template.TemplateUsersAction;
 import org.sonar.server.tester.UserSessionRule;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java
index fd0cc81d2de..fd0cc81d2de 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveUserActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/RemoveUserActionTest.java
index c6f011d6dfe..c6f011d6dfe 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveUserActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/RemoveUserActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java
index e9cc415d1a9..0007a179b28 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java
@@ -22,8 +22,6 @@ package org.sonar.server.permission.ws;
 import org.junit.Before;
 import org.junit.Test;
 import org.sonar.api.resources.Qualifiers;
-import org.sonar.api.resources.ResourceType;
-import org.sonar.api.resources.ResourceTypeTree;
 import org.sonar.api.resources.ResourceTypes;
 import org.sonar.core.permission.GlobalPermissions;
 import org.sonar.db.component.ResourceTypesRule;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java
index 1f37a11b249..1f37a11b249 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsDataTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsDataTest.java
index 6125ea4eef5..6125ea4eef5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsDataTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsDataTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/UsersActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/UsersActionTest.java
index 5120c032329..16a15ea3f8b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/UsersActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/UsersActionTest.java
@@ -34,9 +34,10 @@ import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.exceptions.UnauthorizedException;
-import org.sonar.server.issue.ws.AvatarResolverImpl;
+import org.sonar.server.issue.AvatarResolverImpl;
 import org.sonar.server.permission.PermissionService;
 import org.sonar.server.permission.PermissionServiceImpl;
+import org.sonar.server.permission.RequestValidator;
 
 import static java.lang.String.format;
 import static org.apache.commons.lang.StringUtils.countMatches;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java
index 8f395edf055..8f395edf055 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateActionTest.java
index b43a07a3ca1..67f9bf2204d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateActionTest.java
@@ -34,7 +34,7 @@ import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.permission.PermissionService;
 import org.sonar.server.permission.PermissionServiceImpl;
 import org.sonar.server.permission.ws.BasePermissionWsTest;
-import org.sonar.server.permission.ws.RequestValidator;
+import org.sonar.server.permission.RequestValidator;
 import org.sonar.server.permission.ws.WsParameters;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java
index 407a10adfa3..623d9dc8cb9 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java
@@ -37,7 +37,6 @@ import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.permission.PermissionService;
 import org.sonar.server.permission.PermissionServiceImpl;
 import org.sonar.server.permission.ws.BasePermissionWsTest;
-import org.sonar.server.permission.ws.RequestValidator;
 import org.sonar.server.permission.ws.WsParameters;
 import org.sonar.server.ws.TestRequest;
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java
index 4248fc5e153..c3069905838 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java
@@ -34,6 +34,7 @@ import org.sonar.server.es.TestProjectIndexers;
 import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.NotFoundException;
+import org.sonar.server.permission.DefaultTemplatesResolverRule;
 import org.sonar.server.permission.PermissionTemplateService;
 import org.sonar.server.permission.ws.BasePermissionWsTest;
 import org.sonar.server.ws.TestRequest;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/BulkApplyTemplateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/BulkApplyTemplateActionTest.java
index ca9e451a47e..edb7f92ed1c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/BulkApplyTemplateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/BulkApplyTemplateActionTest.java
@@ -39,6 +39,7 @@ import org.sonar.server.es.TestProjectIndexers;
 import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.l18n.I18nRule;
+import org.sonar.server.permission.DefaultTemplatesResolverRule;
 import org.sonar.server.permission.PermissionTemplateService;
 import org.sonar.server.permission.ws.BasePermissionWsTest;
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/CreateTemplateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/CreateTemplateActionTest.java
index 0efc112c1d8..0efc112c1d8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/CreateTemplateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/CreateTemplateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DeleteTemplateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/DeleteTemplateActionTest.java
index a0eeba405a5..11f4c26b89f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DeleteTemplateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/DeleteTemplateActionTest.java
@@ -44,6 +44,8 @@ import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.exceptions.UnauthorizedException;
 import org.sonar.server.organization.TestDefaultOrganizationProvider;
+import org.sonar.server.permission.DefaultTemplatesResolver;
+import org.sonar.server.permission.DefaultTemplatesResolverImpl;
 import org.sonar.server.permission.ws.PermissionWsSupport;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.usergroups.DefaultGroupFinder;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponseTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponseTest.java
index 34fffd995f6..34fffd995f6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponseTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponseTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateActionTest.java
index f9665c9cbf2..f9665c9cbf2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateActionTest.java
index d20ae121978..64660f88f16 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateActionTest.java
@@ -36,7 +36,7 @@ import org.sonar.server.exceptions.UnauthorizedException;
 import org.sonar.server.permission.PermissionService;
 import org.sonar.server.permission.PermissionServiceImpl;
 import org.sonar.server.permission.ws.BasePermissionWsTest;
-import org.sonar.server.permission.ws.RequestValidator;
+import org.sonar.server.permission.RequestValidator;
 import org.sonar.server.permission.ws.WsParameters;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java
index bc4283ffbe8..97d7b55f75d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java
@@ -37,7 +37,7 @@ import org.sonar.server.exceptions.UnauthorizedException;
 import org.sonar.server.permission.PermissionService;
 import org.sonar.server.permission.PermissionServiceImpl;
 import org.sonar.server.permission.ws.BasePermissionWsTest;
-import org.sonar.server.permission.ws.RequestValidator;
+import org.sonar.server.permission.RequestValidator;
 import org.sonar.server.permission.ws.WsParameters;
 import org.sonar.server.ws.TestRequest;
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesActionTest.java
index 502235826f4..bddc95ab5bd 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesActionTest.java
@@ -35,6 +35,8 @@ import org.sonar.db.user.GroupDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.exceptions.UnauthorizedException;
 import org.sonar.server.l18n.I18nRule;
+import org.sonar.server.permission.DefaultTemplatesResolver;
+import org.sonar.server.permission.DefaultTemplatesResolverImpl;
 import org.sonar.server.permission.PermissionService;
 import org.sonar.server.permission.PermissionServiceImpl;
 import org.sonar.server.permission.ws.BasePermissionWsTest;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesDataTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesDataTest.java
index 3a5e06c6ab7..4000bad7ae9 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesDataTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesDataTest.java
@@ -23,6 +23,7 @@ import com.google.common.collect.HashBasedTable;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.sonar.server.permission.DefaultTemplatesResolverImpl;
 
 import static java.util.Collections.singletonList;
 import static org.sonar.db.permission.template.PermissionTemplateTesting.newPermissionTemplateDto;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java
index 9ed0ee71d30..9ed0ee71d30 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/TemplateGroupsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/TemplateGroupsActionTest.java
index 7479a97c61d..ea4a08f9b90 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/TemplateGroupsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/TemplateGroupsActionTest.java
@@ -36,7 +36,7 @@ import org.sonar.server.exceptions.UnauthorizedException;
 import org.sonar.server.permission.PermissionService;
 import org.sonar.server.permission.PermissionServiceImpl;
 import org.sonar.server.permission.ws.BasePermissionWsTest;
-import org.sonar.server.permission.ws.RequestValidator;
+import org.sonar.server.permission.RequestValidator;
 import org.sonar.server.permission.ws.WsParameters;
 import org.sonarqube.ws.Permissions.WsGroupsResponse;
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/TemplateUsersActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/TemplateUsersActionTest.java
index 0a1106970c3..5ef044db8a1 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/TemplateUsersActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/TemplateUsersActionTest.java
@@ -33,11 +33,11 @@ import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.exceptions.UnauthorizedException;
-import org.sonar.server.issue.ws.AvatarResolverImpl;
+import org.sonar.server.issue.AvatarResolverImpl;
 import org.sonar.server.permission.PermissionService;
 import org.sonar.server.permission.PermissionServiceImpl;
 import org.sonar.server.permission.ws.BasePermissionWsTest;
-import org.sonar.server.permission.ws.RequestValidator;
+import org.sonar.server.permission.RequestValidator;
 import org.sonar.server.permission.ws.WsParameters;
 import org.sonar.server.ws.TestRequest;
 import org.sonarqube.ws.Permissions;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/UpdateTemplateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/UpdateTemplateActionTest.java
index 1904cfa36d7..1904cfa36d7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/UpdateTemplateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ws/template/UpdateTemplateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionModuleTest.java
index 5f52cee93c1..5f52cee93c1 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java
index afcce545257..afcce545257 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ClusterSystemInfoWriterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ClusterSystemInfoWriterTest.java
index 777365d2b62..777365d2b62 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ClusterSystemInfoWriterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ClusterSystemInfoWriterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/DbMigrationStatusActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/DbMigrationStatusActionTest.java
index b44552924a4..b44552924a4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/DbMigrationStatusActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/DbMigrationStatusActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/HealthActionModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/HealthActionModuleTest.java
index f628ad95c10..f628ad95c10 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/HealthActionModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/HealthActionModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/HealthActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/HealthActionTest.java
index 86204efb938..86204efb938 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/HealthActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/HealthActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/IndexActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/IndexActionTest.java
index fd672900e98..fd672900e98 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/IndexActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/IndexActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java
index 8d63f470c41..8d63f470c41 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/LogsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/LogsActionTest.java
index 95926ea0350..95926ea0350 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/LogsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/LogsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/MigrateDbActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/MigrateDbActionTest.java
index 1694529ce5a..1694529ce5a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/MigrateDbActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/MigrateDbActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/PingActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/PingActionTest.java
index b19ea21dac3..b19ea21dac3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/PingActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/PingActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/RestartActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/RestartActionTest.java
index 243dd6bf8a9..243dd6bf8a9 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/RestartActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/RestartActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SafeModeHealthActionModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SafeModeHealthActionModuleTest.java
index d328fac2e69..d328fac2e69 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SafeModeHealthActionModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SafeModeHealthActionModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SafeModeHealthActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SafeModeHealthActionTest.java
index c3aa5e4e066..c3aa5e4e066 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SafeModeHealthActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SafeModeHealthActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ServerWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ServerWsTest.java
index 9b7cfdb92fc..9b7cfdb92fc 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ServerWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ServerWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriterTest.java
index ad7e1edd45c..ad7e1edd45c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java
index ff6f668236b..ff6f668236b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java
index 733c12cae02..733c12cae02 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java
index a8a0bd17568..a8a0bd17568 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/WebSystemInfoModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/WebSystemInfoModuleTest.java
index 3b06b895c33..b96d38d1cd2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/WebSystemInfoModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/WebSystemInfoModuleTest.java
@@ -17,7 +17,7 @@
  * 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.platform.monitoring;
+package org.sonar.server.platform.ws;
 
 import com.tngtech.java.junit.dataprovider.DataProvider;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AbstractUpdateCenterBasedPluginsWsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/AbstractUpdateCenterBasedPluginsWsActionTest.java
index ea68a93338b..ea68a93338b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AbstractUpdateCenterBasedPluginsWsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/AbstractUpdateCenterBasedPluginsWsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java
index 7a2af42d577..7a2af42d577 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/CancelAllActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/CancelAllActionTest.java
index 30270d52ac6..fc175e09771 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/CancelAllActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/CancelAllActionTest.java
@@ -27,7 +27,6 @@ import org.sonar.api.server.ws.WebService;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.plugins.PluginDownloader;
 import org.sonar.server.plugins.PluginUninstaller;
-import org.sonar.server.plugins.ServerPluginRepository;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.WsTester;
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/DownloadActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/DownloadActionTest.java
index 1412cd4cef1..1412cd4cef1 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/DownloadActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/DownloadActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstallActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/InstallActionTest.java
index a8d01382d29..a8d01382d29 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstallActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/InstallActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java
index c562dab62cd..c562dab62cd 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java
index aabfc8da454..aabfc8da454 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregateBuilderTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregateBuilderTest.java
index ffa3cea1b87..ffa3cea1b87 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregateBuilderTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregateBuilderTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregatorTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregatorTest.java
index 3d1149dca53..3d1149dca53 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregatorTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregatorTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java
index cef589d415f..cef589d415f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginsWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/PluginsWsTest.java
index 92e14c6313e..92e14c6313e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginsWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/PluginsWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UninstallActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/UninstallActionTest.java
index cd7388102da..cd7388102da 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UninstallActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/UninstallActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/UpdateActionTest.java
index 4fa59d1e369..4fa59d1e369 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/UpdateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java
index e4f6ad4c047..e4f6ad4c047 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java
index 30e46059abd..30e46059abd 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java
index 13766ab25e8..13766ab25e8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/CreateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/CreateActionTest.java
index bb97891c2e4..bb97891c2e4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/CreateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/CreateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java
index d4cab6b01f8..d4cab6b01f8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProjectsWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/ProjectsWsModuleTest.java
index 86995f4c394..86995f4c394 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProjectsWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/ProjectsWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/SearchActionTest.java
index 9e971802ba8..9e971802ba8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/SearchActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchMyProjectsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/SearchMyProjectsActionTest.java
index 30e609086c4..30e609086c4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchMyProjectsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/SearchMyProjectsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchMyProjectsDataTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/SearchMyProjectsDataTest.java
index c97e37c0500..c97e37c0500 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchMyProjectsDataTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/SearchMyProjectsDataTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateDefaultVisibilityActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/UpdateDefaultVisibilityActionTest.java
index 0013337d241..0013337d241 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateDefaultVisibilityActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/UpdateDefaultVisibilityActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java
index 749d4b653eb..749d4b653eb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateVisibilityActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/UpdateVisibilityActionTest.java
index 65df5995095..65df5995095 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateVisibilityActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/project/ws/UpdateVisibilityActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/CreateEventActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/CreateEventActionTest.java
index ea90b01fee4..ea90b01fee4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/CreateEventActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/CreateEventActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/DeleteActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/DeleteActionTest.java
index 69189ccfe64..69189ccfe64 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/DeleteActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/DeleteActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/DeleteEventActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/DeleteEventActionTest.java
index 5f1390f5f31..5f1390f5f31 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/DeleteEventActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/DeleteEventActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/EventValidatorTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/EventValidatorTest.java
index ba0e14f7263..ba0e14f7263 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/EventValidatorTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/EventValidatorTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ProjectAnalysisModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/ProjectAnalysisWsModuleTest.java
index 930926b701f..48d6b42f5be 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ProjectAnalysisModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/ProjectAnalysisWsModuleTest.java
@@ -17,7 +17,7 @@
  * 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.projectanalysis;
+package org.sonar.server.projectanalysis.ws;
 
 import org.junit.Test;
 import org.sonar.core.platform.ComponentContainer;
@@ -25,12 +25,12 @@ import org.sonar.core.platform.ComponentContainer;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER;
 
-public class ProjectAnalysisModuleTest {
+public class ProjectAnalysisWsModuleTest {
 
   @Test
   public void verify_count_of_added_components() {
     ComponentContainer container = new ComponentContainer();
-    new ProjectAnalysisModule().configure(container);
+    new ProjectAnalysisWsModule().configure(container);
     assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 8);
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/SearchActionTest.java
index 4f7d756cf4d..62b68fcc485 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/SearchActionTest.java
@@ -149,7 +149,7 @@ public class SearchActionTest {
     db.commit();
     db.events().insertEvent(newEvent(a1).setUuid("E11")
       .setName("Quality Gate is Red (was Orange)")
-      .setCategory(EventCategory.QUALITY_GATE.getLabel())
+      .setCategory(QUALITY_GATE.getLabel())
       .setDescription("Coverage is < 80%"));
     db.events().insertEvent(newEvent(a1).setUuid("E12")
       .setName("6.3").setCategory(VERSION.getLabel()));
@@ -213,7 +213,7 @@ public class SearchActionTest {
     userSession.addProjectPermission(UserRole.USER, project);
     SnapshotDto a1 = db.components().insertSnapshot(newAnalysis(project).setUuid("A1"));
     SnapshotDto a42 = db.components().insertSnapshot(newAnalysis(ComponentTesting.newPrivateProjectDto(organizationDto)).setUuid("A42"));
-    EventDto e1 = db.events().insertEvent(newEvent(a1).setUuid("E1").setName("N1").setCategory(EventCategory.QUALITY_GATE.getLabel()).setDescription("D1"));
+    EventDto e1 = db.events().insertEvent(newEvent(a1).setUuid("E1").setName("N1").setCategory(QUALITY_GATE.getLabel()).setDescription("D1"));
     EventDto e2 = db.events().insertEvent(newEvent(a1).setUuid("E2").setName("N2").setCategory(VERSION.getLabel()).setDescription("D2"));
     db.events().insertEvent(newEvent(a42));
 
@@ -587,7 +587,7 @@ public class SearchActionTest {
     userSession.addProjectPermission(UserRole.USER, project);
     ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("my_branch"));
     SnapshotDto analysis = db.components().insertSnapshot(newAnalysis(branch));
-    EventDto event = db.events().insertEvent(newEvent(analysis).setCategory(EventCategory.QUALITY_GATE.getLabel()));
+    EventDto event = db.events().insertEvent(newEvent(analysis).setCategory(QUALITY_GATE.getLabel()));
 
     List<Analysis> result = call(SearchRequest.builder()
       .setProject(project.getKey())
@@ -605,7 +605,7 @@ public class SearchActionTest {
     userSession.addProjectPermission(UserRole.USER, project);
     ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("my_branch").setBranchType(BranchType.SHORT));
     SnapshotDto analysis = db.components().insertSnapshot(newAnalysis(branch));
-    EventDto event = db.events().insertEvent(newEvent(analysis).setCategory(EventCategory.QUALITY_GATE.getLabel()));
+    EventDto event = db.events().insertEvent(newEvent(analysis).setCategory(QUALITY_GATE.getLabel()));
 
     expectedException.expect(IllegalArgumentException.class);
     expectedException.expectMessage("Branch 'my_branch' is not of type LONG");
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/SetBaselineActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/SetBaselineActionTest.java
index 418d3121172..418d3121172 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/SetBaselineActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/SetBaselineActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/UnsetBaselineActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/UnsetBaselineActionTest.java
index d99009ee5b8..d99009ee5b8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/UnsetBaselineActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/UnsetBaselineActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/UpdateEventActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/UpdateEventActionTest.java
index 7d8647b5d5c..7d8647b5d5c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/UpdateEventActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectanalysis/ws/UpdateEventActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/CreateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectlink/ws/CreateActionTest.java
index 458f8ca0b14..458f8ca0b14 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/CreateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectlink/ws/CreateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/DeleteActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectlink/ws/DeleteActionTest.java
index 9b33f7525c5..9b33f7525c5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/DeleteActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectlink/ws/DeleteActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/ProjectLinksWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectlink/ws/ProjectLinksWsModuleTest.java
index e53c14fd253..e53c14fd253 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/ProjectLinksWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectlink/ws/ProjectLinksWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectlink/ws/SearchActionTest.java
index 834ca4b39a7..834ca4b39a7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projectlink/ws/SearchActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsModuleTest.java
index ef3d52c347a..ef3d52c347a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsTest.java
index 5ad25b27b68..5ad25b27b68 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java
index cd4d9ad0b45..cd4d9ad0b45 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SetActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projecttag/ws/SetActionTest.java
index c0b71a0d85e..c0b71a0d85e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SetActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/projecttag/ws/SetActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/property/ws/IndexActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/property/ws/IndexActionTest.java
index 91fbaead015..91fbaead015 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/property/ws/IndexActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/property/ws/IndexActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CopyActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/CopyActionTest.java
index e1aaae72a28..e1aaae72a28 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CopyActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/CopyActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/CreateActionTest.java
index 646970436f3..646970436f3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/CreateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java
index f8b8327af49..f8b8327af49 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/DeleteConditionActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/DeleteConditionActionTest.java
index c3ba9647318..c3ba9647318 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/DeleteConditionActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/DeleteConditionActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/DeselectActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/DeselectActionTest.java
index c3c7ad87177..c3c7ad87177 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/DeselectActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/DeselectActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/DestroyActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/DestroyActionTest.java
index f72cfde4739..f72cfde4739 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/DestroyActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/DestroyActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/GetByProjectActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/GetByProjectActionTest.java
index 7aaaaf3d22f..7aaaaf3d22f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/GetByProjectActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/GetByProjectActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/ListActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/ListActionTest.java
index e7c8456c565..e7c8456c565 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/ListActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/ListActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/ProjectStatusActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/ProjectStatusActionTest.java
index 4dfcc43009a..4dfcc43009a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/ProjectStatusActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/ProjectStatusActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest.java
index 1d4dcf8e316..1d4dcf8e316 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest.java
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/QualityGateWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/QualityGateWsModuleTest.java
new file mode 100644
index 00000000000..62fd9bca57e
--- /dev/null
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/QualityGateWsModuleTest.java
@@ -0,0 +1,36 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info 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.qualitygate.ws;
+
+import org.junit.Test;
+import org.sonar.core.platform.ComponentContainer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER;
+
+public class QualityGateWsModuleTest {
+  @Test
+  public void verify_count_of_added_components() {
+    ComponentContainer container = new ComponentContainer();
+    new QualityGateWsModule().configure(container);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 17);
+  }
+
+}
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/RenameActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/RenameActionTest.java
index d5ae9f933ac..d5ae9f933ac 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/RenameActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/RenameActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/SearchActionTest.java
index 453ad38190d..453ad38190d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/SearchActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/SelectActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/SelectActionTest.java
index 18ac6127aa4..18ac6127aa4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/SelectActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/SelectActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/ShowActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/ShowActionTest.java
index 51298148501..51298148501 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/ShowActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/ShowActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java
index b487dc5755f..6a4403141a0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java
@@ -51,7 +51,6 @@ import static org.assertj.core.api.Assertions.tuple;
 import static org.sonar.api.measures.Metric.ValueType.INT;
 import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
 import static org.sonar.server.qualitygate.ws.QualityGatesWsParameters.PARAM_ERROR;
-import static org.sonar.server.qualitygate.ws.QualityGatesWsParameters.PARAM_GATE_ID;
 import static org.sonar.server.qualitygate.ws.QualityGatesWsParameters.PARAM_ID;
 import static org.sonar.server.qualitygate.ws.QualityGatesWsParameters.PARAM_METRIC;
 import static org.sonar.server.qualitygate.ws.QualityGatesWsParameters.PARAM_OPERATOR;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRuleActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRuleActionTest.java
index 5ec1ad9885c..5ec1ad9885c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRuleActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRuleActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRulesActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRulesActionTest.java
index 38e1f83d456..38e1f83d456 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRulesActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRulesActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/AddGroupActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/AddGroupActionTest.java
index 299a0314a15..299a0314a15 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/AddGroupActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/AddGroupActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/AddProjectActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/AddProjectActionTest.java
index 0b68c7fd08f..0b68c7fd08f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/AddProjectActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/AddProjectActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/AddUserActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/AddUserActionTest.java
index b261eab9250..b261eab9250 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/AddUserActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/AddUserActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java
index 19630f1fd14..19630f1fd14 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java
index 8e2516b6cdc..8e2516b6cdc 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java
index 7c8b2b93bcc..7c8b2b93bcc 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionTest.java
index b779e460f34..b779e460f34 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java
index 8551cdcb44f..8551cdcb44f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java
index 7d1b67d69dc..7d1b67d69dc 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRuleActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRuleActionTest.java
index 456a3a2e5cd..456a3a2e5cd 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRuleActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRuleActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRulesActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRulesActionTest.java
index 4f0311aff96..4f0311aff96 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRulesActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRulesActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java
index 2b68cec4651..2b68cec4651 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java
index ecf3bd8676a..ecf3bd8676a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportersActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ExportersActionTest.java
index a91e8570f7b..a91e8570f7b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportersActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ExportersActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ImportersActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ImportersActionTest.java
index 7c1ea6bca34..7c1ea6bca34 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ImportersActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ImportersActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java
index 03eefdc608a..03eefdc608a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java
index 1179f9edebe..1179f9edebe 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileReferenceTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/QProfileReferenceTest.java
index 2a4d83ccc9c..2a4d83ccc9c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileReferenceTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/QProfileReferenceTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileWsSupportTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/QProfileWsSupportTest.java
index c09fabd133b..c09fabd133b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileWsSupportTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/QProfileWsSupportTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java
index 8f6663eeb13..8f6663eeb13 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsModuleTest.java
index 4f924f19ac2..4f924f19ac2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RemoveGroupActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/RemoveGroupActionTest.java
index b6bc81ff7b2..b6bc81ff7b2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RemoveGroupActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/RemoveGroupActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionTest.java
index 9a397d0b482..9a397d0b482 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RemoveUserActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/RemoveUserActionTest.java
index 9ee17c30fde..9ee17c30fde 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RemoveUserActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/RemoveUserActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java
index 0f2f3f87e72..0f2f3f87e72 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java
index 053ec219726..053ec219726 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java
index 093338ec1ee..093338ec1ee 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java
index 6c2cc25845f..6c2cc25845f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchGroupsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/SearchGroupsActionTest.java
index 68f12d39b65..68f12d39b65 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchGroupsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/SearchGroupsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchUsersActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/SearchUsersActionTest.java
index 26056a6cc81..ca8daaf6e14 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchUsersActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/SearchUsersActionTest.java
@@ -31,9 +31,9 @@ import org.sonar.db.qualityprofile.QProfileDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.NotFoundException;
-import org.sonar.server.issue.ws.AvatarResolver;
-import org.sonar.server.issue.ws.AvatarResolverImpl;
-import org.sonar.server.issue.ws.FakeAvatarResolver;
+import org.sonar.server.issue.AvatarResolver;
+import org.sonar.server.issue.AvatarResolverImpl;
+import org.sonar.server.issue.FakeAvatarResolver;
 import org.sonar.server.language.LanguageTesting;
 import org.sonar.server.organization.TestDefaultOrganizationProvider;
 import org.sonar.server.tester.UserSessionRule;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java
index fc23a0b1ee8..fc23a0b1ee8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ShowActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ShowActionTest.java
index 72577008a20..72577008a20 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ShowActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/ws/ShowActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/root/ws/RootsWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/root/ws/RootsWsModuleTest.java
index cc425e21236..cc425e21236 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/root/ws/RootsWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/root/ws/RootsWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/root/ws/RootsWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/root/ws/RootsWsTest.java
index a9f31b666a3..a9f31b666a3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/root/ws/RootsWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/root/ws/RootsWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/root/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/root/ws/SearchActionTest.java
index ab970e25b06..ab970e25b06 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/root/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/root/ws/SearchActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/root/ws/SetRootActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/root/ws/SetRootActionTest.java
index cbf40967f90..cbf40967f90 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/root/ws/SetRootActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/root/ws/SetRootActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/root/ws/UnsetRootActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/root/ws/UnsetRootActionTest.java
index 16dd1d02c21..16dd1d02c21 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/root/ws/UnsetRootActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/root/ws/UnsetRootActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ActiveRuleCompleterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/ActiveRuleCompleterTest.java
index a369fdc07d5..a369fdc07d5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ActiveRuleCompleterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/ActiveRuleCompleterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/AppActionTest.java
index 756e994c1ce..756e994c1ce 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/AppActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java
index 4706be252ea..4706be252ea 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java
index a18adc021dc..a18adc021dc 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ListActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/ListActionTest.java
index da7b3e8695c..da7b3e8695c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ListActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/ListActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RepositoriesActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/RepositoriesActionTest.java
index 11dc3f30626..11dc3f30626 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RepositoriesActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/RepositoriesActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleQueryFactoryTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/RuleQueryFactoryTest.java
index 2be421542b4..2be421542b4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleQueryFactoryTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/RuleQueryFactoryTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java
index 8384d7176f0..8384d7176f0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/ShowActionTest.java
index f80dcdc1c5c..f80dcdc1c5c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/ShowActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/TagsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/TagsActionTest.java
index 16d48d178fa..16d48d178fa 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/TagsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/TagsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java
index 13bb50c00bc..13bb50c00bc 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/CheckSecretKeyActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/CheckSecretKeyActionTest.java
index 09e05a689e6..09e05a689e6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/CheckSecretKeyActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/CheckSecretKeyActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java
index 59acdbde22f..59acdbde22f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/GenerateSecretKeyActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/GenerateSecretKeyActionTest.java
index b673bcdfaa6..b673bcdfaa6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/GenerateSecretKeyActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/GenerateSecretKeyActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java
index 2a716ac22c3..2a716ac22c3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java
index 52f17f304f2..52f17f304f2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SetActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/SetActionTest.java
index 107cd5acc55..107cd5acc55 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SetActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/SetActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java
index 43a2a6cbff0..43a2a6cbff0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/SettingsWsModuleTest.java
index b3dd8904a60..b3dd8904a60 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/SettingsWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java
index bd778c40aed..bd778c40aed 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/HashActionTest.java
index e0916bddd37..e0916bddd37 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/HashActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/IndexActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/IndexActionTest.java
index 6c851001cde..6c851001cde 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/IndexActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/IndexActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/IssueSnippetsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/IssueSnippetsActionTest.java
index 742cce0823d..742cce0823d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/IssueSnippetsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/IssueSnippetsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/LinesActionTest.java
index 28808af5d90..28808af5d90 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/LinesActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/RawActionTest.java
index 60e9e3d6424..60e9e3d6424 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/RawActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/ScmActionTest.java
index db2d4f3ab03..db2d4f3ab03 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/ScmActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/ShowActionTest.java
index 7298346fe57..7298346fe57 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/ShowActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/SourceWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/SourceWsModuleTest.java
index 3037fb81658..3037fb81658 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/SourceWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/SourceWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java
index bc755b51893..bc755b51893 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/ComponentActionTest.java
index 78791469832..78791469832 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/ComponentActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java
index 1a20d2e87fe..1a20d2e87fe 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/MarketplaceActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/MarketplaceActionTest.java
index 9ade6beda73..9ade6beda73 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/MarketplaceActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/MarketplaceActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/NavigationWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/NavigationWsModuleTest.java
index e901a9700f4..e901a9700f4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/NavigationWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/NavigationWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java
index 605560481b6..605560481b6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/SettingsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/SettingsActionTest.java
index 03d177395e2..03d177395e2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/SettingsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/SettingsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/InstalledPluginsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/updatecenter/ws/InstalledPluginsActionTest.java
index f6028bc6f9f..f6028bc6f9f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/InstalledPluginsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/updatecenter/ws/InstalledPluginsActionTest.java
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsModuleTest.java
new file mode 100644
index 00000000000..11bdedf7ab5
--- /dev/null
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsModuleTest.java
@@ -0,0 +1,37 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info 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.updatecenter.ws;
+
+import org.junit.Test;
+import org.sonar.core.platform.ComponentContainer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER;
+
+public class UpdateCenterWsModuleTest {
+  @Test
+  public void verify_count_of_added_components() {
+    ComponentContainer container = new ComponentContainer();
+    new UpdateCenterWsModule().configure(container);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 3);
+  }
+
+
+}
diff --git a/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsTest.java
index f1ce9d80047..f1ce9d80047 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UploadActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/updatecenter/ws/UploadActionTest.java
index 92bb1e2bd64..92bb1e2bd64 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UploadActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/updatecenter/ws/UploadActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java
index 56315f7dc6f..56315f7dc6f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/CreateActionTest.java
index 5b9377ac7bd..5b9377ac7bd 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/CreateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionHomepageTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/CurrentActionHomepageTest.java
index 38de2bb71af..43b36e81107 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionHomepageTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/CurrentActionHomepageTest.java
@@ -34,7 +34,7 @@ import org.sonar.db.DbTester;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.user.UserDto;
-import org.sonar.server.issue.ws.AvatarResolverImpl;
+import org.sonar.server.issue.AvatarResolverImpl;
 import org.sonar.server.organization.DefaultOrganizationProvider;
 import org.sonar.server.organization.TestDefaultOrganizationProvider;
 import org.sonar.server.organization.TestOrganizationFlags;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java
index 81f5649177a..9425feb0b4c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java
@@ -34,7 +34,7 @@ import org.sonar.core.platform.PluginRepository;
 import org.sonar.db.DbTester;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.user.UserDto;
-import org.sonar.server.issue.ws.AvatarResolverImpl;
+import org.sonar.server.issue.AvatarResolverImpl;
 import org.sonar.server.organization.TestDefaultOrganizationProvider;
 import org.sonar.server.organization.TestOrganizationFlags;
 import org.sonar.server.permission.PermissionService;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java
index afb7691885b..afb7691885b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/EmailValidatorTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/EmailValidatorTest.java
index 653e0e3d906..653e0e3d906 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/EmailValidatorTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/EmailValidatorTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java
index 4dc969595a1..4dc969595a1 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/HomepageTypesImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/HomepageTypesImplTest.java
index 1da5327451a..1da5327451a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/HomepageTypesImplTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/HomepageTypesImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/IdentityProvidersActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/IdentityProvidersActionTest.java
index 1a178d8e9ea..1a178d8e9ea 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/IdentityProvidersActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/IdentityProvidersActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/SearchActionTest.java
index ff98570dbdf..6e65788ed48 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/SearchActionTest.java
@@ -29,7 +29,7 @@ import org.sonar.db.DbTester;
 import org.sonar.db.user.GroupDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.es.EsTester;
-import org.sonar.server.issue.ws.AvatarResolverImpl;
+import org.sonar.server.issue.AvatarResolverImpl;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.user.index.UserIndex;
 import org.sonar.server.user.index.UserIndexer;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SetHomepageActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/SetHomepageActionTest.java
index 3ee9136afeb..3ee9136afeb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SetHomepageActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/SetHomepageActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SetSettingActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/SetSettingActionTest.java
index e97a71a3c40..e97a71a3c40 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SetSettingActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/SetSettingActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SkipOnboardingTutorialActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/SkipOnboardingTutorialActionTest.java
index 7bb5aaf70d7..7bb5aaf70d7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SkipOnboardingTutorialActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/SkipOnboardingTutorialActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java
index 8901a4c7dd5..8901a4c7dd5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateLoginActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/UpdateLoginActionTest.java
index 8595dd72aa3..8595dd72aa3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateLoginActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/UpdateLoginActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UserPropertiesWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/UserPropertiesWsTest.java
index 59ca8b02538..59ca8b02538 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UserPropertiesWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/UserPropertiesWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/UsersWsModuleTest.java
index 1fbd80a8f78..1fbd80a8f78 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/UsersWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java
index 5050def00f0..5050def00f0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java
index 595d60907cc..595d60907cc 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java
index 7d96370e5cf..7d96370e5cf 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/GroupWsRefTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/GroupWsRefTest.java
index 09c635b8689..09c635b8689 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/GroupWsRefTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/GroupWsRefTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java
index 72d8529dbb6..72d8529dbb6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java
index 364968d4e86..364968d4e86 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java
index f84634f4c63..f84634f4c63 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UserGroupsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/UserGroupsModuleTest.java
index c9e2220f427..c9e2220f427 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UserGroupsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/UserGroupsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UserGroupsWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/UserGroupsWsTest.java
index 3cb634027b6..3cb634027b6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UserGroupsWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/UserGroupsWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java
index b9ab336ac6f..b9ab336ac6f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/GenerateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usertoken/ws/GenerateActionTest.java
index 0cf79cbca06..0cf79cbca06 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/GenerateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usertoken/ws/GenerateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/RevokeActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usertoken/ws/RevokeActionTest.java
index 40bfe2b105a..40bfe2b105a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/RevokeActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usertoken/ws/RevokeActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/SearchActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usertoken/ws/SearchActionTest.java
index c562e70fa4b..c562e70fa4b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/SearchActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usertoken/ws/SearchActionTest.java
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usertoken/ws/UserTokenWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usertoken/ws/UserTokenWsModuleTest.java
new file mode 100644
index 00000000000..e4d3852ddc5
--- /dev/null
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usertoken/ws/UserTokenWsModuleTest.java
@@ -0,0 +1,38 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info 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.usertoken.ws;
+
+import org.junit.Test;
+import org.sonar.core.platform.ComponentContainer;
+import org.sonar.server.usertoken.UserTokenModule;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER;
+
+public class UserTokenWsModuleTest {
+  @Test
+  public void verify_count_of_added_components() {
+    ComponentContainer container = new ComponentContainer();
+    new UserTokenModule().configure(container);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 2);
+  }
+
+
+}
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/UserTokensWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usertoken/ws/UserTokensWsTest.java
index ab80b3ec8aa..ab80b3ec8aa 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usertoken/ws/UserTokensWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/usertoken/ws/UserTokensWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/CreateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/webhook/ws/CreateActionTest.java
index 06fe6016c0f..06fe6016c0f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/CreateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/webhook/ws/CreateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/DeleteActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/webhook/ws/DeleteActionTest.java
index 7558aee5679..7558aee5679 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/DeleteActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/webhook/ws/DeleteActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/ListActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/webhook/ws/ListActionTest.java
index db5736cd83f..db5736cd83f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/ListActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/webhook/ws/ListActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/UpdateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/webhook/ws/UpdateActionTest.java
index 9dd2f5e9d11..9dd2f5e9d11 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/UpdateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/webhook/ws/UpdateActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveriesActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveriesActionTest.java
index 02a9ba260f8..02a9ba260f8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveriesActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveriesActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveryActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveryActionTest.java
index 8ca12891425..8ca12891425 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveryActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/webhook/ws/WebhookDeliveryActionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhooksWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/webhook/ws/WebhooksWsModuleTest.java
index d471def2ac8..d471def2ac8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhooksWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/webhook/ws/WebhooksWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhooksWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/webhook/ws/WebhooksWsTest.java
index 28f447d7443..28f447d7443 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/ws/WebhooksWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/webhook/ws/WebhooksWsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/ws/WebServicesWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ws/ws/WebServicesWsModuleTest.java
index 9c143ef0d2a..9c143ef0d2a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ws/ws/WebServicesWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ws/ws/WebServicesWsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/ws/WebServicesWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ws/ws/WebServicesWsTest.java
index 75b83c03e13..75b83c03e13 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ws/ws/WebServicesWsTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ws/ws/WebServicesWsTest.java
diff --git a/server/sonar-webserver-webapi/src/test/resources/logback-test.xml b/server/sonar-webserver-webapi/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..3e34b0f9fc8
--- /dev/null
+++ b/server/sonar-webserver-webapi/src/test/resources/logback-test.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration debug="false">
+  <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
+
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>
+        %d{yyyy.MM.dd HH:mm:ss} %-5level %msg%n
+      </pattern>
+    </encoder>
+  </appender>
+
+  <root>
+    <level value="INFO"/>
+    <appender-ref ref="CONSOLE"/>
+  </root>
+
+  <logger name="ch.qos.logback">
+    <level value="WARN"/>
+  </logger>
+
+  <logger name="okhttp3.mockwebserver">
+    <level value="WARN"/>
+  </logger>
+
+</configuration>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/batch/ProjectActionTest/project_referentials.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/batch/ProjectActionTest/project_referentials.json
index ff04061219e..ff04061219e 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/batch/ProjectActionTest/project_referentials.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/batch/ProjectActionTest/project_referentials.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ComponentTagsActionTest/component-tags.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/ComponentTagsActionTest/component-tags.json
index e3afc9a2dc4..e3afc9a2dc4 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ComponentTagsActionTest/component-tags.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/ComponentTagsActionTest/component-tags.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_directory_facet.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_directory_facet.json
index 1df736cb25c..1df736cb25c 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_directory_facet.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_directory_facet.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_file_facet.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_file_facet.json
index 87e6919f0de..87e6919f0de 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_file_facet.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_file_facet.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_module_facet.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_module_facet.json
index e5b71f6a563..e5b71f6a563 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_module_facet.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_module_facet.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_non_sticky_project_facet.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_non_sticky_project_facet.json
index 8c3d41a544f..8c3d41a544f 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_non_sticky_project_facet.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_non_sticky_project_facet.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_sticky_project_facet.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_sticky_project_facet.json
index 42165230889..42165230889 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_sticky_project_facet.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/display_sticky_project_facet.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/issues_on_different_projects.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/issues_on_different_projects.json
index e88fc952a92..e88fc952a92 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/issues_on_different_projects.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/issues_on_different_projects.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/no_issue.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/no_issue.json
index ce8bbfbeeb7..ce8bbfbeeb7 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/no_issue.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/no_issue.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_developer.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_developer.json
index d1b2e41f772..d1b2e41f772 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_developer.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_developer.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_directory_uuid.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_directory_uuid.json
index a7d02467eb1..a7d02467eb1 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_directory_uuid.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_directory_uuid.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_file_key.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_file_key.json
index a7d02467eb1..a7d02467eb1 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_file_key.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_file_key.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_file_uuid.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_file_uuid.json
index a7d02467eb1..a7d02467eb1 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_file_uuid.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_file_uuid.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_project_uuid.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_project_uuid.json
index a7d02467eb1..a7d02467eb1 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_project_uuid.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_project_uuid.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_test_key.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_test_key.json
index 1807eeb16d0..1807eeb16d0 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_test_key.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_test_key.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_view_uuid.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_view_uuid.json
index a7d02467eb1..a7d02467eb1 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_view_uuid.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_by_view_uuid.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_since_leak_period.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_since_leak_period.json
index 0cdf5b8fa6c..0cdf5b8fa6c 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_since_leak_period.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionComponentsTest/search_since_leak_period.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/apply_paging_with_multiple_components.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/apply_paging_with_multiple_components.json
index 640bd4009d1..640bd4009d1 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/apply_paging_with_multiple_components.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/apply_paging_with_multiple_components.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/apply_paging_with_one_component.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/apply_paging_with_one_component.json
index 640bd4009d1..640bd4009d1 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/apply_paging_with_one_component.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/apply_paging_with_one_component.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/assignedToMe_facet_must_escape_login_of_authenticated_user.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/assignedToMe_facet_must_escape_login_of_authenticated_user.json
index 45df34e8f53..45df34e8f53 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/assignedToMe_facet_must_escape_login_of_authenticated_user.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/assignedToMe_facet_must_escape_login_of_authenticated_user.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/assigned_to_me_facet_sticky.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/assigned_to_me_facet_sticky.json
index ca29e4e065e..ca29e4e065e 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/assigned_to_me_facet_sticky.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/assigned_to_me_facet_sticky.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/author_is_hidden.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/author_is_hidden.json
index 357e05cad31..357e05cad31 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/author_is_hidden.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/author_is_hidden.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/components_contains_sub_projects.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/components_contains_sub_projects.json
index ff13b0b2e6b..ff13b0b2e6b 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/components_contains_sub_projects.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/components_contains_sub_projects.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/default_page_size_is_100.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/default_page_size_is_100.json
index 13af5a2ede8..13af5a2ede8 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/default_page_size_is_100.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/default_page_size_is_100.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/display_facets.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/display_facets.json
index 38fd2f2b973..38fd2f2b973 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/display_facets.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/display_facets.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/display_facets_effort.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/display_facets_effort.json
index edf7821dd0c..edf7821dd0c 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/display_facets_effort.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/display_facets_effort.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/display_zero_facets.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/display_zero_facets.json
index 5bbf619ab43..5bbf619ab43 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/display_zero_facets.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/display_zero_facets.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/empty_result.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/empty_result.json
index acda7495d25..acda7495d25 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/empty_result.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/empty_result.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_assigned_to_me.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_assigned_to_me.json
index 4a0382aa7c1..4a0382aa7c1 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_assigned_to_me.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_assigned_to_me.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/hide_rules.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/hide_rules.json
index e3c5691917f..e3c5691917f 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/hide_rules.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/hide_rules.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/ignore_paging_with_one_component.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/ignore_paging_with_one_component.json
index 7da1192f599..7da1192f599 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/ignore_paging_with_one_component.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/ignore_paging_with_one_component.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/issue_on_removed_file.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/issue_on_removed_file.json
index cb319e33928..cb319e33928 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/issue_on_removed_file.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/issue_on_removed_file.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/issue_with_comment_hidden.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/issue_with_comment_hidden.json
index a08a3827399..a08a3827399 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/issue_with_comment_hidden.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/issue_with_comment_hidden.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/issue_with_comments.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/issue_with_comments.json
index e72950b2da9..e72950b2da9 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/issue_with_comments.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/issue_with_comments.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/load_additional_fields.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/load_additional_fields.json
index 1011cf465d7..1011cf465d7 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/load_additional_fields.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/load_additional_fields.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/load_additional_fields_with_issue_admin_permission.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/load_additional_fields_with_issue_admin_permission.json
index fa13177f78d..fa13177f78d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/load_additional_fields_with_issue_admin_permission.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/load_additional_fields_with_issue_admin_permission.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/no_issue.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/no_issue.json
index ce8bbfbeeb7..ce8bbfbeeb7 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/no_issue.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/no_issue.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/paging.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/paging.json
index d16592f6408..d16592f6408 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/paging.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/paging.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/paging_with_page_size_to_minus_one.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/paging_with_page_size_to_minus_one.json
index 04e89e27fc3..04e89e27fc3 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/paging_with_page_size_to_minus_one.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/paging_with_page_size_to_minus_one.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/response_contains_all_fields_except_additional_fields.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/response_contains_all_fields_except_additional_fields.json
index b008f9bff74..b008f9bff74 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/response_contains_all_fields_except_additional_fields.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/response_contains_all_fields_except_additional_fields.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/result_for_rule_search.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/result_for_rule_search.json
index fc0bc4ef013..fc0bc4ef013 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/result_for_rule_search.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/result_for_rule_search.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTestOnSonarCloud/no_author_and_no_authors_facet.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTestOnSonarCloud/no_author_and_no_authors_facet.json
index 8f82c809391..8f82c809391 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTestOnSonarCloud/no_author_and_no_authors_facet.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTestOnSonarCloud/no_author_and_no_authors_facet.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTestOnSonarCloud/no_authors_facet.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTestOnSonarCloud/no_authors_facet.json
index c8df191b11b..c8df191b11b 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTestOnSonarCloud/no_authors_facet.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTestOnSonarCloud/no_authors_facet.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTestOnSonarCloud/with_authors_facet.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTestOnSonarCloud/with_authors_facet.json
index cf2a13cb94d..cf2a13cb94d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionTestOnSonarCloud/with_authors_facet.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTestOnSonarCloud/with_authors_facet.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list.json
index 32190c0008f..32190c0008f 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_key.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_key.json
index 187ce02ada0..187ce02ada0 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_key.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_key.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_name.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_name.json
index 9f167f6f77e..9f167f6f77e 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_name.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_filtered_name.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_limited.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_limited.json
index 513d8b14de4..513d8b14de4 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_limited.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/language/ws/LanguageWsTest/list_limited.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/MetricsActionTest/metrics.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/measure/custom/ws/MetricsActionTest/metrics.json
index 2b089fa619e..2b089fa619e 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/MetricsActionTest/metrics.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/measure/custom/ws/MetricsActionTest/metrics.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/custom-measures.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/custom-measures.json
index 342ef9a3ec5..342ef9a3ec5 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/custom-measures.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/custom-measures.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/empty.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/empty.json
index 07b3a2950c2..07b3a2950c2 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/empty.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/measure/custom/ws/SearchActionTest/empty.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/UpdateActionTest/custom-measure.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/measure/custom/ws/UpdateActionTest/custom-measure.json
index d91f151cefa..d91f151cefa 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/measure/custom/ws/UpdateActionTest/custom-measure.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/measure/custom/ws/UpdateActionTest/custom-measure.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/metric/ws/CreateActionTest/metric.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/metric/ws/CreateActionTest/metric.json
index ac8905bea70..ac8905bea70 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/metric/ws/CreateActionTest/metric.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/metric/ws/CreateActionTest/metric.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/metric/ws/SearchActionTest/search_metrics.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/metric/ws/SearchActionTest/search_metrics.json
index 153945ce7c4..153945ce7c4 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/metric/ws/SearchActionTest/search_metrics.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/metric/ws/SearchActionTest/search_metrics.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/metric/ws/UpdateActionTest/metric.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/metric/ws/UpdateActionTest/metric.json
index ac8905bea70..ac8905bea70 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/metric/ws/UpdateActionTest/metric.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/metric/ws/UpdateActionTest/metric.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/GroupsActionTest/groups.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/permission/ws/GroupsActionTest/groups.json
index e67f7047034..e67f7047034 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/GroupsActionTest/groups.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/permission/ws/GroupsActionTest/groups.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/display_all_project_permissions.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/display_all_project_permissions.json
index 5789d2975ed..5789d2975ed 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/display_all_project_permissions.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/display_all_project_permissions.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/empty.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/empty.json
index acd810938d2..acd810938d2 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/empty.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest/empty.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/search_for_users_is_paginated.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/search_for_users_is_paginated.json
index eef7bf0f1fe..eef7bf0f1fe 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/search_for_users_is_paginated.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/search_for_users_is_paginated.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/users.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/users.json
index 29534a49dc7..29534a49dc7 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/users.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/permission/ws/UsersActionTest/users.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/display_all_project_permissions.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/display_all_project_permissions.json
index e69de29bb2d..e69de29bb2d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/display_all_project_permissions.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/display_all_project_permissions.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/empty.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/empty.json
index e69de29bb2d..e69de29bb2d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/empty.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/permission/ws/template/SearchTemplatesActionTest/empty.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/InstalledActionTest/some.jar b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/plugins/ws/InstalledActionTest/some.jar
index e69de29bb2d..e69de29bb2d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/InstalledActionTest/some.jar
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/plugins/ws/InstalledActionTest/some.jar
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/empty.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/project/ws/IndexActionTest/empty.json
index 41b42e677b9..41b42e677b9 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/empty.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/project/ws/IndexActionTest/empty.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/return_only_projects_authorized_for_user.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/project/ws/IndexActionTest/return_only_projects_authorized_for_user.json
index 9bc8440f9b0..9bc8440f9b0 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/return_only_projects_authorized_for_user.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/project/ws/IndexActionTest/return_only_projects_authorized_for_user.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_id.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_id.json
index 4c9d99ac462..4c9d99ac462 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_id.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_id.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_key.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_key.json
index 4c9d99ac462..4c9d99ac462 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_key.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_project_by_key.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects.json
index a5d82ab23c3..a5d82ab23c3 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_by_name.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_by_name.json
index bd36e6832c3..bd36e6832c3 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_by_name.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_by_name.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules.json
index 51b0c2f4872..51b0c2f4872 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules_by_name.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules_by_name.json
index a82ce85f671..a82ce85f671 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules_by_name.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/project/ws/IndexActionTest/search_projects_with_modules_by_name.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_fail_when_user_has_not_project_browse_permission.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_fail_when_user_has_not_project_browse_permission.json
index d98b4c40613..d98b4c40613 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_fail_when_user_has_not_project_browse_permission.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_fail_when_user_has_not_project_browse_permission.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated.json
index 1475b5a81e6..1475b5a81e6 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_when_not_authenticated.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_when_not_authenticated.json
index d98b4c40613..d98b4c40613 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_when_not_authenticated.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_when_not_authenticated.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/empty.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/empty.json
index 0d4f101c7a3..0d4f101c7a3 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/empty.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/empty.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_project_settings_when_component_and_no_key.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_project_settings_when_component_and_no_key.json
index 12d2fd7c1a2..12d2fd7c1a2 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_project_settings_when_component_and_no_key.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_project_settings_when_component_and_no_key.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_settings_when_no_component_and_no_key.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_settings_when_no_component_and_no_key.json
index 96409e92995..96409e92995 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_settings_when_no_component_and_no_key.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_settings_when_no_component_and_no_key.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_default_values.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_default_values.json
index 4647a4e42ba..4647a4e42ba 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_default_values.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_default_values.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_global_values.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_global_values.json
index 0869d171522..0869d171522 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_global_values.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_global_values.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_global_setting.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_global_setting.json
index 815c45955ff..815c45955ff 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_global_setting.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_global_setting.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_module.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_module.json
index 15a3ae5fb4c..15a3ae5fb4c 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_module.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_module.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_license_with_hash_settings_when_authenticated_but_not_admin.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_license_with_hash_settings_when_authenticated_but_not_admin.json
index e40076cc580..e40076cc580 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_license_with_hash_settings_when_authenticated_but_not_admin.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_license_with_hash_settings_when_authenticated_but_not_admin.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_module_values.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_module_values.json
index 5486106db4f..5486106db4f 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_module_values.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_module_values.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_value_with_coma.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_value_with_coma.json
index 8411a36aea3..8411a36aea3 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_value_with_coma.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_value_with_coma.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_values.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_values.json
index ce4fcb99c7f..ce4fcb99c7f 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_values.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_values.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_only_one_setting_when_key_is_provided.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_only_one_setting_when_key_is_provided.json
index d98b4c40613..d98b4c40613 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_only_one_setting_when_key_is_provided.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_only_one_setting_when_key_is_provided.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_project_values.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_project_values.json
index 5486106db4f..5486106db4f 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_project_values.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_project_values.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_property_set.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_property_set.json
index 327d187331c..327d187331c 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_property_set.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_property_set.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_in_property_set_when_system_admin.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_in_property_set_when_system_admin.json
index 121b81eb898..121b81eb898 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_in_property_set_when_system_admin.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_in_property_set_when_system_admin.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_project_admin.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_project_admin.json
index 29261a0ea24..29261a0ea24 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_project_admin.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_project_admin.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_system_admin.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_system_admin.json
index b4a042b8271..b4a042b8271 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_system_admin.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_system_admin.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_simple_value.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_simple_value.json
index d98b4c40613..d98b4c40613 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_simple_value.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_simple_value.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_values_even_if_no_property_definition.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_values_even_if_no_property_definition.json
index c3d4ba19dd4..c3d4ba19dd4 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_values_even_if_no_property_definition.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_values_even_if_no_property_definition.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/ProjectStatusActionTest/measure_data.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualitygate/ws/ProjectStatusActionTest/measure_data.json
index 38c36070556..38c36070556 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/ProjectStatusActionTest/measure_data.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualitygate/ws/ProjectStatusActionTest/measure_data.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/non_leak_period.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/non_leak_period.json
index f4c59dfc7ab..f4c59dfc7ab 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/non_leak_period.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/non_leak_period.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/quality_gate_details.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/quality_gate_details.json
index f19fbbcf362..f19fbbcf362 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/quality_gate_details.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatterTest/quality_gate_details.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_empty.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_empty.json
index 22d12b01f52..22d12b01f52 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_empty.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_empty.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_full.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_full.json
index 1fa4b2af245..1fa4b2af245 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_full.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_full.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_nominal.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_nominal.json
index 0ad79039d5e..0ad79039d5e 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_nominal.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionMockTest/changelog_nominal.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionTest/compare_nominal.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionTest/compare_nominal.json
index 1d0ef292292..1d0ef292292 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionTest/compare_nominal.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionTest/compare_nominal.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionTest/compare_param_on_left.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionTest/compare_param_on_left.json
index afe92f1d381..afe92f1d381 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionTest/compare_param_on_left.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionTest/compare_param_on_left.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionTest/compare_param_on_right.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionTest/compare_param_on_right.json
index ec902279be3..ec902279be3 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionTest/compare_param_on_right.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionTest/compare_param_on_right.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionMediumTest/create-with-messages.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionMediumTest/create-with-messages.json
index aec5817ffb2..aec5817ffb2 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionMediumTest/create-with-messages.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionMediumTest/create-with-messages.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionTest/test_json.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionTest/test_json.json
index 367abddd246..367abddd246 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionTest/test_json.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionTest/test_json.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-buWide.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-buWide.json
index 3e71ac9ebc7..3e71ac9ebc7 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-buWide.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-buWide.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-simple.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-simple.json
index b5168de4671..b5168de4671 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-simple.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionTest/inheritance-simple.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule.json
index fc904cd1ca9..fc904cd1ca9 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule_not_all.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule_not_all.json
index 5c9511a9ea8..5c9511a9ea8 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule_not_all.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/bulk_activate_rule_not_all.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/does_not_return_warnings_when_bulk_activate_on_profile_and_rules_exist_on_another_language_than_profile.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/does_not_return_warnings_when_bulk_activate_on_profile_and_rules_exist_on_another_language_than_profile.json
index 5c9511a9ea8..5c9511a9ea8 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/does_not_return_warnings_when_bulk_activate_on_profile_and_rules_exist_on_another_language_than_profile.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest/does_not_return_warnings_when_bulk_activate_on_profile_and_rules_exist_on_another_language_than_profile.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/RestoreActionTest/restore_profile.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/RestoreActionTest/restore_profile.json
index 9375056bade..9375056bade 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/RestoreActionTest/restore_profile.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/ws/RestoreActionTest/restore_profile.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories.json
index ee30e62c188..ee30e62c188 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_common.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_common.json
index e572f337153..e572f337153 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_common.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_common.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_sonar.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_sonar.json
index ee30e62c188..ee30e62c188 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_sonar.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_sonar.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_squid.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_squid.json
index 8e8a17083c6..8e8a17083c6 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_squid.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_squid.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_ws.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_ws.json
index e079f7674c2..e079f7674c2 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_ws.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_ws.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_xoo.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_xoo.json
index f15c319b4fb..f15c319b4fb 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_xoo.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RepositoriesActionTest/repositories_xoo.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleSearchWsHandlerTest/search_rules.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RuleSearchWsHandlerTest/search_rules.json
index ebd42c46b97..ebd42c46b97 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleSearchWsHandlerTest/search_rules.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RuleSearchWsHandlerTest/search_rules.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_manuel_rule.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_manuel_rule.json
index d272b57329b..d272b57329b 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_manuel_rule.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_manuel_rule.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule.json
index bbee6492043..bbee6492043 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_dates.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_dates.json
index 49e79391655..49e79391655 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_dates.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_dates.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_note.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_note.json
index 42e5a5cede9..42e5a5cede9 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_note.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_note.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_tags.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_tags.json
index 45394093e65..45394093e65 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_tags.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_tags.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/filter_by_tags.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/filter_by_tags.json
index e109ed28cc8..e109ed28cc8 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/filter_by_tags.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/filter_by_tags.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/get_note_as_markdown_and_html.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/get_note_as_markdown_and_html.json
index 68a29b47e65..68a29b47e65 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/get_note_as_markdown_and_html.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/get_note_as_markdown_and_html.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/return_mandatory_fields_even_when_setting_f_param.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/return_mandatory_fields_even_when_setting_f_param.json
index f3a9823c7ba..f3a9823c7ba 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/return_mandatory_fields_even_when_setting_f_param.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/return_mandatory_fields_even_when_setting_f_param.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules.json
index 315359d66f9..315359d66f9 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules_fields.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules_fields.json
index 30c6468a86b..30c6468a86b 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules_fields.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules_fields.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules.json
index 76e721d0b85..76e721d0b85 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules_params.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules_params.json
index c8edf1ad34a..c8edf1ad34a 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules_params.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_active_rules_params.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json
index ac69b2e9ea7..ac69b2e9ea7 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json
index d744e2ed7da..d744e2ed7da 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json
index 27e1e453317..27e1e453317 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_no_rules.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_no_rules.json
index 0e7286cf282..0e7286cf282 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_no_rules.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_no_rules.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules.json
index 293af7e0604..293af7e0604 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules_inheritance.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules_inheritance.json
index 016101f2a44..016101f2a44 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules_inheritance.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_profile_active_rules_inheritance.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_from_template_key.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_from_template_key.json
index f9668593f71..f9668593f71 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_from_template_key.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_from_template_key.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_with_deprecated_fields.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_with_deprecated_fields.json
index 6bac1056119..6bac1056119 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_with_deprecated_fields.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_rules_with_deprecated_fields.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_template_rules.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_template_rules.json
index c7a449843da..c7a449843da 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_template_rules.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_template_rules.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/severities_facet.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/severities_facet.json
index f2d9754809b..f2d9754809b 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/severities_facet.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/severities_facet.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet.json
index 4692be87efe..4692be87efe 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet_sticky.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet_sticky.json
index a5b7a796655..a5b7a796655 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet_sticky.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/statuses_facet_sticky.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/deprecated_remediation_function.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/deprecated_remediation_function.json
index e5dcab52ace..e5dcab52ace 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/deprecated_remediation_function.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/deprecated_remediation_function.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/update_custom_rule.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/update_custom_rule.json
index 2e3f3fa36ef..2e3f3fa36ef 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/update_custom_rule.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/update_custom_rule.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/IssueSnippetsActionTest/issue_snippets_close_to_each_other.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/IssueSnippetsActionTest/issue_snippets_close_to_each_other.json
index c728ef0195f..c728ef0195f 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/IssueSnippetsActionTest/issue_snippets_close_to_each_other.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/IssueSnippetsActionTest/issue_snippets_close_to_each_other.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/IssueSnippetsActionTest/issue_snippets_multiple_locations.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/IssueSnippetsActionTest/issue_snippets_multiple_locations.json
index d27edae9477..d27edae9477 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/IssueSnippetsActionTest/issue_snippets_multiple_locations.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/IssueSnippetsActionTest/issue_snippets_multiple_locations.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/IssueSnippetsActionTest/issue_snippets_single_location.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/IssueSnippetsActionTest/issue_snippets_single_location.json
index 9935b29b189..9935b29b189 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/IssueSnippetsActionTest/issue_snippets_single_location.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/IssueSnippetsActionTest/issue_snippets_single_location.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/IssueSnippetsActionTest/issue_snippets_with_measures.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/IssueSnippetsActionTest/issue_snippets_with_measures.json
index 9d1e9a9d7d5..9d1e9a9d7d5 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/IssueSnippetsActionTest/issue_snippets_with_measures.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/IssueSnippetsActionTest/issue_snippets_with_measures.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/convert_deprecated_data.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/LinesActionTest/convert_deprecated_data.json
index 8040c2b7d44..8040c2b7d44 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/convert_deprecated_data.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/LinesActionTest/convert_deprecated_data.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/display_deprecated_fields.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/LinesActionTest/display_deprecated_fields.json
index 39fa90dca54..39fa90dca54 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/display_deprecated_fields.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/LinesActionTest/display_deprecated_fields.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/generated_isNew.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/LinesActionTest/generated_isNew.json
index f026ce11a06..f026ce11a06 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/generated_isNew.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/LinesActionTest/generated_isNew.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/hide_scmAuthors.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/LinesActionTest/hide_scmAuthors.json
index 2fd47642208..2fd47642208 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/hide_scmAuthors.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/LinesActionTest/hide_scmAuthors.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_paginated_lines.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_paginated_lines.json
index 4cc6dad6487..4cc6dad6487 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_paginated_lines.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_paginated_lines.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_scmAuthors.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_scmAuthors.json
index 6386535cf73..6386535cf73 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_scmAuthors.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_scmAuthors.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source.json
index 5571ba74903..5571ba74903 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source_by_file_key.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source_by_file_key.json
index fe9dad72f2e..fe9dad72f2e 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source_by_file_key.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source_by_file_key.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/accept_negative_value_in_from_parameter.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/ScmActionTest/accept_negative_value_in_from_parameter.json
index d2f49640092..d2f49640092 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/accept_negative_value_in_from_parameter.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/ScmActionTest/accept_negative_value_in_from_parameter.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/group_lines_by_commit.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/ScmActionTest/group_lines_by_commit.json
index 48f0fea73b6..48f0fea73b6 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/group_lines_by_commit.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/ScmActionTest/group_lines_by_commit.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/not_group_lines_by_commit.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/ScmActionTest/not_group_lines_by_commit.json
index 08ebdd2ec8a..08ebdd2ec8a 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/not_group_lines_by_commit.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/ScmActionTest/not_group_lines_by_commit.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/return_empty_value_when_no_scm.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/ScmActionTest/return_empty_value_when_no_scm.json
index 62311675ae3..62311675ae3 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/return_empty_value_when_no_scm.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/ScmActionTest/return_empty_value_when_no_scm.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm.json
index 47f79ad7ec7..47f79ad7ec7 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm_from_given_range_lines.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm_from_given_range_lines.json
index 737dda533a4..737dda533a4 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm_from_given_range_lines.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/ScmActionTest/show_scm_from_given_range_lines.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source.json
index 97081692ba0..97081692ba0 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source_with_params_from_and_to.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source_with_params_from_and_to.json
index 50606fa19a6..50606fa19a6 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source_with_params_from_and_to.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source_with_params_from_and_to.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_bread_crumbs_on_several_levels.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_bread_crumbs_on_several_levels.json
index 5cbe3a1586d..5cbe3a1586d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_bread_crumbs_on_several_levels.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_bread_crumbs_on_several_levels.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_anonymous_no_snapshot.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_anonymous_no_snapshot.json
index 6fe16e2a308..6fe16e2a308 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_anonymous_no_snapshot.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_anonymous_no_snapshot.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_file_on_branch.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_file_on_branch.json
index 6bbea627ada..6bbea627ada 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_file_on_branch.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_file_on_branch.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_file_on_master.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_file_on_master.json
index 6bbea627ada..6bbea627ada 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_file_on_master.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_file_on_master.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_snapshot.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_snapshot.json
index ffc0a989a93..ffc0a989a93 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_snapshot.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_snapshot.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_with_favourite.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_with_favourite.json
index 45aea77e5fa..45aea77e5fa 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_with_favourite.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_with_favourite.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_admin.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_admin.json
index be150b7ce8b..be150b7ce8b 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_admin.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_admin.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_gate_admin.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_gate_admin.json
index 893e9dfc04a..893e9dfc04a 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_gate_admin.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_gate_admin.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_profile_admin.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_profile_admin.json
index 8a8dd68ca93..8a8dd68ca93 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_profile_admin.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_for_quality_profile_admin.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_with_all_properties.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_with_all_properties.json
index 3384808676b..3384808676b 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_with_all_properties.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_configuration_with_all_properties.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_default_quality_gate.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_default_quality_gate.json
index e721b5c6c3b..e721b5c6c3b 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_default_quality_gate.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_default_quality_gate.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_deleted_quality_profiles.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_deleted_quality_profiles.json
index 70c873a7e13..70c873a7e13 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_deleted_quality_profiles.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_deleted_quality_profiles.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_empty_quality_profiles_when_no_measure.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_empty_quality_profiles_when_no_measure.json
index d825b579149..d825b579149 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_empty_quality_profiles_when_no_measure.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_empty_quality_profiles_when_no_measure.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions.json
index 8ecf18f4e6a..8ecf18f4e6a 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions_for_admin.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions_for_admin.json
index 8ecf18f4e6a..8ecf18f4e6a 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions_for_admin.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_extensions_for_admin.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_gate.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_gate.json
index 6a016b82507..6a016b82507 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_gate.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_gate.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_profiles.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_profiles.json
index 148e21a0bbf..148e21a0bbf 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_profiles.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_quality_profiles.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/empty.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/empty.json
index f1639085e53..f1639085e53 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/empty.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/empty.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_pages.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_pages.json
index 91c6409200c..91c6409200c 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_pages.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_pages.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_update_center.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_update_center.json
index 9f605d32801..9f605d32801 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_update_center.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ui/ws/SettingsActionTest/with_update_center.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/anotherPlugin.jar b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/anotherPlugin.jar
index c7bc88e1d0e..c7bc88e1d0e 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/anotherPlugin.jar
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/anotherPlugin.jar
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/plugin.jar b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/plugin.jar
index 089521146df..089521146df 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/plugin.jar
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/updatecenter/ws/UploadActionTest/plugin.jar
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/CreateActionTest/create_user.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/user/ws/CreateActionTest/create_user.json
index 1e04312feaa..1e04312feaa 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/CreateActionTest/create_user.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/user/ws/CreateActionTest/create_user.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/CreateActionTest/reactivate_user.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/user/ws/CreateActionTest/reactivate_user.json
index caaf7e570c0..caaf7e570c0 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/CreateActionTest/reactivate_user.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/user/ws/CreateActionTest/reactivate_user.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/blank_email_is_updated_to_null.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/blank_email_is_updated_to_null.json
index c0b0d869d10..c0b0d869d10 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/blank_email_is_updated_to_null.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/blank_email_is_updated_to_null.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_email.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_email.json
index 01183a602fe..01183a602fe 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_email.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_email.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_name.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_name.json
index 74c6d7e9cea..74c6d7e9cea 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_name.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_name.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_scm_accounts.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_scm_accounts.json
index 445f1b29800..445f1b29800 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_scm_accounts.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_scm_accounts.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_user.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_user.json
index 4e5717b8cc2..4e5717b8cc2 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_user.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/user/ws/UpdateActionTest/update_user.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/list_including_internals.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/list_including_internals.json
index d118e6e60cf..d118e6e60cf 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/list_including_internals.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/list_including_internals.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/metrics_example.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/metrics_example.json
index 2516f68de60..2516f68de60 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/metrics_example.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/metrics_example.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/response_example.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/response_example.json
index 1b37618babd..1b37618babd 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/response_example.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ws/ws/WebServicesWsTest/response_example.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/web-service-engine-test.txt b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ws/ws/web-service-engine-test.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/web-service-engine-test.txt
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ws/ws/web-service-engine-test.txt
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/web-services-ws-test.txt b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ws/ws/web-services-ws-test.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ws/ws/web-services-ws-test.txt
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/ws/ws/web-services-ws-test.txt
diff --git a/server/sonar-webserver-ws/src/main/java/org/sonar/server/ws/WebServiceEngine.java b/server/sonar-webserver-ws/src/main/java/org/sonar/server/ws/WebServiceEngine.java
index e7569e60350..cbbd7a0389b 100644
--- a/server/sonar-webserver-ws/src/main/java/org/sonar/server/ws/WebServiceEngine.java
+++ b/server/sonar-webserver-ws/src/main/java/org/sonar/server/ws/WebServiceEngine.java
@@ -85,7 +85,7 @@ public class WebServiceEngine implements LocalConnector, Startable {
     return requireNonNull(context, "Web services has not yet been initialized");
   }
 
-  List<WebService.Controller> controllers() {
+  public List<WebService.Controller> controllers() {
     return getContext().controllers();
   }
 
diff --git a/server/sonar-webserver/build.gradle b/server/sonar-webserver/build.gradle
index ef7a1f1bd16..33ad8a34b99 100644
--- a/server/sonar-webserver/build.gradle
+++ b/server/sonar-webserver/build.gradle
@@ -15,6 +15,7 @@ dependencies {
   compile project(':server:sonar-process')
   compile project(':server:sonar-server')
   compile project(':server:sonar-server-common')
+  compile project(':server:sonar-webserver-webapi')
 
   compileOnly 'com.google.code.findbugs:jsr305'
 
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
index 215acb05434..b72635af2a9 100644
--- a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
@@ -35,6 +35,7 @@ import org.sonar.core.platform.ComponentContainer;
 import org.sonar.core.platform.PlatformEditionProvider;
 import org.sonar.server.authentication.AuthenticationModule;
 import org.sonar.server.authentication.LogOAuthWarning;
+import org.sonar.server.authentication.ws.AuthenticationWsModule;
 import org.sonar.server.badge.ws.ProjectBadgesWsModule;
 import org.sonar.server.batch.BatchWsModule;
 import org.sonar.server.branch.BranchFeatureProxyImpl;
@@ -68,6 +69,7 @@ import org.sonar.server.es.metadata.MetadataIndexImpl;
 import org.sonar.server.extension.CoreExtensionBootstraper;
 import org.sonar.server.extension.CoreExtensionStopper;
 import org.sonar.server.favorite.FavoriteModule;
+import org.sonar.server.favorite.ws.FavoriteWsModule;
 import org.sonar.server.health.NodeHealthModule;
 import org.sonar.server.issue.AddTagsAction;
 import org.sonar.server.issue.AssignAction;
@@ -102,19 +104,21 @@ import org.sonar.server.organization.BillingValidationsProxyImpl;
 import org.sonar.server.organization.OrganizationUpdaterImpl;
 import org.sonar.server.organization.OrganizationValidationImpl;
 import org.sonar.server.organization.ws.OrganizationsWsModule;
+import org.sonar.server.permission.DefaultTemplatesResolverImpl;
 import org.sonar.server.permission.GroupPermissionChanger;
 import org.sonar.server.permission.PermissionTemplateService;
 import org.sonar.server.permission.PermissionUpdater;
 import org.sonar.server.permission.UserPermissionChanger;
 import org.sonar.server.permission.index.PermissionIndexer;
 import org.sonar.server.permission.ws.PermissionsWsModule;
-import org.sonar.server.permission.ws.template.DefaultTemplatesResolverImpl;
 import org.sonar.server.platform.BackendCleanup;
 import org.sonar.server.platform.ClusterVerification;
 import org.sonar.server.platform.PersistentSettings;
 import org.sonar.server.platform.SettingsChangeNotifier;
 import org.sonar.server.platform.WebCoreExtensionsInstaller;
-import org.sonar.server.platform.monitoring.WebSystemInfoModule;
+import org.sonar.server.platform.web.DeprecatedPropertiesWsFilter;
+import org.sonar.server.platform.web.WebServiceFilter;
+import org.sonar.server.platform.web.WebServiceReroutingFilter;
 import org.sonar.server.platform.web.requestid.HttpRequestIdModule;
 import org.sonar.server.platform.ws.ChangeLogLevelActionModule;
 import org.sonar.server.platform.ws.DbMigrationStatusAction;
@@ -128,6 +132,7 @@ import org.sonar.server.platform.ws.ServerWs;
 import org.sonar.server.platform.ws.StatusAction;
 import org.sonar.server.platform.ws.SystemWs;
 import org.sonar.server.platform.ws.UpgradesAction;
+import org.sonar.server.platform.ws.WebSystemInfoModule;
 import org.sonar.server.plugins.PluginDownloader;
 import org.sonar.server.plugins.PluginUninstaller;
 import org.sonar.server.plugins.ServerExtensionInstaller;
@@ -142,13 +147,14 @@ import org.sonar.server.plugins.ws.PluginsWs;
 import org.sonar.server.plugins.ws.UninstallAction;
 import org.sonar.server.plugins.ws.UpdatesAction;
 import org.sonar.server.project.ws.ProjectsWsModule;
-import org.sonar.server.projectanalysis.ProjectAnalysisModule;
+import org.sonar.server.projectanalysis.ws.ProjectAnalysisWsModule;
 import org.sonar.server.projectlink.ws.ProjectLinksModule;
 import org.sonar.server.projecttag.ws.ProjectTagsWsModule;
 import org.sonar.server.property.InternalPropertiesImpl;
 import org.sonar.server.property.ws.PropertiesWs;
 import org.sonar.server.qualitygate.QualityGateModule;
 import org.sonar.server.qualitygate.notification.QGChangeNotificationHandler;
+import org.sonar.server.qualitygate.ws.QualityGateWsModule;
 import org.sonar.server.qualityprofile.BuiltInQPChangeNotificationHandler;
 import org.sonar.server.qualityprofile.BuiltInQPChangeNotificationTemplate;
 import org.sonar.server.qualityprofile.BuiltInQProfileDefinitionsBridge;
@@ -193,6 +199,7 @@ import org.sonar.server.ui.PageRepository;
 import org.sonar.server.ui.WebAnalyticsLoaderImpl;
 import org.sonar.server.ui.ws.NavigationWsModule;
 import org.sonar.server.updatecenter.UpdateCenterModule;
+import org.sonar.server.updatecenter.ws.UpdateCenterWsModule;
 import org.sonar.server.user.NewUserNotifier;
 import org.sonar.server.user.SecurityRealmFactory;
 import org.sonar.server.user.UserSessionFactoryImpl;
@@ -205,16 +212,14 @@ import org.sonar.server.usergroups.DefaultGroupCreatorImpl;
 import org.sonar.server.usergroups.DefaultGroupFinder;
 import org.sonar.server.usergroups.ws.UserGroupsModule;
 import org.sonar.server.usertoken.UserTokenModule;
+import org.sonar.server.usertoken.ws.UserTokenWsModule;
 import org.sonar.server.util.TypeValidationModule;
 import org.sonar.server.view.index.ViewIndex;
 import org.sonar.server.view.index.ViewIndexDefinition;
 import org.sonar.server.view.index.ViewIndexer;
 import org.sonar.server.webhook.WebhookModule;
 import org.sonar.server.webhook.ws.WebhooksWsModule;
-import org.sonar.server.ws.DeprecatedPropertiesWsFilter;
 import org.sonar.server.ws.WebServiceEngine;
-import org.sonar.server.ws.WebServiceFilter;
-import org.sonar.server.ws.WebServiceReroutingFilter;
 import org.sonar.server.ws.ws.WebServicesWsModule;
 
 import static org.sonar.core.extension.CoreExtensionsInstaller.noAdditionalSideFilter;
@@ -261,6 +266,7 @@ public class PlatformLevel4 extends PlatformLevel {
 
       // update center
       UpdateCenterModule.class,
+      UpdateCenterWsModule.class,
 
       // organizations
       OrganizationValidationImpl.class,
@@ -327,6 +333,7 @@ public class PlatformLevel4 extends PlatformLevel {
       TimeMachineWs.class,
 
       QualityGateModule.class,
+      QualityGateWsModule.class,
 
       // web services
       WebServiceEngine.class,
@@ -341,6 +348,7 @@ public class PlatformLevel4 extends PlatformLevel {
 
       // authentication
       AuthenticationModule.class,
+      AuthenticationWsModule.class,
 
       // users
       UserSessionFactoryImpl.class,
@@ -352,6 +360,7 @@ public class PlatformLevel4 extends PlatformLevel {
       UserUpdater.class,
       UsersWsModule.class,
       UserTokenModule.class,
+      UserTokenWsModule.class,
 
       // groups
       UserGroupsModule.class,
@@ -386,6 +395,7 @@ public class PlatformLevel4 extends PlatformLevel {
       ComponentViewerJsonWriter.class,
 
       FavoriteModule.class,
+      FavoriteWsModule.class,
 
       // views
       ViewIndexDefinition.class,
@@ -455,7 +465,7 @@ public class PlatformLevel4 extends PlatformLevel {
       ProjectLinksModule.class,
 
       // Project Analyses
-      ProjectAnalysisModule.class,
+      ProjectAnalysisWsModule.class,
 
       // System
       ServerLogging.class,
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelSafeMode.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelSafeMode.java
index 446f6afadd4..81c6adf532e 100644
--- a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelSafeMode.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelSafeMode.java
@@ -26,6 +26,7 @@ import org.sonar.server.platform.db.migration.AutoDbMigration;
 import org.sonar.server.platform.db.migration.DatabaseMigrationImpl;
 import org.sonar.server.platform.db.migration.MigrationEngineModule;
 import org.sonar.server.platform.db.migration.NoopDatabaseMigrationImpl;
+import org.sonar.server.platform.web.WebServiceFilter;
 import org.sonar.server.platform.ws.DbMigrationStatusAction;
 import org.sonar.server.platform.ws.IndexAction;
 import org.sonar.server.platform.ws.L10nWs;
@@ -34,7 +35,6 @@ import org.sonar.server.platform.ws.SafeModeHealthActionModule;
 import org.sonar.server.platform.ws.StatusAction;
 import org.sonar.server.platform.ws.SystemWs;
 import org.sonar.server.ws.WebServiceEngine;
-import org.sonar.server.ws.WebServiceFilter;
 import org.sonar.server.ws.ws.WebServicesWsModule;
 
 public class PlatformLevelSafeMode extends PlatformLevel {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/DeprecatedPropertiesWsFilter.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/web/DeprecatedPropertiesWsFilter.java
index 7d67c785764..e6113889262 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/DeprecatedPropertiesWsFilter.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/web/DeprecatedPropertiesWsFilter.java
@@ -17,7 +17,7 @@
  * 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.ws;
+package org.sonar.server.platform.web;
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
@@ -38,6 +38,8 @@ import org.apache.commons.io.IOUtils;
 import org.sonar.api.web.ServletFilter;
 import org.sonar.server.property.ws.IndexAction;
 import org.sonar.server.setting.ws.SettingsWsParameters;
+import org.sonar.server.ws.ServletResponse;
+import org.sonar.server.ws.WebServiceEngine;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static java.nio.charset.StandardCharsets.UTF_8;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceFilter.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/web/WebServiceFilter.java
index ebd1b3aefca..7875640a0bd 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceFilter.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/web/WebServiceFilter.java
@@ -17,7 +17,7 @@
  * 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.ws;
+package org.sonar.server.platform.web;
 
 import java.util.Set;
 import java.util.function.Function;
@@ -31,9 +31,13 @@ import org.sonar.api.server.ws.WebService;
 import org.sonar.api.web.ServletFilter;
 import org.sonar.core.util.stream.MoreCollectors;
 import org.sonar.server.property.ws.PropertiesWs;
+import org.sonar.server.ws.ServletFilterHandler;
+import org.sonar.server.ws.ServletRequest;
+import org.sonar.server.ws.ServletResponse;
+import org.sonar.server.ws.WebServiceEngine;
 
 import static java.util.stream.Stream.concat;
-import static org.sonar.server.ws.WebServiceReroutingFilter.MOVED_WEB_SERVICES;
+import static org.sonar.server.platform.web.WebServiceReroutingFilter.MOVED_WEB_SERVICES;
 
 /**
  * This filter is used to execute Web Services.
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceReroutingFilter.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/web/WebServiceReroutingFilter.java
index fd59f8c6bd3..07a2bad4d10 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceReroutingFilter.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/web/WebServiceReroutingFilter.java
@@ -17,7 +17,7 @@
  * 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.ws;
+package org.sonar.server.platform.web;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
@@ -27,6 +27,9 @@ import javax.servlet.FilterConfig;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.sonar.api.web.ServletFilter;
+import org.sonar.server.ws.ServletRequest;
+import org.sonar.server.ws.ServletResponse;
+import org.sonar.server.ws.WebServiceEngine;
 
 /**
  * This filter is used to execute renamed/moved web services
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/DeprecatedPropertiesWsFilterTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/platform/web/DeprecatedPropertiesWsFilterTest.java
index 753f4ae0bc3..c25cbbe9653 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ws/DeprecatedPropertiesWsFilterTest.java
+++ b/server/sonar-webserver/src/test/java/org/sonar/server/platform/web/DeprecatedPropertiesWsFilterTest.java
@@ -17,7 +17,7 @@
  * 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.ws;
+package org.sonar.server.platform.web;
 
 import java.io.ByteArrayInputStream;
 import java.util.Arrays;
@@ -31,6 +31,9 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.ArgumentCaptor;
+import org.sonar.server.ws.ServletRequest;
+import org.sonar.server.ws.ServletResponse;
+import org.sonar.server.ws.WebServiceEngine;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -54,7 +57,7 @@ public class DeprecatedPropertiesWsFilterTest {
   private DeprecatedPropertiesWsFilter underTest = new DeprecatedPropertiesWsFilter(webServiceEngine);
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     when(request.getContextPath()).thenReturn("/sonarqube");
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceFilterTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/platform/web/WebServiceFilterTest.java
index 1e58673735d..fdee998a8dc 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceFilterTest.java
+++ b/server/sonar-webserver/src/test/java/org/sonar/server/platform/web/WebServiceFilterTest.java
@@ -17,7 +17,7 @@
  * 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.ws;
+package org.sonar.server.platform.web;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,13 +38,15 @@ import org.sonar.api.server.ws.RequestHandler;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.api.utils.Version;
+import org.sonar.server.ws.ServletFilterHandler;
+import org.sonar.server.ws.WebServiceEngine;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.sonar.server.ws.WebServiceFilterTest.WsUrl.newWsUrl;
+import static org.sonar.server.platform.web.WebServiceFilterTest.WsUrl.newWsUrl;
 
 public class WebServiceFilterTest {
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceReroutingFilterTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/platform/web/WebServiceReroutingFilterTest.java
index 3f205a55d59..b10e67ea6fa 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceReroutingFilterTest.java
+++ b/server/sonar-webserver/src/test/java/org/sonar/server/platform/web/WebServiceReroutingFilterTest.java
@@ -17,7 +17,7 @@
  * 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.ws;
+package org.sonar.server.platform.web;
 
 import java.io.IOException;
 import javax.servlet.FilterChain;
@@ -29,6 +29,9 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.ArgumentCaptor;
+import org.sonar.server.ws.ServletRequest;
+import org.sonar.server.ws.ServletResponse;
+import org.sonar.server.ws.WebServiceEngine;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/settings.gradle b/settings.gradle
index e50e4ca5a87..8fce24cc360 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -18,6 +18,7 @@ include 'server:sonar-server-common'
 include 'server:sonar-vsts'
 include 'server:sonar-web'
 include 'server:sonar-webserver'
+include 'server:sonar-webserver-webapi'
 include 'server:sonar-webserver-ws'
 
 include 'sonar-application'