opendev/gerrit
Code Issues Proposed changes

Merge changes from topic "project-cache-groups"

Browse Source 
* changes:
  Make ConfiguredMimeTypes an AutoValue
  Make SubscribeSection an AutoValue
  Make CommentLinkInfoImpl an AutoValue and remove inheritance
  Add a test for checking mergability of a change on other branches
  Allow mutating BranchOrder in project.config and add a test
  Make BranchOrderSection an AutoValue
  Make ValidationError an AutoValue
  Mark Project.NameKey as immutable and thread-safe
  ProjectConfig: Make GroupReference an AutoValue and remove byName map


* submodules:
* Update plugins/singleusergroup from branch 'master'
  to 9eb63345a129533aa88235af3ba9308c53cee1d2
  - Adust to changes in Gerrit core
    
    Change-Id: Ic114e8b4c12a3d9c2474019d16b848ae2243f62f
This commit is contained in:
Patrick Hiesel
2020-07-01 13:42:49 +00:00
committed by Gerrit Code Review
parent 9a8951ddc7 379f3131fa
commit b81656f54d
43 changed files with 623 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImpl.java
View File

@@ -154,7 +154,7 @@ public class ProjectOperationsImpl implements ProjectOperations {
Permission permission =
projectConfig.getAccessSection(p.section(), true).getPermission(p.name(), true);
if (p.group().isPresent()) {
GroupReference group = new GroupReference(p.group().get(), p.group().get().get());
GroupReference group = GroupReference.create(p.group().get(), p.group().get().get());
group = projectConfig.resolve(group);
permission.removeRule(group);
} else {
@@ -325,7 +325,7 @@ public class ProjectOperationsImpl implements ProjectOperations {
}
private static PermissionRule newRule(ProjectConfig project, AccountGroup.UUID groupUUID) {
GroupReference group = new GroupReference(groupUUID, groupUUID.get());
GroupReference group = GroupReference.create(groupUUID, groupUUID.get());
group = project.resolve(group);
return new PermissionRule(group);
}