From 55326bd49358d537ba343c89fe29ff1c721ff203 Mon Sep 17 00:00:00 2001 From: Patrick Hiesel Date: Thu, 7 Sep 2017 16:07:34 +0200 Subject: [PATCH] Add #getName() and #getNameKey() to ProjectState This commit adds #getName() and #getNameKey() to ProjectState and migrates callers to spare calling #getProject() in many places. Change-Id: I124d370b47723ff3fc7d5bc51a697890a16ab01c --- .../google/gerrit/server/ApprovalCopier.java | 2 +- .../gerrit/server/ReviewerRecommender.java | 5 ++--- .../gerrit/server/change/CherryPickCommit.java | 4 ++-- .../gerrit/server/change/FileContentUtil.java | 2 +- .../google/gerrit/server/change/GetDiff.java | 2 +- .../gerrit/server/git/MergeOpRepoManager.java | 2 +- .../gerrit/server/git/VisibleRefFilter.java | 6 +++--- .../server/git/strategy/SubmitStrategyOp.java | 2 +- .../server/git/validators/MergeValidators.java | 4 ++-- .../gerrit/server/mail/send/CommentSender.java | 6 ++---- .../gerrit/server/mail/send/ProjectWatch.java | 2 +- .../server/project/ChildProjectResource.java | 2 +- .../server/project/CommitIncludedIn.java | 2 +- .../server/project/CommitsCollection.java | 4 ++-- .../gerrit/server/project/ConfigInfoImpl.java | 2 +- .../gerrit/server/project/FileResource.java | 2 +- .../gerrit/server/project/GetChildProject.java | 2 +- .../server/project/ListChildProjects.java | 4 ++-- .../gerrit/server/project/ListDashboards.java | 8 +++----- .../gerrit/server/project/ListProjects.java | 11 +++++------ .../gerrit/server/project/ProjectControl.java | 3 +-- .../project/ProjectHierarchyIterator.java | 2 +- .../gerrit/server/project/ProjectState.java | 18 +++++++++++++----- .../gerrit/server/project/PutConfig.java | 4 ++-- .../gerrit/server/project/SetParent.java | 7 +++---- .../server/project/SubmitRuleEvaluator.java | 9 ++++----- .../query/change/ParentProjectPredicate.java | 2 +- .../google/gerrit/sshd/AbstractGitCommand.java | 3 +-- .../gerrit/sshd/commands/AdminSetParent.java | 2 +- 29 files changed, 61 insertions(+), 63 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalCopier.java b/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalCopier.java index 5e2f045734..538c7c2a1a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalCopier.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalCopier.java @@ -184,7 +184,7 @@ public class ApprovalCopier { ChangeKind kind = changeKindCache.getChangeKind( - project.getProject().getNameKey(), + project.getNameKey(), rw, repoConfig, ObjectId.fromString(priorPs.getRevision().get()), diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ReviewerRecommender.java b/gerrit-server/src/main/java/com/google/gerrit/server/ReviewerRecommender.java index e9152d02ea..9bd7783a11 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ReviewerRecommender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ReviewerRecommender.java @@ -135,7 +135,7 @@ public class ReviewerRecommender { .getProvider() .get() .suggestReviewers( - projectState.getProject().getNameKey(), + projectState.getNameKey(), changeNotes.getChangeId(), query, reviewerScores.keySet())); @@ -239,8 +239,7 @@ public class ReviewerRecommender { List> predicates = new ArrayList<>(); for (Account.Id id : candidates) { try { - Predicate projectQuery = - changeQueryBuilder.project(projectState.getProject().getName()); + Predicate projectQuery = changeQueryBuilder.project(projectState.getName()); // Get all labels for this project and create a compound OR query to // fetch all changes where users have applied one of these labels diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickCommit.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickCommit.java index a3927b5d06..0444e0a82e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickCommit.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickCommit.java @@ -76,7 +76,7 @@ public class CherryPickCommit input.message = message.isEmpty() ? commit.getFullMessage() : message; String destination = Strings.nullToEmpty(input.destination).trim(); input.parent = input.parent == null ? 1 : input.parent; - Project.NameKey projectName = rsrc.getProjectState().getProject().getNameKey(); + Project.NameKey projectName = rsrc.getProjectState().getNameKey(); if (destination.isEmpty()) { throw new BadRequestException("destination must be non-empty"); @@ -99,7 +99,7 @@ public class CherryPickCommit projectName, commit, input, - new Branch.NameKey(rsrc.getProjectState().getProject().getNameKey(), refName)); + new Branch.NameKey(rsrc.getProjectState().getNameKey(), refName)); return json.noOptions().format(projectName, cherryPickedChangeId); } catch (InvalidChangeOperationException e) { throw new BadRequestException(e.getMessage()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java index 181505d873..ff5fb0b764 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java @@ -315,6 +315,6 @@ public class FileContentUtil { private Repository openRepository(ProjectState project) throws RepositoryNotFoundException, IOException { - return repoManager.openRepository(project.getProject().getNameKey()); + return repoManager.openRepository(project.getNameKey()); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java index 1ac5a88f24..eec318b8c9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java @@ -218,7 +218,7 @@ public class GetDiff implements RestReadView { List links = webLinks.getDiffLinks( - state.getProject().getName(), + state.getName(), resource.getPatchKey().getParentKey().getParentKey().get(), basePatchSet != null ? basePatchSet.getId().get() : null, revA, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOpRepoManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOpRepoManager.java index e7303e8c32..29b2548f47 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOpRepoManager.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOpRepoManager.java @@ -95,7 +95,7 @@ public class MergeOpRepoManager implements AutoCloseable { } Project.NameKey getProjectName() { - return project.getProject().getNameKey(); + return project.getNameKey(); } public CodeReviewRevWalk getCodeReviewRevWalk() { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/VisibleRefFilter.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/VisibleRefFilter.java index 724151198a..9d7dd19e89 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/VisibleRefFilter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/VisibleRefFilter.java @@ -188,7 +188,7 @@ public class VisibleRefFilter extends AbstractAdvertiseRefsHook { if (!deferredTags.isEmpty() && (!result.isEmpty() || filterTagsSeparately)) { TagMatcher tags = tagCache - .get(projectState.getProject().getNameKey()) + .get(projectState.getNameKey()) .matcher( tagCache, git, @@ -268,7 +268,7 @@ public class VisibleRefFilter extends AbstractAdvertiseRefsHook { } private Map visibleChangesBySearch() { - Project.NameKey project = projectState.getProject().getNameKey(); + Project.NameKey project = projectState.getNameKey(); try { Map visibleChanges = new HashMap<>(); for (ChangeData cd : changeCache.getChangeData(db.get(), project)) { @@ -286,7 +286,7 @@ public class VisibleRefFilter extends AbstractAdvertiseRefsHook { } private Map visibleChangesByScan() { - Project.NameKey p = projectState.getProject().getNameKey(); + Project.NameKey p = projectState.getNameKey(); Stream s; try { s = changeNotesFactory.scan(git, db.get(), p); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyOp.java index 561a0d3114..affa9183c9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyOp.java @@ -526,7 +526,7 @@ abstract class SubmitStrategyOp implements BatchUpdateOp { try (Repository git = args.repoManager.openRepository(getProject())) { git.setGitwebDescription(p.getProject().getDescription()); } catch (IOException e) { - log.error("cannot update description of " + p.getProject().getName(), e); + log.error("cannot update description of " + p.getName(), e); } } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java index fd524b4af1..51e47a0605 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java @@ -145,7 +145,7 @@ public class MergeValidators { if (RefNames.REFS_CONFIG.equals(destBranch.get())) { final Project.NameKey newParent; try { - ProjectConfig cfg = new ProjectConfig(destProject.getProject().getNameKey()); + ProjectConfig cfg = new ProjectConfig(destProject.getNameKey()); cfg.load(repo, commit); newParent = cfg.getProject().getParent(allProjectsName); final Project.NameKey oldParent = destProject.getProject().getParent(allProjectsName); @@ -256,7 +256,7 @@ public class MergeValidators { IdentifiedUser caller) throws MergeValidationException { Account.Id accountId = Account.Id.fromRef(destBranch.get()); - if (!allUsersName.equals(destProject.getProject().getNameKey()) || accountId == null) { + if (!allUsersName.equals(destProject.getNameKey()) || accountId == null) { return; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/CommentSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/CommentSender.java index 7d83c5cf89..2d1fc56817 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/CommentSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/CommentSender.java @@ -258,9 +258,7 @@ public class CommentSender extends ReplyToChangeSender { log.warn( String.format( "Cannot load %s from %s in %s", - c.key.filename, - patchList.getNewId().name(), - projectState.getProject().getName()), + c.key.filename, patchList.getNewId().name(), projectState.getName()), e); currentGroup.fileData = null; } @@ -586,7 +584,7 @@ public class CommentSender extends ReplyToChangeSender { private Repository getRepository() { try { - return args.server.openRepository(projectState.getProject().getNameKey()); + return args.server.openRepository(projectState.getNameKey()); } catch (IOException e) { return null; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ProjectWatch.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ProjectWatch.java index d1434bc6d7..e1b6e36a65 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ProjectWatch.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ProjectWatch.java @@ -103,7 +103,7 @@ public class ProjectWatch { } catch (QueryParseException e) { log.warn( "Project {} has invalid notify {} filter \"{}\": {}", - state.getProject().getName(), + state.getName(), nc.getName(), nc.getFilter(), e.getMessage()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChildProjectResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChildProjectResource.java index edd3fb646d..b372b38126 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChildProjectResource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChildProjectResource.java @@ -41,6 +41,6 @@ public class ChildProjectResource implements RestResource { public boolean isDirectChild() { ProjectState firstParent = Iterables.getFirst(child.parents(), null); - return firstParent != null && parent.getNameKey().equals(firstParent.getProject().getNameKey()); + return firstParent != null && parent.getNameKey().equals(firstParent.getNameKey()); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CommitIncludedIn.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/CommitIncludedIn.java index 3152e973e4..5b36916ceb 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/CommitIncludedIn.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/CommitIncludedIn.java @@ -38,7 +38,7 @@ class CommitIncludedIn implements RestReadView { public IncludedInInfo apply(CommitResource rsrc) throws RestApiException, OrmException, IOException { RevCommit commit = rsrc.getCommit(); - Project.NameKey project = rsrc.getProjectState().getProject().getNameKey(); + Project.NameKey project = rsrc.getProjectState().getNameKey(); return includedIn.apply(project, commit.getId().getName()); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CommitsCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/CommitsCollection.java index e38f4423dd..a504a1fb6d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/CommitsCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/CommitsCollection.java @@ -101,7 +101,7 @@ public class CommitsCollection implements ChildCollection { if (recursive || rsrc.isDirectChild()) { return json.format(rsrc.getChild().getProject()); } - throw new ResourceNotFoundException(rsrc.getChild().getProject().getName()); + throw new ResourceNotFoundException(rsrc.getChild().getName()); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListChildProjects.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListChildProjects.java index 23a4417fe9..e5fe37d999 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListChildProjects.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListChildProjects.java @@ -77,7 +77,7 @@ public class ListChildProjects implements RestReadView { for (Project.NameKey name : projectCache.all()) { ProjectState c = projectCache.get(name); if (c != null && parent.equals(c.getProject().getParent(allProjects))) { - children.put(c.getProject().getNameKey(), c.getProject()); + children.put(c.getNameKey(), c.getProject()); } } return permissionBackend @@ -105,7 +105,7 @@ public class ListChildProjects implements RestReadView { for (Project.NameKey name : projectCache.all()) { ProjectState c = projectCache.get(name); if (c != null) { - projects.put(c.getProject().getNameKey(), c.getProject()); + projects.put(c.getNameKey(), c.getProject()); } } return projects; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListDashboards.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListDashboards.java index e1d6c14519..f81e84b2e4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListDashboards.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListDashboards.java @@ -93,7 +93,7 @@ class ListDashboards implements RestReadView { private Collection tree(ProjectResource rsrc) throws PermissionBackendException { Map tree = new LinkedHashMap<>(); for (ProjectState ps : rsrc.getProjectState().tree()) { - tree.put(ps.getProject().getNameKey(), ps); + tree.put(ps.getNameKey(), ps); } tree.keySet() .retainAll(permissionBackend.user(user).filter(ProjectPermission.ACCESS, tree.keySet())); @@ -102,10 +102,8 @@ class ListDashboards implements RestReadView { private List scan(ProjectState state, String project, boolean setDefault) throws ResourceNotFoundException, IOException, PermissionBackendException { - Project.NameKey projectName = state.getProject().getNameKey(); - PermissionBackend.ForProject perm = - permissionBackend.user(user).project(state.getProject().getNameKey()); - try (Repository git = gitManager.openRepository(projectName); + PermissionBackend.ForProject perm = permissionBackend.user(user).project(state.getNameKey()); + try (Repository git = gitManager.openRepository(state.getNameKey()); RevWalk rw = new RevWalk(git)) { List all = new ArrayList<>(); for (Ref ref : git.getRefDatabase().getRefs(REFS_DASHBOARDS).values()) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java index a284d7de62..522aa89b97 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java @@ -373,12 +373,12 @@ public class ListProjects implements RestReadView { ProjectState parent = Iterables.getFirst(e.parents(), null); if (parent != null) { if (isParentAccessible(accessibleParents, perm, parent)) { - info.parent = parent.getProject().getName(); + info.parent = parent.getName(); } else { - info.parent = hiddenNames.get(parent.getProject().getName()); + info.parent = hiddenNames.get(parent.getName()); if (info.parent == null) { info.parent = "?-" + (hiddenNames.size() + 1); - hiddenNames.put(parent.getProject().getName(), info.parent); + hiddenNames.put(parent.getName(), info.parent); } } } @@ -506,8 +506,7 @@ public class ListProjects implements RestReadView { } else { log.warn( String.format( - "parent project %s of project %s not found", - parent.get(), ps.getProject().getName())); + "parent project %s of project %s not found", parent.get(), ps.getName())); } } } @@ -518,7 +517,7 @@ public class ListProjects implements RestReadView { private boolean isParentAccessible( Map checked, PermissionBackend.WithUser perm, ProjectState p) throws PermissionBackendException { - Project.NameKey name = p.getProject().getNameKey(); + Project.NameKey name = p.getNameKey(); Boolean b = checked.get(name); if (b == null) { try { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java index 2011cd571f..a3bee39b8d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java @@ -274,8 +274,7 @@ public class ProjectControl { if (!canPerformOnAnyRef(Permission.PUSH) && !canPerformOnAnyRef(Permission.CREATE_TAG) && !isOwner()) { - String pName = state.getProject().getName(); - return new Capable("Upload denied for project '" + pName + "'"); + return new Capable("Upload denied for project '" + state.getName() + "'"); } if (state.isUseContributorAgreements()) { return verifyActiveContributorAgreement(); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectHierarchyIterator.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectHierarchyIterator.java index 9d9e5bbb35..ac8d5363a5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectHierarchyIterator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectHierarchyIterator.java @@ -44,7 +44,7 @@ class ProjectHierarchyIterator implements Iterator { allProjectsName = all; seen = Sets.newLinkedHashSet(); - seen.add(firstResult.getProject().getNameKey()); + seen.add(firstResult.getNameKey()); next = firstResult; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java index d4c344b3b6..72e5ee6181 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java @@ -180,7 +180,7 @@ public class ProjectState { } private boolean isRevisionOutOfDate() { - try (Repository git = gitMgr.openRepository(getProject().getNameKey())) { + try (Repository git = gitMgr.openRepository(getNameKey())) { Ref ref = git.getRefDatabase().exactRef(RefNames.REFS_CONFIG); if (ref == null || ref.getObjectId() == null) { return true; @@ -203,7 +203,7 @@ public class ProjectState { public PrologEnvironment newPrologEnvironment() throws CompileException { PrologMachineCopy pmc = rulesMachine; if (pmc == null) { - pmc = rulesCache.loadMachine(getProject().getNameKey(), config.getRulesId()); + pmc = rulesCache.loadMachine(getNameKey(), config.getRulesId()); rulesMachine = pmc; } return envFactory.create(pmc); @@ -226,6 +226,14 @@ public class ProjectState { return config.getProject(); } + public Project.NameKey getNameKey() { + return getProject().getNameKey(); + } + + public String getName() { + return getNameKey().get(); + } + public ProjectConfig getConfig() { return config; } @@ -236,10 +244,10 @@ public class ProjectState { } ProjectLevelConfig cfg = new ProjectLevelConfig(fileName, this); - try (Repository git = gitMgr.openRepository(getProject().getNameKey())) { + try (Repository git = gitMgr.openRepository(getNameKey())) { cfg.load(git); } catch (IOException | ConfigInvalidException e) { - log.warn("Failed to load " + fileName + " for " + getProject().getName(), e); + log.warn("Failed to load " + fileName + " for " + getName(), e); } configs.put(fileName, cfg); @@ -268,7 +276,7 @@ public class ProjectState { section.setPermissions(copy); } - SectionMatcher matcher = SectionMatcher.wrap(getProject().getNameKey(), section); + SectionMatcher matcher = SectionMatcher.wrap(getNameKey(), section); if (matcher != null) { sm.add(matcher); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java index 0775bcf418..c4a7eb4de5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java @@ -105,7 +105,7 @@ public class PutConfig implements RestModifyView { public ConfigInfo apply(ProjectState projectState, ConfigInput input) throws ResourceNotFoundException, BadRequestException, ResourceConflictException { - Project.NameKey projectName = projectState.getProject().getNameKey(); + Project.NameKey projectName = projectState.getNameKey(); if (input == null) { throw new BadRequestException("config is required"); } @@ -309,7 +309,7 @@ public class PutConfig implements RestModifyView { throw new BadRequestException( String.format( "Not allowed to set parameter '%s' of plugin '%s' on project '%s'.", - parameterName, pluginName, projectState.getProject().getName())); + parameterName, pluginName, projectState.getName())); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java index 07f7ead916..37cfcdd33b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java @@ -77,8 +77,7 @@ public class SetParent implements RestModifyView { IdentifiedUser user = rsrc.getUser().asIdentifiedUser(); String parentName = MoreObjects.firstNonNull(Strings.emptyToNull(input.parent), allProjects.get()); - validateParentUpdate( - rsrc.getProjectState().getProject().getNameKey(), user, parentName, checkIfAdmin); + validateParentUpdate(rsrc.getProjectState().getNameKey(), user, parentName, checkIfAdmin); try (MetaDataUpdate md = updateFactory.create(rsrc.getNameKey())) { ProjectConfig config = ProjectConfig.read(md); Project project = config.getProject(); @@ -128,11 +127,11 @@ public class SetParent implements RestModifyView { if (Iterables.tryFind( parent.tree(), p -> { - return p.getProject().getNameKey().equals(project); + return p.getNameKey().equals(project); }) .isPresent()) { throw new ResourceConflictException( - "cycle exists between " + project.get() + " and " + parent.getProject().getName()); + "cycle exists between " + project.get() + " and " + parent.getName()); } } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java index 72741008ae..4595933dcb 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java @@ -600,8 +600,7 @@ public class SubmitRuleEvaluator { try { parentEnv = parentState.newPrologEnvironment(); } catch (CompileException err) { - throw new RuleEvalException( - "Cannot consult rules.pl for " + parentState.getProject().getName(), err); + throw new RuleEvalException("Cannot consult rules.pl for " + parentState.getName(), err); } parentEnv.copyStoredValues(childEnv); @@ -619,12 +618,12 @@ public class SubmitRuleEvaluator { throw new RuleEvalException( String.format( "%s on change %d of %s", - err.getMessage(), cd.getId().get(), parentState.getProject().getName())); + err.getMessage(), cd.getId().get(), parentState.getName())); } catch (RuntimeException err) { throw new RuleEvalException( String.format( "Exception calling %s on change %d of %s", - filterRule, cd.getId().get(), parentState.getProject().getName()), + filterRule, cd.getId().get(), parentState.getName()), err); } finally { reductionsConsumed += env.getReductions(); @@ -690,6 +689,6 @@ public class SubmitRuleEvaluator { } private String getProjectName() { - return control.getProjectControl().getProjectState().getProject().getName(); + return control.getProjectControl().getProjectState().getName(); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ParentProjectPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ParentProjectPredicate.java index f5e8d69c1c..19c051578b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ParentProjectPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ParentProjectPredicate.java @@ -56,7 +56,7 @@ public class ParentProjectPredicate extends OrPredicate { } List> r = new ArrayList<>(); - r.add(new ProjectPredicate(projectState.getProject().getName())); + r.add(new ProjectPredicate(projectState.getName())); try { ProjectResource proj = new ProjectResource(projectState.controlFor(self.get())); ListChildProjects children = listChildProjects.get(); diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java index 58492b204f..b9a98b9ba5 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java @@ -69,8 +69,7 @@ public abstract class AbstractGitCommand extends BaseCommand { @Override public Project.NameKey getProjectName() { - Project project = projectControl.getProjectState().getProject(); - return project.getNameKey(); + return projectControl.getProjectState().getNameKey(); } }); } finally { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java index 35788fd0c9..0d7fa24e42 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java @@ -226,6 +226,6 @@ final class AdminSetParent extends SshCommand { if (ps == null) { return Collections.emptySet(); } - return ps.parents().transform(s -> s.getProject().getNameKey()).toSet(); + return ps.parents().transform(s -> s.getNameKey()).toSet(); } }