From: Simon Brandhof Date: Thu, 13 Oct 2016 15:35:00 +0000 (+0200) Subject: SONAR-8134 Rename ProjectRef to ProjectId X-Git-Tag: 6.2-RC1~426 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=658eca81386844ec1d2b3c8f879ff302a6e48de4;p=sonarqube.git SONAR-8134 Rename ProjectRef to ProjectId for consistency with org.sonar.server.usergroups.ws.ProjectId --- 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 6f51ee15b6b..cbb999d2e9f 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 @@ -26,9 +26,9 @@ public class GroupPermissionChange extends PermissionChange { private final GroupIdOrAnyone groupId; - public GroupPermissionChange(Operation operation, String permission, @Nullable ProjectRef projectRef, + public GroupPermissionChange(Operation operation, String permission, @Nullable ProjectId projectId, GroupIdOrAnyone groupId) { - super(operation, groupId.getOrganizationUuid(), permission, projectRef); + super(operation, groupId.getOrganizationUuid(), permission, projectId); this.groupId = groupId; } 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 f2c382a5463..c0f09291e0d 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 @@ -89,7 +89,7 @@ public class GroupPermissionChanger { private void checkAdminUsersExistOutsideTheRemovedGroup(DbSession dbSession, GroupPermissionChange change) { if (GlobalPermissions.SYSTEM_ADMIN.equals(change.getPermission()) && - !change.getProjectRef().isPresent() && + !change.getProjectId().isPresent() && // TODO support organizations dbClient.roleDao().countUserPermissions(dbSession, change.getPermission(), change.getGroupIdOrAnyone().getId()) <= 0) { throw new BadRequestException(String.format("Last group with '%s' permission. Permission cannot be removed.", GlobalPermissions.SYSTEM_ADMIN)); diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionChange.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionChange.java index b109b4c9932..07a372f6320 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionChange.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionChange.java @@ -37,14 +37,14 @@ public abstract class PermissionChange { private final Operation operation; private final String organizationUuid; private final String permission; - private final ProjectRef projectRef; + private final ProjectId projectId; - public PermissionChange(Operation operation, String organizationUuid, String permission, @Nullable ProjectRef projectRef) { + public PermissionChange(Operation operation, String organizationUuid, String permission, @Nullable ProjectId projectId) { this.operation = requireNonNull(operation); this.organizationUuid = requireNonNull(organizationUuid); this.permission = requireNonNull(permission); - this.projectRef = projectRef; - if (projectRef == null) { + this.projectId = projectId; + if (projectId == null) { checkRequest(GlobalPermissions.ALL.contains(permission), "Invalid global permission '%s'. Valid values are %s", permission, GlobalPermissions.ALL); } else { checkRequest(ProjectPermissions.ALL.contains(permission), "Invalid project permission '%s'. Valid values are %s", permission, ProjectPermissions.ALL); @@ -63,23 +63,23 @@ public abstract class PermissionChange { return permission; } - public Optional getProjectRef() { - return Optional.ofNullable(projectRef); + public Optional getProjectId() { + return Optional.ofNullable(projectId); } /** - * Shortcut based on {@link #getProjectRef()} + * Shortcut based on {@link #getProjectId()} */ @CheckForNull public String getProjectUuid() { - return projectRef == null ? null : projectRef.getUuid(); + return projectId == null ? null : projectId.getUuid(); } /** - * Shortcut based on {@link #getProjectRef()} + * Shortcut based on {@link #getProjectId()} */ @CheckForNull public Long getNullableProjectId() { - return projectRef == null ? null : projectRef.getId(); + return projectId == null ? null : projectId.getId(); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java index cd804f44e24..1d110b929da 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java @@ -46,7 +46,7 @@ public class PermissionUpdater { Set projectIds = new HashSet<>(); for (PermissionChange change : changes) { boolean changed = doApply(dbSession, change); - Optional projectId = change.getProjectRef(); + Optional projectId = change.getProjectId(); if (changed && projectId.isPresent()) { projectIds.add(projectId.get().getId()); } 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 new file mode 100644 index 00000000000..a30387a11b5 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ProjectId.java @@ -0,0 +1,55 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.server.permission; + +import javax.annotation.concurrent.Immutable; +import org.sonar.db.component.ComponentDto; + +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 org.sonar.server.permission.ws.WsProjectRef + */ +@Immutable +public class ProjectId { + + private final long id; + private final String uuid; + + public ProjectId(long projectId, String projectUuid) { + this.id = projectId; + this.uuid = requireNonNull(projectUuid); + } + + public ProjectId(ComponentDto dto) { + this(requireNonNull(dto.getId()), dto.uuid()); + } + + public long getId() { + return id; + } + + public String getUuid() { + return uuid; + } +} diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ProjectRef.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ProjectRef.java deleted file mode 100644 index 5c1642abd45..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ProjectRef.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.server.permission; - -import javax.annotation.concurrent.Immutable; -import org.sonar.db.component.ComponentDto; - -import static java.util.Objects.requireNonNull; - -/** - * Reference to a project by its db id or uuid. Temporarily - * as long as permissions do not use only uuids. - */ -@Immutable -public class ProjectRef { - - private final long id; - private final String uuid; - - public ProjectRef(long projectId, String projectUuid) { - this.id = projectId; - this.uuid = requireNonNull(projectUuid); - } - - public ProjectRef(ComponentDto dto) { - this(requireNonNull(dto.getId()), dto.uuid()); - } - - public long getId() { - return id; - } - - public String getUuid() { - return uuid; - } -} diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChange.java b/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChange.java index 9eb3ddad8fa..4fa7014784a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChange.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChange.java @@ -27,9 +27,9 @@ public class UserPermissionChange extends PermissionChange { private final UserId userId; - public UserPermissionChange(Operation operation, String organizationUuid, String permission, @Nullable ProjectRef projectRef, + public UserPermissionChange(Operation operation, String organizationUuid, String permission, @Nullable ProjectId projectId, UserId userId) { - super(operation, organizationUuid, permission, projectRef); + super(operation, organizationUuid, permission, projectId); this.userId = requireNonNull(userId); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChanger.java b/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChanger.java index 41cb61d63ce..bdc0e8f0409 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChanger.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChanger.java @@ -70,7 +70,7 @@ public class UserPermissionChanger { private void checkOtherAdminUsersExist(DbSession session, PermissionChange change) { if (GlobalPermissions.SYSTEM_ADMIN.equals(change.getPermission()) && - !change.getProjectRef().isPresent() && + !change.getProjectId().isPresent() && dbClient.roleDao().countUserPermissions(session, change.getPermission(), null) <= 1) { throw new BadRequestException(String.format("Last user with '%s' permission. Permission cannot be removed.", GlobalPermissions.SYSTEM_ADMIN)); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java index be58720ede0..88461d536e9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java @@ -28,7 +28,7 @@ import org.sonar.db.DbSession; import org.sonar.server.permission.GroupPermissionChange; import org.sonar.server.permission.PermissionChange; import org.sonar.server.permission.PermissionUpdater; -import org.sonar.server.permission.ProjectRef; +import org.sonar.server.permission.ProjectId; import org.sonar.server.usergroups.ws.GroupIdOrAnyone; import static java.util.Arrays.asList; @@ -73,7 +73,7 @@ public class AddGroupAction implements PermissionsWsAction { public void handle(Request request, Response response) throws Exception { try (DbSession dbSession = dbClient.openSession(false)) { GroupIdOrAnyone group = support.findGroup(dbSession, request); - Optional projectId = support.findProject(dbSession, request); + Optional projectId = support.findProject(dbSession, request); PermissionChange change = new GroupPermissionChange( PermissionChange.Operation.ADD, diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserAction.java index f7f99ab6d69..bb189138ad7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserAction.java @@ -28,7 +28,7 @@ import org.sonar.db.DbSession; import org.sonar.db.organization.OrganizationDto; import org.sonar.server.permission.PermissionChange; import org.sonar.server.permission.PermissionUpdater; -import org.sonar.server.permission.ProjectRef; +import org.sonar.server.permission.ProjectId; import org.sonar.server.permission.UserId; import org.sonar.server.permission.UserPermissionChange; @@ -75,7 +75,7 @@ public class AddUserAction implements PermissionsWsAction { public void handle(Request request, Response response) throws Exception { try (DbSession dbSession = dbClient.openSession(false)) { UserId user = support.findUser(dbSession, request.mandatoryParam(PARAM_USER_LOGIN)); - Optional projectId = support.findProject(dbSession, request); + Optional projectId = support.findProject(dbSession, request); OrganizationDto org = support.findOrganization(dbSession, request.param(PARAM_ORGANIZATION_KEY)); PermissionChange change = new UserPermissionChange( PermissionChange.Operation.ADD, diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java index 02835924d13..0b404748673 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java @@ -37,7 +37,7 @@ import org.sonar.db.DbSession; import org.sonar.db.permission.GroupPermissionDto; import org.sonar.db.permission.PermissionQuery; import org.sonar.db.user.GroupDto; -import org.sonar.server.permission.ProjectRef; +import org.sonar.server.permission.ProjectId; import org.sonar.server.user.UserSession; import org.sonarqube.ws.WsPermissions.Group; import org.sonarqube.ws.WsPermissions.WsGroupsResponse; @@ -86,7 +86,7 @@ public class GroupsAction implements PermissionsWsAction { @Override public void handle(Request request, Response response) throws Exception { try (DbSession dbSession = dbClient.openSession(false)) { - Optional projectId = support.findProject(dbSession, request); + Optional projectId = support.findProject(dbSession, request); checkProjectAdminUserByComponentUuid(userSession, projectId.isPresent() ? projectId.get().getUuid() : null); PermissionQuery query = buildPermissionQuery(request, projectId); @@ -100,7 +100,7 @@ public class GroupsAction implements PermissionsWsAction { } } - private static PermissionQuery buildPermissionQuery(Request request, Optional project) { + private static PermissionQuery buildPermissionQuery(Request request, Optional project) { String textQuery = request.param(Param.TEXT_QUERY); PermissionQuery.Builder permissionQuery = PermissionQuery.builder() .setPermission(request.param(PARAM_PERMISSION)) @@ -151,7 +151,7 @@ public class GroupsAction implements PermissionsWsAction { return Ordering.explicit(orderedNames).onResultOf(GroupDto::getName).immutableSortedCopy(groups); } - private List findGroupPermissions(DbSession dbSession, List groups, Optional project) { + private List findGroupPermissions(DbSession dbSession, List groups, Optional project) { if (groups.isEmpty()) { return emptyList(); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionWsSupport.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionWsSupport.java index b47c604e89a..7fad14f64c0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionWsSupport.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionWsSupport.java @@ -30,7 +30,7 @@ import org.sonar.db.organization.OrganizationDto; import org.sonar.db.permission.template.PermissionTemplateDto; import org.sonar.db.user.UserDto; import org.sonar.server.component.ComponentFinder; -import org.sonar.server.permission.ProjectRef; +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; @@ -64,12 +64,12 @@ public class PermissionWsSupport { /** * @throws org.sonar.server.exceptions.NotFoundException if a project does not exist */ - public ProjectRef findProject(DbSession dbSession, WsProjectRef ref) { + public ProjectId findProject(DbSession dbSession, WsProjectRef ref) { ComponentDto project = componentFinder.getRootComponentOrModuleByUuidOrKey(dbSession, ref.uuid(), ref.key(), resourceTypes); - return new ProjectRef(project.getId(), project.uuid()); + return new ProjectId(project.getId(), project.uuid()); } - public Optional findProject(DbSession dbSession, Request request) { + public Optional findProject(DbSession dbSession, Request request) { String uuid = request.param(PermissionsWsParameters.PARAM_PROJECT_ID); String key = request.param(PermissionsWsParameters.PARAM_PROJECT_KEY); if (uuid != null || key != null) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java index 308effa61ed..e45c817deb9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java @@ -28,7 +28,7 @@ import org.sonar.db.DbSession; import org.sonar.server.permission.GroupPermissionChange; import org.sonar.server.permission.PermissionChange; import org.sonar.server.permission.PermissionUpdater; -import org.sonar.server.permission.ProjectRef; +import org.sonar.server.permission.ProjectId; import org.sonar.server.usergroups.ws.GroupIdOrAnyone; import static java.util.Arrays.asList; @@ -73,7 +73,7 @@ public class RemoveGroupAction implements PermissionsWsAction { public void handle(Request request, Response response) throws Exception { try (DbSession dbSession = dbClient.openSession(false)) { GroupIdOrAnyone group = support.findGroup(dbSession, request); - Optional projectId = support.findProject(dbSession, request); + Optional projectId = support.findProject(dbSession, request); PermissionChange change = new GroupPermissionChange( PermissionChange.Operation.REMOVE, diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java index a2d41b27444..8ec84d1fac8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java @@ -28,7 +28,7 @@ import org.sonar.db.DbSession; import org.sonar.db.organization.OrganizationDto; import org.sonar.server.permission.PermissionChange; import org.sonar.server.permission.PermissionUpdater; -import org.sonar.server.permission.ProjectRef; +import org.sonar.server.permission.ProjectId; import org.sonar.server.permission.UserId; import org.sonar.server.permission.UserPermissionChange; @@ -75,7 +75,7 @@ public class RemoveUserAction implements PermissionsWsAction { public void handle(Request request, Response response) throws Exception { try (DbSession dbSession = dbClient.openSession(false)) { UserId user = support.findUser(dbSession, request.mandatoryParam(PARAM_USER_LOGIN)); - Optional projectId = support.findProject(dbSession, request); + Optional projectId = support.findProject(dbSession, request); OrganizationDto org = support.findOrganization(dbSession, request.param(PARAM_ORGANIZATION_KEY)); PermissionChange change = new UserPermissionChange( diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java index 944445064c9..3de7d0a7b21 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java @@ -35,7 +35,7 @@ import org.sonar.db.DbSession; import org.sonar.db.permission.ExtendedUserPermissionDto; import org.sonar.db.permission.PermissionQuery; import org.sonar.db.user.UserDto; -import org.sonar.server.permission.ProjectRef; +import org.sonar.server.permission.ProjectId; import org.sonar.server.user.UserSession; import org.sonarqube.ws.WsPermissions; import org.sonarqube.ws.WsPermissions.UsersWsResponse; @@ -89,7 +89,7 @@ public class UsersAction implements PermissionsWsAction { @Override public void handle(Request request, Response response) throws Exception { try (DbSession dbSession = dbClient.openSession(false)) { - Optional projectId = support.findProject(dbSession, request); + Optional projectId = support.findProject(dbSession, request); checkProjectAdminUserByComponentUuid(userSession, projectId.isPresent() ? projectId.get().getUuid() : null); PermissionQuery query = buildPermissionQuery(request, projectId); @@ -102,7 +102,7 @@ public class UsersAction implements PermissionsWsAction { } } - private static PermissionQuery buildPermissionQuery(Request request, Optional project) { + private static PermissionQuery buildPermissionQuery(Request request, Optional project) { String textQuery = request.param(Param.TEXT_QUERY); String permission = request.param(PARAM_PERMISSION); PermissionQuery.Builder permissionQuery = PermissionQuery.builder() @@ -161,7 +161,7 @@ public class UsersAction implements PermissionsWsAction { return Ordering.explicit(orderedLogins).onResultOf(UserDto::getLogin).immutableSortedCopy(dbClient.userDao().selectByLogins(dbSession, orderedLogins)); } - private List findUserPermissions(DbSession dbSession, List users, Optional project) { + private List findUserPermissions(DbSession dbSession, List users, Optional project) { if (users.isEmpty()) { return emptyList(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceMediumTest.java index e8619298990..c80cea48b40 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceMediumTest.java @@ -49,7 +49,7 @@ import org.sonar.server.issue.index.IssueIndexer; import org.sonar.server.permission.GroupPermissionChange; import org.sonar.server.permission.PermissionChange; import org.sonar.server.permission.PermissionUpdater; -import org.sonar.server.permission.ProjectRef; +import org.sonar.server.permission.ProjectId; import org.sonar.server.tester.ServerTester; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.user.UserSession; @@ -101,7 +101,7 @@ public class IssueBulkChangeServiceMediumTest { userSessionRule.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); // TODO correctly feed default organization. Not a problem as long as issues search does not support "anyone" // for each organization - GroupPermissionChange permissionChange = new GroupPermissionChange(PermissionChange.Operation.ADD, UserRole.USER, new ProjectRef(project), GroupIdOrAnyone.forAnyone("TODO")); + GroupPermissionChange permissionChange = new GroupPermissionChange(PermissionChange.Operation.ADD, UserRole.USER, new ProjectId(project), GroupIdOrAnyone.forAnyone("TODO")); tester.get(PermissionUpdater.class).apply(session, asList(permissionChange)); userSession = userSessionRule.login("john") diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceMediumTest.java index 94aa534f330..40272299207 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceMediumTest.java @@ -48,7 +48,7 @@ import org.sonar.server.issue.index.IssueIndexer; import org.sonar.server.permission.GroupPermissionChange; import org.sonar.server.permission.PermissionChange; import org.sonar.server.permission.PermissionUpdater; -import org.sonar.server.permission.ProjectRef; +import org.sonar.server.permission.ProjectId; import org.sonar.server.tester.ServerTester; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.usergroups.ws.GroupIdOrAnyone; @@ -95,7 +95,7 @@ public class IssueCommentServiceMediumTest { userSessionRule.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); // TODO correctly feed default organization. Not a problem as long as issues search does not support "anyone" // for each organization - GroupPermissionChange permissionChange = new GroupPermissionChange(PermissionChange.Operation.ADD, UserRole.USER, new ProjectRef(project), GroupIdOrAnyone.forAnyone("TODO")); + GroupPermissionChange permissionChange = new GroupPermissionChange(PermissionChange.Operation.ADD, UserRole.USER, new ProjectId(project), GroupIdOrAnyone.forAnyone("TODO")); tester.get(PermissionUpdater.class).apply(session, asList(permissionChange)); userSessionRule.login("gandalf"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java index 6eef148051d..f0b605833d7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java @@ -51,7 +51,7 @@ import org.sonar.server.issue.workflow.Transition; import org.sonar.server.permission.GroupPermissionChange; import org.sonar.server.permission.PermissionChange; import org.sonar.server.permission.PermissionUpdater; -import org.sonar.server.permission.ProjectRef; +import org.sonar.server.permission.ProjectId; import org.sonar.server.rule.index.RuleIndexer; import org.sonar.server.tester.ServerTester; import org.sonar.server.tester.UserSessionRule; @@ -340,7 +340,7 @@ public class IssueServiceMediumTest { // project can be seen by group "anyone" // TODO correctly feed default organization. Not a problem as long as issues search does not support "anyone" // for each organization - GroupPermissionChange permissionChange = new GroupPermissionChange(PermissionChange.Operation.ADD, UserRole.USER, new ProjectRef(project), GroupIdOrAnyone.forAnyone("TODO")); + GroupPermissionChange permissionChange = new GroupPermissionChange(PermissionChange.Operation.ADD, UserRole.USER, new ProjectId(project), GroupIdOrAnyone.forAnyone("TODO")); tester.get(PermissionUpdater.class).apply(session, asList(permissionChange)); userSessionRule.login(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java index 16c766ad428..1379e73366c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java @@ -45,7 +45,7 @@ import org.sonar.server.issue.index.IssueIndexer; import org.sonar.server.permission.GroupPermissionChange; import org.sonar.server.permission.PermissionChange; import org.sonar.server.permission.PermissionUpdater; -import org.sonar.server.permission.ProjectRef; +import org.sonar.server.permission.ProjectId; import org.sonar.server.tester.ServerTester; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.usergroups.ws.GroupIdOrAnyone; @@ -655,7 +655,7 @@ public class SearchActionComponentsMediumTest { userSessionRule.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); // TODO correctly feed default organization. Not a problem as long as issues search does not support "anyone" // for each organization - GroupPermissionChange permissionChange = new GroupPermissionChange(PermissionChange.Operation.ADD, permission, new ProjectRef(project), GroupIdOrAnyone.forAnyone("TODO")); + GroupPermissionChange permissionChange = new GroupPermissionChange(PermissionChange.Operation.ADD, permission, new ProjectId(project), GroupIdOrAnyone.forAnyone("TODO")); tester.get(PermissionUpdater.class).apply(session, asList(permissionChange)); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java index 9a8c375901f..6f64b9e9d2a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java @@ -49,7 +49,7 @@ import org.sonar.server.issue.index.IssueIndexer; import org.sonar.server.permission.GroupPermissionChange; import org.sonar.server.permission.PermissionChange; import org.sonar.server.permission.PermissionUpdater; -import org.sonar.server.permission.ProjectRef; +import org.sonar.server.permission.ProjectId; import org.sonar.server.search.QueryContext; import org.sonar.server.tester.ServerTester; import org.sonar.server.tester.UserSessionRule; @@ -650,7 +650,7 @@ public class SearchActionMediumTest { userSessionRule.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); // TODO correctly feed default organization. Not a problem as long as issues search does not support "anyone" // for each organization - GroupPermissionChange permissionChange = new GroupPermissionChange(PermissionChange.Operation.ADD, UserRole.USER, new ProjectRef(project), GroupIdOrAnyone.forAnyone("TODO")); + GroupPermissionChange permissionChange = new GroupPermissionChange(PermissionChange.Operation.ADD, UserRole.USER, new ProjectId(project), GroupIdOrAnyone.forAnyone("TODO")); tester.get(PermissionUpdater.class).apply(session, asList(permissionChange)); } 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 d3fcf478c80..09dc5971f43 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 @@ -77,7 +77,7 @@ public class GroupPermissionChangerTest { GroupIdOrAnyone groupId = new GroupIdOrAnyone(group); loginAsAdmin(); - apply(new GroupPermissionChange(PermissionChange.Operation.ADD, UserRole.ISSUE_ADMIN, new ProjectRef(project), groupId)); + apply(new GroupPermissionChange(PermissionChange.Operation.ADD, UserRole.ISSUE_ADMIN, new ProjectId(project), groupId)); assertThat(db.users().selectGroupPermissions(group, null)).isEmpty(); assertThat(db.users().selectGroupPermissions(group, project)).containsOnly(UserRole.ISSUE_ADMIN); @@ -99,7 +99,7 @@ public class GroupPermissionChangerTest { GroupIdOrAnyone groupId = new GroupIdOrAnyone(db.getDefaultOrganization().getUuid(), null); loginAsAdmin(); - apply(new GroupPermissionChange(PermissionChange.Operation.ADD, UserRole.ISSUE_ADMIN, new ProjectRef(project), groupId)); + apply(new GroupPermissionChange(PermissionChange.Operation.ADD, UserRole.ISSUE_ADMIN, new ProjectId(project), groupId)); assertThat(db.users().selectAnyonePermissions(null)).isEmpty(); assertThat(db.users().selectAnyonePermissions(project)).containsOnly(UserRole.ISSUE_ADMIN); @@ -112,7 +112,7 @@ public class GroupPermissionChangerTest { expectedException.expect(ForbiddenException.class); userSession.login("a_guy"); - underTest.apply(db.getSession(), new GroupPermissionChange(PermissionChange.Operation.ADD, UserRole.ISSUE_ADMIN, new ProjectRef(project), groupId)); + underTest.apply(db.getSession(), new GroupPermissionChange(PermissionChange.Operation.ADD, UserRole.ISSUE_ADMIN, new ProjectId(project), groupId)); } @Test @@ -134,7 +134,7 @@ public class GroupPermissionChangerTest { expectedException.expectMessage("Invalid project permission 'gateadmin'. Valid values are [admin, codeviewer, issueadmin, scan, user]"); loginAsAdmin(); - apply(new GroupPermissionChange(PermissionChange.Operation.ADD, GlobalPermissions.QUALITY_GATE_ADMIN, new ProjectRef(project), groupId)); + apply(new GroupPermissionChange(PermissionChange.Operation.ADD, GlobalPermissions.QUALITY_GATE_ADMIN, new ProjectId(project), groupId)); } @Test @@ -168,7 +168,7 @@ public class GroupPermissionChangerTest { db.users().insertProjectPermissionOnGroup(group, UserRole.CODEVIEWER, project); loginAsAdmin(); - apply(new GroupPermissionChange(PermissionChange.Operation.REMOVE, UserRole.ISSUE_ADMIN, new ProjectRef(project), groupId)); + apply(new GroupPermissionChange(PermissionChange.Operation.REMOVE, UserRole.ISSUE_ADMIN, new ProjectId(project), groupId)); assertThat(db.users().selectGroupPermissions(group, null)).containsOnly(GlobalPermissions.QUALITY_GATE_ADMIN); assertThat(db.users().selectGroupPermissions(group, project)).containsOnly(UserRole.CODEVIEWER); @@ -179,7 +179,7 @@ public class GroupPermissionChangerTest { GroupIdOrAnyone groupId = new GroupIdOrAnyone(group); loginAsAdmin(); - apply(new GroupPermissionChange(PermissionChange.Operation.REMOVE, UserRole.ISSUE_ADMIN, new ProjectRef(project), groupId)); + apply(new GroupPermissionChange(PermissionChange.Operation.REMOVE, UserRole.ISSUE_ADMIN, new ProjectId(project), groupId)); assertThat(db.users().selectGroupPermissions(group, null)).isEmpty(); assertThat(db.users().selectGroupPermissions(group, project)).isEmpty(); @@ -192,7 +192,7 @@ public class GroupPermissionChangerTest { expectedException.expect(ForbiddenException.class); userSession.login("a_guy"); - underTest.apply(db.getSession(), new GroupPermissionChange(PermissionChange.Operation.REMOVE, UserRole.ISSUE_ADMIN, new ProjectRef(project), groupId)); + underTest.apply(db.getSession(), new GroupPermissionChange(PermissionChange.Operation.REMOVE, UserRole.ISSUE_ADMIN, new ProjectId(project), groupId)); } @Test