mirrors
/
sonarqube
mirror of https://github.com/SonarSource/sonarqube.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 237 Wiki Activity
Browse Source

Move OrganizationPermission to sonar-db-dao

tags/6.4-RC1
Simon Brandhof 7 years ago
parent
77c74b5dcd
commit
b15e5e7a05
100 changed files with 111 additions and 109 deletions
Split View Show Diff Stats
  1. 1
    1
      server/sonar-ce/src/main/java/org/sonar/ce/user/CeUserSession.java
  2. 1
    1
      server/sonar-db-dao/src/main/java/org/sonar/db/permission/OrganizationPermission.java
  3. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java
  4. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskAction.java
  5. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/computation/queue/ReportSubmitter.java
  6. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/organization/ws/DeleteAction.java
  7. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/organization/ws/EnableSupportAction.java
  8. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchMyOrganizationsAction.java
  9. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/organization/ws/UpdateAction.java
  10. 1
    0
      server/sonar-server/src/main/java/org/sonar/server/permission/PermissionPrivilegeChecker.java
  11. 1
    0
      server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java
  12. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java
  13. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/project/ws/CreateAction.java
  14. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java
  15. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java
  16. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java
  17. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchAction.java
  18. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java
  19. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java
  20. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java
  21. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateConditionAction.java
  22. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SelectAction.java
  23. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/UpdateConditionAction.java
  24. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectOperations.java
  25. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java
  26. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsSupport.java
  27. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java
  28. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleWsSupport.java
  29. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsSupport.java
  30. 3
    3
      server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentAction.java
  31. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/ui/ws/OrganizationAction.java
  32. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/user/AbstractUserSession.java
  33. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java
  34. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java
  35. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java
  36. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java
  37. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java
  38. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java
  39. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java
  40. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/CreateAction.java
  41. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java
  42. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java
  43. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java
  44. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UpdateAction.java
  45. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java
  46. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderTest.java
  47. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java
  48. 2
    2
      server/sonar-server/src/test/java/org/sonar/server/computation/queue/ReportSubmitterTest.java
  49. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java
  50. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java
  51. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/organization/ws/UpdateActionTest.java
  52. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java
  53. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java
  54. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateActionTest.java
  55. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java
  56. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java
  57. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/CreateTemplateActionTest.java
  58. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DeleteTemplateActionTest.java
  59. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateActionTest.java
  60. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesActionTest.java
  61. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/TemplateUsersActionTest.java
  62. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/UpdateTemplateActionTest.java
  63. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java
  64. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/project/ws/CreateActionTest.java
  65. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java
  66. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java
  67. 2
    2
      server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java
  68. 2
    2
      server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchActionTest.java
  69. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/AppActionTest.java
  70. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateActionTest.java
  71. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java
  72. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/DeselectActionTest.java
  73. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/SelectActionTest.java
  74. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java
  75. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java
  76. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/AddProjectActionTest.java
  77. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionMediumTest.java
  78. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java
  79. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java
  80. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java
  81. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java
  82. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java
  83. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java
  84. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java
  85. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java
  86. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java
  87. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java
  88. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java
  89. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java
  90. 2
    2
      server/sonar-server/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java
  91. 2
    2
      server/sonar-server/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java
  92. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java
  93. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java
  94. 3
    3
      server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentActionTest.java
  95. 2
    2
      server/sonar-server/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java
  96. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java
  97. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/user/TestUserSessionFactory.java
  98. 3
    3
      server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java
  99. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java
  100. 0
    0
      server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java

+ 1
- 1
server/sonar-ce/src/main/java/org/sonar/ce/user/CeUserSession.java View File

@@ -23,7 +23,7 @@ import java.util.Collection;
import org.sonar.db.component.ComponentDto;
import org.sonar.db.organization.OrganizationDto;
import org.sonar.db.user.GroupDto;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;

/**

server/sonar-server/src/main/java/org/sonar/server/permission/OrganizationPermission.java → server/sonar-db-dao/src/main/java/org/sonar/db/permission/OrganizationPermission.java View File

@@ -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;
package org.sonar.db.permission;

public enum OrganizationPermission {


+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java View File

@@ -38,7 +38,7 @@ import org.sonar.scanner.protocol.input.FileData;
import org.sonar.scanner.protocol.input.ProjectRepositories;
import org.sonar.server.exceptions.BadRequestException;
import org.sonar.server.exceptions.ForbiddenException;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;

import static com.google.common.collect.Lists.newArrayList;

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskAction.java View File

@@ -38,7 +38,7 @@ import org.sonar.db.DbSession;
import org.sonar.db.ce.CeActivityDto;
import org.sonar.db.ce.CeQueueDto;
import org.sonar.db.component.ComponentDto;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;
import org.sonar.server.ws.WsUtils;
import org.sonarqube.ws.WsCe;

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/computation/queue/ReportSubmitter.java View File

@@ -37,7 +37,7 @@ import org.sonar.db.organization.OrganizationDto;
import org.sonar.server.component.ComponentUpdater;
import org.sonar.server.component.NewComponent;
import org.sonar.server.exceptions.NotFoundException;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.permission.PermissionTemplateService;
import org.sonar.server.user.UserSession;


+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/organization/ws/DeleteAction.java View File

@@ -35,7 +35,7 @@ import org.sonar.server.user.UserSession;

import static com.google.common.base.Preconditions.checkArgument;
import static org.sonar.server.organization.ws.OrganizationsWsSupport.PARAM_KEY;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.server.ws.WsUtils.checkFoundWithOptional;

public class DeleteAction implements OrganizationsAction {

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/organization/ws/EnableSupportAction.java View File

@@ -26,7 +26,7 @@ import org.sonar.db.DbClient;
import org.sonar.db.DbSession;
import org.sonar.server.organization.DefaultOrganizationProvider;
import org.sonar.server.organization.OrganizationFlags;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;

import static java.util.Objects.requireNonNull;

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchMyOrganizationsAction.java View File

@@ -25,7 +25,7 @@ import org.sonar.api.server.ws.WebService;
import org.sonar.api.utils.text.JsonWriter;
import org.sonar.db.DbClient;
import org.sonar.db.DbSession;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;

public class SearchMyOrganizationsAction implements OrganizationsAction {

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/organization/ws/UpdateAction.java View File

@@ -39,7 +39,7 @@ import static org.sonar.server.organization.ws.OrganizationsWsSupport.PARAM_DESC
import static org.sonar.server.organization.ws.OrganizationsWsSupport.PARAM_KEY;
import static org.sonar.server.organization.ws.OrganizationsWsSupport.PARAM_NAME;
import static org.sonar.server.organization.ws.OrganizationsWsSupport.PARAM_URL;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.server.ws.WsUtils.writeProtobuf;

public class UpdateAction implements OrganizationsAction {

+ 1
- 0
server/sonar-server/src/main/java/org/sonar/server/permission/PermissionPrivilegeChecker.java View File

@@ -21,6 +21,7 @@ package org.sonar.server.permission;

import java.util.Optional;
import org.sonar.api.web.UserRole;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;

import static org.sonar.server.user.AbstractUserSession.insufficientPrivilegesException;

+ 1
- 0
server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java View File

@@ -37,6 +37,7 @@ import org.sonar.db.DbSession;
import org.sonar.db.component.ComponentDto;
import org.sonar.db.organization.DefaultTemplates;
import org.sonar.db.permission.GroupPermissionDto;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.db.permission.UserPermissionDto;
import org.sonar.db.permission.template.PermissionTemplateCharacteristicDto;
import org.sonar.db.permission.template.PermissionTemplateDto;

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java View File

@@ -32,7 +32,7 @@ import org.sonar.db.organization.OrganizationDto;
import org.sonar.server.component.ComponentCleanerService;
import org.sonar.server.user.UserSession;

import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.server.ws.KeyExamples.KEY_PROJECT_EXAMPLE_001;

public class BulkDeleteAction implements ProjectsWsAction {

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/project/ws/CreateAction.java View File

@@ -36,7 +36,7 @@ import org.sonarqube.ws.client.project.CreateRequest;
import static java.util.Optional.ofNullable;
import static org.sonar.api.resources.Qualifiers.PROJECT;
import static org.sonar.server.component.NewComponent.newComponentBuilder;
import static org.sonar.server.permission.OrganizationPermission.PROVISION_PROJECTS;
import static org.sonar.db.permission.OrganizationPermission.PROVISION_PROJECTS;
import static org.sonar.server.project.ws.ProjectsWsSupport.PARAM_ORGANIZATION;
import static org.sonar.server.ws.KeyExamples.KEY_PROJECT_EXAMPLE_001;
import static org.sonar.server.ws.WsUtils.writeProtobuf;

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java View File

@@ -28,7 +28,7 @@ import org.sonar.db.DbSession;
import org.sonar.db.component.ComponentDto;
import org.sonar.server.component.ComponentCleanerService;
import org.sonar.server.component.ComponentFinder;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;

import static org.sonar.server.component.ComponentFinder.ParamNames.PROJECT_ID_AND_PROJECT;

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java View File

@@ -39,7 +39,7 @@ import org.sonar.server.user.UserSession;

import static com.google.common.collect.Sets.newHashSet;
import static org.sonar.server.es.SearchOptions.MAX_LIMIT;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.server.ws.WsUtils.checkFoundWithOptional;

public class GhostsAction implements ProjectsWsAction {

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java View File

@@ -40,7 +40,7 @@ import org.sonar.server.user.UserSession;

import static com.google.common.collect.Sets.newHashSet;
import static org.sonar.server.es.SearchOptions.MAX_LIMIT;
import static org.sonar.server.permission.OrganizationPermission.PROVISION_PROJECTS;
import static org.sonar.db.permission.OrganizationPermission.PROVISION_PROJECTS;
import static org.sonar.server.project.ws.ProjectsWsSupport.PARAM_ORGANIZATION;

public class ProvisionedAction implements ProjectsWsAction {

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/project/ws/SearchAction.java View File

@@ -31,7 +31,7 @@ import org.sonar.db.component.ComponentDto;
import org.sonar.db.component.ComponentQuery;
import org.sonar.db.organization.OrganizationDto;
import org.sonar.server.organization.DefaultOrganizationProvider;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;
import org.sonarqube.ws.WsProjects.SearchWsResponse;
import org.sonarqube.ws.client.project.SearchWsRequest;

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java View File

@@ -41,7 +41,7 @@ import org.sonar.server.exceptions.BadRequestException;
import org.sonar.server.exceptions.Errors;
import org.sonar.server.exceptions.Message;
import org.sonar.server.exceptions.NotFoundException;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;
import org.sonar.server.util.Validation;


+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java View File

@@ -28,7 +28,7 @@ import org.sonar.db.DbClient;
import org.sonar.db.DbSession;
import org.sonar.db.metric.MetricDto;
import org.sonar.server.organization.DefaultOrganizationProvider;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;
import org.sonarqube.ws.WsQualityGates.AppWsResponse.Metric;


+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java View File

@@ -26,7 +26,7 @@ import org.sonar.db.DbClient;
import org.sonar.db.DbSession;
import org.sonar.db.qualitygate.QualityGateDto;
import org.sonar.server.organization.DefaultOrganizationProvider;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.qualitygate.QualityGateUpdater;
import org.sonar.server.user.UserSession;
import org.sonarqube.ws.WsQualityGates.CreateWsResponse;

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateConditionAction.java View File

@@ -26,7 +26,7 @@ import org.sonar.db.DbClient;
import org.sonar.db.DbSession;
import org.sonar.db.qualitygate.QualityGateConditionDto;
import org.sonar.server.organization.DefaultOrganizationProvider;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.qualitygate.QualityGateConditionsUpdater;
import org.sonar.server.user.UserSession;
import org.sonarqube.ws.WsQualityGates.CreateConditionWsResponse;

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SelectAction.java View File

@@ -32,7 +32,7 @@ import org.sonar.db.component.ComponentDto;
import org.sonar.db.property.PropertyDto;
import org.sonar.server.component.ComponentFinder;
import org.sonar.server.component.ComponentFinder.ParamNames;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;
import org.sonarqube.ws.client.qualitygate.SelectWsRequest;


+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/UpdateConditionAction.java View File

@@ -32,7 +32,7 @@ import org.sonarqube.ws.WsQualityGates.UpdateConditionWsResponse;
import org.sonarqube.ws.client.qualitygate.UpdateConditionRequest;

import static org.sonar.core.util.Protobuf.setNullable;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
import static org.sonar.server.qualitygate.ws.QualityGatesWs.addConditionParams;
import static org.sonar.server.ws.WsUtils.writeProtobuf;
import static org.sonarqube.ws.client.qualitygate.QualityGatesWsParameters.ACTION_UPDATE_CONDITION;

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectOperations.java View File

@@ -26,7 +26,7 @@ import org.sonar.db.DbSession;
import org.sonar.db.component.ComponentDto;
import org.sonar.db.qualityprofile.QualityProfileDto;
import org.sonar.server.exceptions.ForbiddenException;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;
import org.sonar.server.ws.WsUtils;


+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java View File

@@ -31,7 +31,7 @@ import org.sonar.server.qualityprofile.index.ActiveRuleIndexer;
import org.sonar.server.rule.index.RuleQuery;
import org.sonar.server.user.UserSession;

import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;

@ServerSide
public class QProfileService {

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsSupport.java View File

@@ -23,7 +23,7 @@ import org.sonar.api.server.ServerSide;
import org.sonar.server.organization.DefaultOrganizationProvider;
import org.sonar.server.user.UserSession;

import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;

@ServerSide
public class QProfileWsSupport {

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java View File

@@ -32,7 +32,7 @@ import org.sonar.db.DbClient;
import org.sonar.db.DbSession;
import org.sonar.db.qualityprofile.QualityProfileDto;
import org.sonar.server.organization.DefaultOrganizationProvider;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;

public class AppAction implements RulesWsAction {

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleWsSupport.java View File

@@ -23,7 +23,7 @@ import org.sonar.api.server.ServerSide;
import org.sonar.server.organization.DefaultOrganizationProvider;
import org.sonar.server.user.UserSession;

import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;

@ServerSide
public class RuleWsSupport {

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsSupport.java View File

@@ -26,7 +26,7 @@ import org.sonar.api.config.PropertyDefinition;
import org.sonar.api.server.ServerSide;
import org.sonar.db.component.ComponentDto;
import org.sonar.server.organization.DefaultOrganizationProvider;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;

import static org.sonar.api.PropertyType.LICENSE;

+ 3
- 3
server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentAction.java View File

@@ -50,7 +50,7 @@ import org.sonar.db.property.PropertyDto;
import org.sonar.db.property.PropertyQuery;
import org.sonar.db.qualitygate.QualityGateDto;
import org.sonar.server.component.ComponentFinder;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.qualitygate.QualityGateFinder;
import org.sonar.server.qualityprofile.QPMeasureData;
import org.sonar.server.qualityprofile.QualityProfile;
@@ -60,8 +60,8 @@ import org.sonar.server.user.UserSession;
import static org.sonar.api.measures.CoreMetrics.QUALITY_PROFILES_KEY;
import static org.sonar.api.web.UserRole.ADMIN;
import static org.sonar.api.web.UserRole.USER;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.server.user.AbstractUserSession.insufficientPrivilegesException;
import static org.sonar.server.ws.KeyExamples.KEY_PROJECT_EXAMPLE_001;


+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/ui/ws/OrganizationAction.java View File

@@ -27,7 +27,7 @@ import org.sonar.db.DbClient;
import org.sonar.db.DbSession;
import org.sonar.db.organization.OrganizationDto;
import org.sonar.server.organization.DefaultOrganizationProvider;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;

import static org.sonar.server.ws.WsUtils.checkFoundWithOptional;

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/user/AbstractUserSession.java View File

@@ -24,7 +24,7 @@ import org.sonar.db.component.ComponentDto;
import org.sonar.db.organization.OrganizationDto;
import org.sonar.server.exceptions.ForbiddenException;
import org.sonar.server.exceptions.UnauthorizedException;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;

public abstract class AbstractUserSession implements UserSession {
private static final String INSUFFICIENT_PRIVILEGES_MESSAGE = "Insufficient privileges";

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java View File

@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Optional;
import org.sonar.db.user.GroupDto;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;

/**
* Allow code to be executed with the highest privileges possible, as if executed by a {@link OrganizationPermission#ADMINISTER} account.

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java View File

@@ -37,7 +37,7 @@ import org.sonar.db.user.GroupDto;
import org.sonar.db.user.UserDto;
import org.sonar.server.organization.DefaultOrganizationProvider;
import org.sonar.server.organization.OrganizationFlags;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;

import static com.google.common.collect.Maps.newHashMap;


+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java View File

@@ -25,7 +25,7 @@ import org.sonar.db.component.ComponentDto;
import org.sonar.db.organization.OrganizationDto;
import org.sonar.db.user.GroupDto;
import org.sonar.server.exceptions.UnauthorizedException;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;

/**
* Part of the current HTTP session

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java View File

@@ -24,7 +24,7 @@ import javax.annotation.CheckForNull;
import org.sonar.db.component.ComponentDto;
import org.sonar.db.organization.OrganizationDto;
import org.sonar.db.user.GroupDto;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;

public interface UserSession {


+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java View File

@@ -30,7 +30,7 @@ import org.sonar.db.DbClient;
import org.sonar.db.DbSession;
import org.sonar.db.user.UserDto;
import org.sonar.server.organization.DefaultOrganizationProvider;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;

import static com.google.common.base.Strings.isNullOrEmpty;

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java View File

@@ -35,7 +35,7 @@ import org.sonar.db.organization.OrganizationDto;
import org.sonar.db.user.UserDto;
import org.sonar.server.exceptions.BadRequestException;
import org.sonar.server.organization.DefaultOrganizationProvider;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;
import org.sonar.server.user.index.UserIndexer;


+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java View File

@@ -30,7 +30,7 @@ import org.sonar.db.user.UserGroupDto;
import org.sonar.server.user.UserSession;

import static java.lang.String.format;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.server.usergroups.ws.GroupWsSupport.PARAM_GROUP_ID;
import static org.sonar.server.usergroups.ws.GroupWsSupport.PARAM_GROUP_NAME;
import static org.sonar.server.usergroups.ws.GroupWsSupport.PARAM_LOGIN;

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/CreateAction.java View File

@@ -32,7 +32,7 @@ import org.sonar.server.user.UserSession;
import org.sonarqube.ws.WsUserGroups;

import static org.sonar.api.user.UserGroupValidation.GROUP_NAME_MAX_LENGTH;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.server.usergroups.ws.GroupWsSupport.DESCRIPTION_MAX_LENGTH;
import static org.sonar.server.usergroups.ws.GroupWsSupport.PARAM_GROUP_DESCRIPTION;
import static org.sonar.server.usergroups.ws.GroupWsSupport.PARAM_GROUP_NAME;

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java View File

@@ -30,7 +30,7 @@ import org.sonar.db.DbClient;
import org.sonar.db.DbSession;
import org.sonar.db.user.GroupDto;
import org.sonar.server.organization.DefaultOrganizationProvider;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;

import static com.google.common.base.Preconditions.checkArgument;

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java View File

@@ -27,7 +27,7 @@ import org.sonar.db.DbClient;
import org.sonar.db.DbSession;
import org.sonar.db.user.UserDto;
import org.sonar.server.exceptions.BadRequestException;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;

import static java.lang.String.format;

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java View File

@@ -40,7 +40,7 @@ import org.sonar.server.user.UserSession;

import static org.apache.commons.lang.StringUtils.defaultIfBlank;
import static org.sonar.server.es.SearchOptions.MAX_LIMIT;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.server.usergroups.ws.GroupWsSupport.PARAM_ORGANIZATION_KEY;

public class SearchAction implements UserGroupsWsAction {

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UpdateAction.java View File

@@ -39,7 +39,7 @@ import org.sonarqube.ws.WsUserGroups;

import static org.sonar.api.CoreProperties.CORE_DEFAULT_GROUP;
import static org.sonar.api.user.UserGroupValidation.GROUP_NAME_MAX_LENGTH;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.server.usergroups.ws.GroupWsSupport.DESCRIPTION_MAX_LENGTH;
import static org.sonar.server.usergroups.ws.GroupWsSupport.PARAM_GROUP_DESCRIPTION;
import static org.sonar.server.usergroups.ws.GroupWsSupport.PARAM_GROUP_ID;

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java View File

@@ -33,7 +33,7 @@ import org.sonar.db.DbSession;
import org.sonar.db.user.GroupMembershipQuery;
import org.sonar.db.user.UserMembershipDto;
import org.sonar.db.user.UserMembershipQuery;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.UserSession;

import static org.sonar.api.utils.Paging.forPageIndex;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderTest.java View File

@@ -42,7 +42,7 @@ import org.sonar.server.tester.UserSessionRule;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import static org.sonar.server.permission.OrganizationPermission.SCAN;
import static org.sonar.db.permission.OrganizationPermission.SCAN;

public class ProjectDataLoaderTest {
@Rule

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java View File

@@ -43,7 +43,7 @@ import org.sonarqube.ws.WsCe;

import static java.util.Collections.singleton;
import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.server.permission.OrganizationPermission.SCAN;
import static org.sonar.db.permission.OrganizationPermission.SCAN;
import static org.sonarqube.ws.MediaTypes.PROTOBUF;

public class TaskActionTest {

+ 2
- 2
server/sonar-server/src/test/java/org/sonar/server/computation/queue/ReportSubmitterTest.java View File

@@ -57,8 +57,8 @@ import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import static org.sonar.core.permission.GlobalPermissions.SCAN_EXECUTION;
import static org.sonar.db.component.ComponentTesting.newProjectDto;
import static org.sonar.server.permission.OrganizationPermission.PROVISION_PROJECTS;
import static org.sonar.server.permission.OrganizationPermission.SCAN;
import static org.sonar.db.permission.OrganizationPermission.PROVISION_PROJECTS;
import static org.sonar.db.permission.OrganizationPermission.SCAN;

public class ReportSubmitterTest {


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java View File

@@ -50,7 +50,7 @@ import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.sonar.server.organization.ws.OrganizationsWsSupport.PARAM_KEY;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;

public class DeleteActionTest {


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java View File

@@ -37,7 +37,7 @@ import org.sonar.server.ws.TestResponse;
import org.sonar.server.ws.WsActionTester;

import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;

public class EnableSupportActionTest {


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/organization/ws/UpdateActionTest.java View File

@@ -44,7 +44,7 @@ import static org.mockito.Mockito.when;
import static org.sonar.server.organization.ws.OrganizationsWsTestSupport.STRING_257_CHARS_LONG;
import static org.sonar.server.organization.ws.OrganizationsWsTestSupport.STRING_65_CHARS_LONG;
import static org.sonar.server.organization.ws.OrganizationsWsTestSupport.setParam;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;

public class UpdateActionTest {
private static final String SOME_KEY = "key";

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java View File

@@ -36,7 +36,7 @@ import static org.sonar.core.permission.GlobalPermissions.PROVISIONING;
import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN;
import static org.sonar.db.component.ComponentTesting.newProjectDto;
import static org.sonar.db.component.ComponentTesting.newView;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_GROUP_ID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_GROUP_NAME;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_ORGANIZATION;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java View File

@@ -42,7 +42,7 @@ import org.sonar.server.ws.WsActionTester;

import static org.mockito.Mockito.mock;
import static org.sonar.db.permission.template.PermissionTemplateTesting.newPermissionTemplateDto;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;

public abstract class BasePermissionWsTest<A extends PermissionsWsAction> {


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateActionTest.java View File

@@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import static org.sonar.core.permission.GlobalPermissions.QUALITY_GATE_ADMIN;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java View File

@@ -36,7 +36,7 @@ import org.sonar.server.ws.TestRequest;
import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.api.web.UserRole.CODEVIEWER;
import static org.sonar.api.web.UserRole.ISSUE_ADMIN;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_USER_LOGIN;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java View File

@@ -41,7 +41,7 @@ import org.sonar.server.ws.TestResponse;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PROJECT_ID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PROJECT_KEY;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/CreateTemplateActionTest.java View File

@@ -31,7 +31,7 @@ import org.sonar.server.ws.TestRequest;
import org.sonar.server.ws.TestResponse;

import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.test.JsonAssert.assertJson;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_DESCRIPTION;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_NAME;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DeleteTemplateActionTest.java View File

@@ -53,7 +53,7 @@ import org.sonar.server.ws.WsActionTester;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_ORGANIZATION;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateActionTest.java View File

@@ -37,7 +37,7 @@ import org.sonar.server.ws.TestRequest;
import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.api.security.DefaultGroups.ANYONE;
import static org.sonar.api.web.UserRole.CODEVIEWER;
import static org.sonar.server.permission.OrganizationPermission.SCAN;
import static org.sonar.db.permission.OrganizationPermission.SCAN;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_GROUP_ID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_GROUP_NAME;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesActionTest.java View File

@@ -46,7 +46,7 @@ import static org.sonar.api.server.ws.WebService.Param.TEXT_QUERY;
import static org.sonar.core.util.Uuids.UUID_EXAMPLE_01;
import static org.sonar.core.util.Uuids.UUID_EXAMPLE_02;
import static org.sonar.db.permission.template.PermissionTemplateTesting.newPermissionTemplateDto;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.test.JsonAssert.assertJson;

public class SearchTemplatesActionTest extends BasePermissionWsTest<SearchTemplatesAction> {

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/TemplateUsersActionTest.java View File

@@ -42,7 +42,7 @@ import static org.sonar.api.web.UserRole.ISSUE_ADMIN;
import static org.sonar.api.web.UserRole.USER;
import static org.sonar.db.permission.template.PermissionTemplateTesting.newPermissionTemplateUserDto;
import static org.sonar.db.user.UserTesting.newUserDto;
import static org.sonar.server.permission.OrganizationPermission.SCAN;
import static org.sonar.db.permission.OrganizationPermission.SCAN;
import static org.sonar.test.JsonAssert.assertJson;
import static org.sonarqube.ws.MediaTypes.PROTOBUF;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/UpdateTemplateActionTest.java View File

@@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import static org.sonar.db.permission.template.PermissionTemplateTesting.newPermissionTemplateDto;
import static org.sonar.server.permission.OrganizationPermission.SCAN;
import static org.sonar.db.permission.OrganizationPermission.SCAN;
import static org.sonar.test.JsonAssert.assertJson;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_DESCRIPTION;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_ID;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java View File

@@ -42,7 +42,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;

public class BulkDeleteActionTest {


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/project/ws/CreateActionTest.java View File

@@ -53,7 +53,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.sonar.core.util.Protobuf.setNullable;
import static org.sonar.server.permission.OrganizationPermission.PROVISION_PROJECTS;
import static org.sonar.db.permission.OrganizationPermission.PROVISION_PROJECTS;
import static org.sonar.server.project.ws.ProjectsWsSupport.PARAM_ORGANIZATION;
import static org.sonar.test.JsonAssert.assertJson;
import static org.sonarqube.ws.client.WsRequest.Method.POST;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java View File

@@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonarqube.ws.client.project.ProjectsWsParameters.CONTROLLER;
import static org.sonarqube.ws.client.project.ProjectsWsParameters.PARAM_PROJECT;
import static org.sonarqube.ws.client.project.ProjectsWsParameters.PARAM_PROJECT_ID;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java View File

@@ -47,7 +47,7 @@ import org.sonar.server.ws.WsActionTester;
import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.db.component.SnapshotDto.STATUS_PROCESSED;
import static org.sonar.db.component.SnapshotDto.STATUS_UNPROCESSED;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.test.JsonAssert.assertJson;

public class GhostsActionTest {

+ 2
- 2
server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java View File

@@ -43,8 +43,8 @@ import org.sonar.server.ws.TestResponse;
import org.sonar.server.ws.WsActionTester;

import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.server.permission.OrganizationPermission.PROVISION_PROJECTS;
import static org.sonar.server.permission.OrganizationPermission.SCAN;
import static org.sonar.db.permission.OrganizationPermission.PROVISION_PROJECTS;
import static org.sonar.db.permission.OrganizationPermission.SCAN;
import static org.sonar.test.JsonAssert.assertJson;

public class ProvisionedActionTest {

+ 2
- 2
server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchActionTest.java View File

@@ -58,8 +58,8 @@ import static org.sonar.db.component.ComponentTesting.newFileDto;
import static org.sonar.db.component.ComponentTesting.newModuleDto;
import static org.sonar.db.component.ComponentTesting.newProjectDto;
import static org.sonar.db.component.ComponentTesting.newView;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.test.JsonAssert.assertJson;
import static org.sonarqube.ws.MediaTypes.PROTOBUF;
import static org.sonarqube.ws.client.project.ProjectsWsParameters.PARAM_ORGANIZATION;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/AppActionTest.java View File

@@ -44,7 +44,7 @@ import static org.sonar.api.measures.Metric.ValueType.INT;
import static org.sonar.api.measures.Metric.ValueType.RATING;
import static org.sonar.api.measures.Metric.ValueType.WORK_DUR;
import static org.sonar.db.metric.MetricTesting.newMetricDto;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
import static org.sonar.test.JsonAssert.assertJson;
import static org.sonarqube.ws.MediaTypes.JSON;


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateActionTest.java View File

@@ -40,7 +40,7 @@ import org.sonarqube.ws.MediaTypes;
import org.sonarqube.ws.WsQualityGates.CreateWsResponse;

import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;

public class CreateActionTest {


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java View File

@@ -49,7 +49,7 @@ import org.sonarqube.ws.WsQualityGates.CreateConditionWsResponse;
import static org.assertj.core.api.Java6Assertions.assertThat;
import static org.sonar.db.metric.MetricTesting.newMetricDto;
import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.PERCENT;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
import static org.sonarqube.ws.client.qualitygate.QualityGatesWsParameters.PARAM_ERROR;
import static org.sonarqube.ws.client.qualitygate.QualityGatesWsParameters.PARAM_GATE_ID;
import static org.sonarqube.ws.client.qualitygate.QualityGatesWsParameters.PARAM_METRIC;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/DeselectActionTest.java View File

@@ -41,7 +41,7 @@ import org.sonar.server.ws.WsActionTester;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.server.qualitygate.QualityGates.SONAR_QUALITYGATE_PROPERTY;

public class DeselectActionTest {

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/SelectActionTest.java View File

@@ -37,7 +37,7 @@ import org.sonar.server.tester.UserSessionRule;
import org.sonar.server.ws.WsActionTester;

import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
import static org.sonar.server.qualitygate.QualityGates.SONAR_QUALITYGATE_PROPERTY;

public class SelectActionTest {

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java View File

@@ -49,7 +49,7 @@ import org.sonarqube.ws.WsQualityGates.CreateConditionWsResponse;
import static org.assertj.core.api.Java6Assertions.assertThat;
import static org.sonar.db.metric.MetricTesting.newMetricDto;
import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.PERCENT;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
import static org.sonarqube.ws.client.qualitygate.QualityGatesWsParameters.PARAM_ERROR;
import static org.sonarqube.ws.client.qualitygate.QualityGatesWsParameters.PARAM_ID;
import static org.sonarqube.ws.client.qualitygate.QualityGatesWsParameters.PARAM_METRIC;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java View File

@@ -53,7 +53,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.db.rule.RuleTesting.newXooX1;
import static org.sonar.db.rule.RuleTesting.newXooX2;
import static org.sonar.db.rule.RuleTesting.newXooX3;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.server.qualityprofile.QProfileTesting.XOO_P1_KEY;
import static org.sonar.server.qualityprofile.QProfileTesting.XOO_P2_KEY;


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/AddProjectActionTest.java View File

@@ -41,7 +41,7 @@ import org.sonar.server.ws.TestRequest;
import org.sonar.server.ws.WsActionTester;

import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.server.qualityprofile.QProfileTesting.newQProfileDto;

public class AddProjectActionTest {

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionMediumTest.java View File

@@ -50,7 +50,7 @@ import org.sonar.server.tester.UserSessionRule;
import org.sonar.server.ws.WsTester;

import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;

public class ChangeParentActionMediumTest {


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java View File

@@ -39,7 +39,7 @@ import org.sonar.server.ws.WsTester;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;

@RunWith(MockitoJUnitRunner.class)
public class CopyActionTest {

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java View File

@@ -62,7 +62,7 @@ import org.sonarqube.ws.MediaTypes;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.sonar.server.language.LanguageTesting.newLanguages;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonarqube.ws.QualityProfiles.CreateWsResponse;
import static org.sonarqube.ws.QualityProfiles.CreateWsResponse.QualityProfile;
import static org.sonarqube.ws.QualityProfiles.CreateWsResponse.parseFrom;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java View File

@@ -47,7 +47,7 @@ import org.sonar.server.ws.WsTester;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;

public class DeleteActionTest {


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java View File

@@ -39,7 +39,7 @@ import org.sonar.server.ws.WsTester;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;

public class RenameActionTest {


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java View File

@@ -44,7 +44,7 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;

@RunWith(MockitoJUnitRunner.class)
public class RestoreActionTest {

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java View File

@@ -36,7 +36,7 @@ import org.sonar.server.ws.WsActionTester;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;

public class RestoreBuiltInActionTest {


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java View File

@@ -41,7 +41,7 @@ import org.sonar.server.ws.WsTester;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;

public class SetDefaultActionTest {


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java View File

@@ -59,7 +59,7 @@ import org.sonar.server.tester.UserSessionRule;

import static com.google.common.collect.Sets.newHashSet;
import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;

// TODO remaining tests should be moved to RegisterRulesTest
public class RegisterRulesMediumTest {

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java View File

@@ -40,7 +40,7 @@ import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;

public class AppActionTest {


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java View File

@@ -33,7 +33,7 @@ import org.sonar.server.ws.WsTester;

import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;

public class DeleteActionTest {


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java View File

@@ -52,7 +52,7 @@ import org.sonar.server.ws.WsTester;

import static com.google.common.collect.Sets.newHashSet;
import static org.sonar.api.rule.Severity.MINOR;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;

public class ShowActionMediumTest {


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java View File

@@ -46,7 +46,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import static org.sonar.api.server.debt.DebtRemediationFunction.Type.LINEAR;
import static org.sonar.api.server.debt.DebtRemediationFunction.Type.LINEAR_OFFSET;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.server.rule.ws.UpdateAction.PARAM_REMEDIATION_FN_BASE_EFFORT;
import static org.sonar.server.rule.ws.UpdateAction.PARAM_REMEDIATION_FN_GAP_MULTIPLIER;
import static org.sonar.server.rule.ws.UpdateAction.PARAM_REMEDIATION_FN_TYPE;

+ 2
- 2
server/sonar-server/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java View File

@@ -57,8 +57,8 @@ import static org.sonar.api.web.UserRole.ADMIN;
import static org.sonar.api.web.UserRole.CODEVIEWER;
import static org.sonar.api.web.UserRole.USER;
import static org.sonar.db.component.ComponentTesting.newProjectDto;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.server.permission.OrganizationPermission.SCAN;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.SCAN;
import static org.sonarqube.ws.MediaTypes.JSON;
import static org.sonarqube.ws.Settings.Definition.CategoryOneOfCase.CATEGORYONEOF_NOT_SET;
import static org.sonarqube.ws.Settings.Definition.DefaultValueOneOfCase.DEFAULTVALUEONEOF_NOT_SET;

+ 2
- 2
server/sonar-server/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java View File

@@ -71,8 +71,8 @@ import static org.sonar.db.component.ComponentTesting.newModuleDto;
import static org.sonar.db.component.ComponentTesting.newProjectDto;
import static org.sonar.db.property.PropertyTesting.newComponentPropertyDto;
import static org.sonar.db.property.PropertyTesting.newGlobalPropertyDto;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.server.permission.OrganizationPermission.SCAN;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.SCAN;
import static org.sonarqube.ws.MediaTypes.JSON;
import static org.sonarqube.ws.Settings.Setting.ParentValueOneOfCase.PARENTVALUEONEOF_NOT_SET;


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java View File

@@ -23,7 +23,7 @@ import com.google.common.collect.HashMultimap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.AbstractUserSession;

import static com.google.common.collect.Lists.newArrayList;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java View File

@@ -30,7 +30,7 @@ import org.sonar.db.component.ComponentDto;
import org.sonar.db.organization.OrganizationDto;
import org.sonar.db.user.GroupDto;
import org.sonar.db.user.UserDto;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.user.ThreadLocalUserSession;
import org.sonar.server.user.UserSession;


+ 3
- 3
server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentActionTest.java View File

@@ -51,7 +51,7 @@ import org.sonar.db.user.UserDto;
import org.sonar.server.component.ComponentFinder;
import org.sonar.server.exceptions.ForbiddenException;
import org.sonar.server.exceptions.NotFoundException;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;
import org.sonar.server.qualitygate.QualityGateFinder;
import org.sonar.server.qualityprofile.QPMeasureData;
import org.sonar.server.qualityprofile.QualityProfile;
@@ -72,8 +72,8 @@ import static org.sonar.db.component.ComponentTesting.newProjectDto;
import static org.sonar.db.component.SnapshotTesting.newAnalysis;
import static org.sonar.db.measure.MeasureTesting.newMeasureDto;
import static org.sonar.db.metric.MetricTesting.newMetricDto;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.test.JsonAssert.assertJson;

public class ComponentActionTest {

+ 2
- 2
server/sonar-server/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java View File

@@ -36,8 +36,8 @@ import org.sonar.server.ws.TestResponse;
import org.sonar.server.ws.WsActionTester;

import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.server.permission.OrganizationPermission.PROVISION_PROJECTS;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.PROVISION_PROJECTS;
import static org.sonar.test.JsonAssert.assertJson;

public class OrganizationActionTest {

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java View File

@@ -36,7 +36,7 @@ import org.sonar.db.user.UserDto;
import org.sonar.server.exceptions.ForbiddenException;
import org.sonar.server.organization.TestDefaultOrganizationProvider;
import org.sonar.server.organization.TestOrganizationFlags;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;

import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.core.permission.GlobalPermissions.PROVISIONING;

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/user/TestUserSessionFactory.java View File

@@ -24,7 +24,7 @@ import java.util.Optional;
import javax.annotation.Nullable;
import org.sonar.db.user.GroupDto;
import org.sonar.db.user.UserDto;
import org.sonar.server.permission.OrganizationPermission;
import org.sonar.db.permission.OrganizationPermission;

import static java.util.Objects.requireNonNull;


+ 3
- 3
server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java View File

@@ -36,9 +36,9 @@ import org.sonar.server.ws.WsActionTester;
import static com.google.common.collect.Lists.newArrayList;
import static org.sonar.db.user.GroupTesting.newGroupDto;
import static org.sonar.db.user.UserTesting.newUserDto;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.server.permission.OrganizationPermission.SCAN;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
import static org.sonar.db.permission.OrganizationPermission.SCAN;
import static org.sonar.test.JsonAssert.assertJson;

public class CurrentActionTest {

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java View File

@@ -39,7 +39,7 @@ import org.sonar.server.tester.UserSessionRule;
import org.sonar.server.ws.WsTester;

import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.server.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
import static org.sonar.server.usergroups.ws.GroupWsSupport.PARAM_GROUP_NAME;
import static org.sonar.server.usergroups.ws.GroupWsSupport.PARAM_LOGIN;
import static org.sonar.server.usergroups.ws.GroupWsSupport.PARAM_ORGANIZATION_KEY;

+ 0
- 0
server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java View File


Some files were not shown because too many files changed in this diff

Write Preview
Loading…
Cancel
Save