Prefix web service protobuf messages with 'Ws'

server/sonar-server/src/main/java/org/sonar/server/permission/ws/CreateTemplateAction.java

@@ -28,8 +28,8 @@ import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.permission.PermissionTemplateDto;
 import org.sonar.server.user.UserSession;
-import org.sonarqube.ws.Permissions;
 import org.sonarqube.ws.Permissions.PermissionTemplate;
+import org.sonarqube.ws.Permissions.WsCreatePermissionTemplateResponse;
 
 import static java.lang.String.format;
 import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser;
@@ -90,7 +90,7 @@ public class CreateTemplateAction implements PermissionsWsAction {
 
       PermissionTemplateDto permissionTemplate = insertTemplate(dbSession, name, description, projectPattern);
 
-      Permissions.CreatePermissionTemplateResponse response = buildResponse(permissionTemplate);
+      WsCreatePermissionTemplateResponse response = buildResponse(permissionTemplate);
       writeProtobuf(response, wsRequest, wsResponse);
     } finally {
       dbClient.closeSession(dbSession);
@@ -114,8 +114,8 @@ public class CreateTemplateAction implements PermissionsWsAction {
     return template;
   }
 
-  private static Permissions.CreatePermissionTemplateResponse buildResponse(PermissionTemplateDto permissionTemplateDto) {
+  private static WsCreatePermissionTemplateResponse buildResponse(PermissionTemplateDto permissionTemplateDto) {
     PermissionTemplate permissionTemplateBuilder = toPermissionTemplateResponse(permissionTemplateDto);
-    return Permissions.CreatePermissionTemplateResponse.newBuilder().setPermissionTemplate(permissionTemplateBuilder).build();
+    return WsCreatePermissionTemplateResponse.newBuilder().setPermissionTemplate(permissionTemplateBuilder).build();
   }
 }

server/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java

@@ -38,7 +38,7 @@ import org.sonar.server.permission.PermissionFinder;
 import org.sonar.server.permission.ws.PermissionRequest.Builder;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.Common;
-import org.sonarqube.ws.Permissions;
+import org.sonarqube.ws.Permissions.WsGroupsResponse;
 
 import static com.google.common.base.Objects.firstNonNull;
 import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdminUserByComponentDto;
@@ -89,7 +89,7 @@ public class GroupsAction implements PermissionsWsAction {
       checkProjectAdminUserByComponentDto(userSession, project);
 
       PermissionQuery permissionQuery = buildPermissionQuery(request, project);
-      Permissions.GroupsResponse groupsResponse = buildResponse(permissionQuery, request);
+      WsGroupsResponse groupsResponse = buildResponse(permissionQuery, request);
 
       writeProtobuf(groupsResponse, wsRequest, wsResponse);
     } finally {
@@ -97,12 +97,12 @@ public class GroupsAction implements PermissionsWsAction {
     }
   }
 
-  private Permissions.GroupsResponse buildResponse(PermissionQuery permissionQuery, PermissionRequest permissionRequest) {
+  private WsGroupsResponse buildResponse(PermissionQuery permissionQuery, PermissionRequest permissionRequest) {
     GroupWithPermissionQueryResult groupsResult = permissionFinder.findGroupsWithPermission(permissionQuery);
     List<GroupWithPermission> groupsWithPermission = groupsResult.groups();
 
-    Permissions.GroupsResponse.Builder groupsResponse = Permissions.GroupsResponse.newBuilder();
-    Permissions.GroupsResponse.Group.Builder group = Permissions.GroupsResponse.Group.newBuilder();
+    WsGroupsResponse.Builder groupsResponse = WsGroupsResponse.newBuilder();
+    WsGroupsResponse.Group.Builder group = WsGroupsResponse.Group.newBuilder();
     Common.Paging.Builder paging = Common.Paging.newBuilder();
 
     for (GroupWithPermission groupWithPermission : groupsWithPermission) {

server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java

@@ -31,7 +31,7 @@ import org.sonar.db.permission.PermissionQuery;
 import org.sonar.db.user.GroupMembershipQuery;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.Permissions.Permission;
-import org.sonarqube.ws.Permissions.SearchGlobalPermissionsResponse;
+import org.sonarqube.ws.Permissions.WsSearchGlobalPermissionsResponse;
 
 import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser;
 import static org.sonar.server.ws.WsUtils.writeProtobuf;
@@ -67,15 +67,15 @@ public class SearchGlobalPermissionsAction implements PermissionsWsAction {
 
     DbSession dbSession = dbClient.openSession(false);
     try {
-      SearchGlobalPermissionsResponse response = buildResponse(dbSession);
+      WsSearchGlobalPermissionsResponse response = buildResponse(dbSession);
       writeProtobuf(response, wsRequest, wsResponse);
     } finally {
       dbClient.closeSession(dbSession);
     }
   }
 
-  private SearchGlobalPermissionsResponse buildResponse(DbSession dbSession) {
-    SearchGlobalPermissionsResponse.Builder response = SearchGlobalPermissionsResponse.newBuilder();
+  private WsSearchGlobalPermissionsResponse buildResponse(DbSession dbSession) {
+    WsSearchGlobalPermissionsResponse.Builder response = WsSearchGlobalPermissionsResponse.newBuilder();
     Permission.Builder permission = newBuilder();
 
     for (String permissionKey : GlobalPermissions.ALL) {

server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java

@@ -33,8 +33,8 @@ import org.sonar.db.component.ComponentDto;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.Common;
 import org.sonarqube.ws.Permissions.Permission;
-import org.sonarqube.ws.Permissions.SearchProjectPermissionsResponse;
-import org.sonarqube.ws.Permissions.SearchProjectPermissionsResponse.Project;
+import org.sonarqube.ws.Permissions.WsSearchProjectPermissionsResponse;
+import org.sonarqube.ws.Permissions.WsSearchProjectPermissionsResponse.Project;
 
 import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser;
 import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdminUserByComponentKey;
@@ -79,7 +79,7 @@ public class SearchProjectPermissionsAction implements PermissionsWsAction {
     DbSession dbSession = dbClient.openSession(false);
     try {
       SearchProjectPermissionsData data = dataLoader.load(wsRequest);
-      SearchProjectPermissionsResponse response = buildResponse(data);
+      WsSearchProjectPermissionsResponse response = buildResponse(data);
       writeProtobuf(response, wsRequest, wsResponse);
     } finally {
       dbClient.closeSession(dbSession);
@@ -101,8 +101,8 @@ public class SearchProjectPermissionsAction implements PermissionsWsAction {
     }
   }
 
-  private SearchProjectPermissionsResponse buildResponse(SearchProjectPermissionsData data) {
-    SearchProjectPermissionsResponse.Builder response = SearchProjectPermissionsResponse.newBuilder();
+  private WsSearchProjectPermissionsResponse buildResponse(SearchProjectPermissionsData data) {
+    WsSearchProjectPermissionsResponse.Builder response = WsSearchProjectPermissionsResponse.newBuilder();
     Permission.Builder permissionResponse = Permission.newBuilder();
 
     Project.Builder rootComponentBuilder = Project.newBuilder();

server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchTemplatesAction.java

@@ -31,7 +31,7 @@ import org.sonar.db.permission.PermissionTemplateDto;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.Permissions.Permission;
 import org.sonarqube.ws.Permissions.PermissionTemplate;
-import org.sonarqube.ws.Permissions.SearchTemplatesResponse;
+import org.sonarqube.ws.Permissions.WsSearchTemplatesResponse;
 
 import static org.sonar.api.utils.DateUtils.formatDateTime;
 import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser;
@@ -71,15 +71,15 @@ public class SearchTemplatesAction implements PermissionsWsAction {
     DbSession dbSession = dbClient.openSession(false);
     try {
       SearchTemplatesData data = dataLoader.load(wsRequest);
-      SearchTemplatesResponse response = buildResponse(data);
+      WsSearchTemplatesResponse response = buildResponse(data);
       writeProtobuf(response, wsRequest, wsResponse);
     } finally {
       dbClient.closeSession(dbSession);
     }
   }
 
-  private SearchTemplatesResponse buildResponse(SearchTemplatesData data) {
-    SearchTemplatesResponse.Builder response = SearchTemplatesResponse.newBuilder();
+  private WsSearchTemplatesResponse buildResponse(SearchTemplatesData data) {
+    WsSearchTemplatesResponse.Builder response = WsSearchTemplatesResponse.newBuilder();
     Permission.Builder permissionResponse = Permission.newBuilder();
 
     PermissionTemplate.Builder templateBuilder = PermissionTemplate.newBuilder();

server/sonar-server/src/main/java/org/sonar/server/permission/ws/UpdateTemplateAction.java

@@ -31,7 +31,7 @@ import org.sonar.db.DbSession;
 import org.sonar.db.permission.PermissionTemplateDto;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.Permissions.PermissionTemplate;
-import org.sonarqube.ws.Permissions.UpdatePermissionTemplateResponse;
+import org.sonarqube.ws.Permissions.WsUpdatePermissionTemplateResponse;
 
 import static com.google.common.base.Objects.firstNonNull;
 import static java.lang.String.format;
@@ -98,7 +98,7 @@ public class UpdateTemplateAction implements PermissionsWsAction {
       validateTemplate(dbSession, templateToUpdate);
       PermissionTemplateDto updatedTemplate = updateTemplate(dbSession, templateToUpdate);
 
-      UpdatePermissionTemplateResponse response = buildResponse(updatedTemplate);
+      WsUpdatePermissionTemplateResponse response = buildResponse(updatedTemplate);
       writeProtobuf(response, wsRequest, wsResponse);
     } finally {
       dbClient.closeSession(dbSession);
@@ -125,9 +125,9 @@ public class UpdateTemplateAction implements PermissionsWsAction {
     return dbClient.permissionTemplateDao().update(dbSession, templateToUpdate);
   }
 
-  private static UpdatePermissionTemplateResponse buildResponse(PermissionTemplateDto permissionTemplate) {
+  private static WsUpdatePermissionTemplateResponse buildResponse(PermissionTemplateDto permissionTemplate) {
     PermissionTemplate permissionTemplateBuilder = toPermissionTemplateResponse(permissionTemplate);
-    return UpdatePermissionTemplateResponse.newBuilder().setPermissionTemplate(permissionTemplateBuilder).build();
+    return WsUpdatePermissionTemplateResponse.newBuilder().setPermissionTemplate(permissionTemplateBuilder).build();
   }
 
   private void validateTemplateNameForUpdate(DbSession dbSession, String name, long id) {

server/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java

@@ -37,7 +37,7 @@ import org.sonar.server.permission.UserWithPermissionQueryResult;
 import org.sonar.server.permission.ws.PermissionRequest.Builder;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.Common.Paging;
-import org.sonarqube.ws.Permissions.UsersResponse;
+import org.sonarqube.ws.Permissions.WsUsersResponse;
 
 import static com.google.common.base.Objects.firstNonNull;
 import static com.google.common.base.Strings.nullToEmpty;
@@ -89,20 +89,20 @@ public class UsersAction implements PermissionsWsAction {
       Optional<ComponentDto> project = dependenciesFinder.searchProject(dbSession, request);
       checkProjectAdminUserByComponentDto(userSession, project);
       PermissionQuery permissionQuery = buildPermissionQuery(request, project);
-      UsersResponse usersResponse = usersResponse(permissionQuery, request.page(), request.pageSize());
+      WsUsersResponse wsUsersResponse = wsUsersResponse(permissionQuery, request.page(), request.pageSize());
 
-      writeProtobuf(usersResponse, wsRequest, wsResponse);
+      writeProtobuf(wsUsersResponse, wsRequest, wsResponse);
     } finally {
       dbClient.closeSession(dbSession);
     }
   }
 
-  private UsersResponse usersResponse(PermissionQuery permissionQuery, int page, int pageSize) {
+  private WsUsersResponse wsUsersResponse(PermissionQuery permissionQuery, int page, int pageSize) {
     UserWithPermissionQueryResult usersResult = permissionFinder.findUsersWithPermission(permissionQuery);
     List<UserWithPermission> usersWithPermission = usersResult.users();
 
-    UsersResponse.Builder userResponse = UsersResponse.newBuilder();
-    UsersResponse.User.Builder user = UsersResponse.User.newBuilder();
+    WsUsersResponse.Builder userResponse = WsUsersResponse.newBuilder();
+    WsUsersResponse.User.Builder user = WsUsersResponse.User.newBuilder();
     for (UserWithPermission userWithPermission : usersWithPermission) {
       userResponse.addUsers(
         user

sonar-ws/src/main/protobuf/ws-permissions.proto

@@ -29,7 +29,7 @@ option java_outer_classname = "Permissions";
 option optimize_for = SPEED;
 
 // WS api/permissions/users for internal use only
-message UsersResponse {
+message WsUsersResponse {
 
   message User {
     optional string login = 1;
@@ -43,7 +43,7 @@ message UsersResponse {
 }
 
 // WS api/permissions/groups for internal use only
-message GroupsResponse {
+message WsGroupsResponse {
 
   message Group {
     optional string id = 1;
@@ -64,11 +64,11 @@ message Permission {
   optional int32 groupsCount = 5;
 }
 
-message SearchGlobalPermissionsResponse {
+message WsSearchGlobalPermissionsResponse {
   repeated Permission permissions = 1;
 }
 
-message SearchProjectPermissionsResponse {
+message WsSearchProjectPermissionsResponse {
   message Project {
     optional string id = 1;
     optional string key = 2;
@@ -95,15 +95,15 @@ message PermissionTemplate {
   repeated Permission permissions = 8;
 }
 
-message CreatePermissionTemplateResponse {
+message WsCreatePermissionTemplateResponse {
   optional PermissionTemplate permissionTemplate = 1;
 }
 
-message UpdatePermissionTemplateResponse {
+message WsUpdatePermissionTemplateResponse {
   optional PermissionTemplate permissionTemplate = 1;
 }
 
-message SearchTemplatesResponse {
+message WsSearchTemplatesResponse {
   repeated PermissionTemplate permissionTemplates = 2;
   repeated Permission permissions = 3;
 }