opendev/gerrit
Code Issues Proposed changes

Merge "In AbstractChangeUpdate, restrict access levels and add @Nullable annotation"

Browse Source
This commit is contained in:
David Pursehouse 2019-12-02 23:21:03 +00:00 committed by Gerrit Code Review
commit 56358d5ca7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
java/com/google/gerrit/server/notedb/AbstractChangeUpdate.java
View File

@ -51,11 +51,11 @@ public abstract class AbstractChangeUpdate {
private final Change change; private final Change change;
protected final PersonIdent serverIdent; protected final PersonIdent serverIdent;
protected PatchSet.Id psId; @Nullable protected PatchSet.Id psId;
private ObjectId result; private ObjectId result;
protected boolean rootOnly; boolean rootOnly;
protected AbstractChangeUpdate( AbstractChangeUpdate(
ChangeNotes notes, ChangeNotes notes,
CurrentUser user, CurrentUser user,
PersonIdent serverIdent, PersonIdent serverIdent,
@ -72,7 +72,7 @@ public abstract class AbstractChangeUpdate {
this.when = when; this.when = when;
} }
protected AbstractChangeUpdate( AbstractChangeUpdate(
ChangeNoteUtil noteUtil, ChangeNoteUtil noteUtil,
PersonIdent serverIdent, PersonIdent serverIdent,
@Nullable ChangeNotes notes, @Nullable ChangeNotes notes,
@ -172,7 +172,7 @@ public abstract class AbstractChangeUpdate {
public abstract boolean isEmpty(); public abstract boolean isEmpty();
/** Wether this update can only be a root commit. */ /** Wether this update can only be a root commit. */
public boolean isRootOnly() { boolean isRootOnly() {
return rootOnly; return rootOnly;
} }
@ -256,7 +256,7 @@ public abstract class AbstractChangeUpdate {
protected abstract CommitBuilder applyImpl(RevWalk rw, ObjectInserter ins, ObjectId curr) protected abstract CommitBuilder applyImpl(RevWalk rw, ObjectInserter ins, ObjectId curr)
throws IOException; throws IOException;
protected static final CommitBuilder NO_OP_UPDATE = new CommitBuilder(); static final CommitBuilder NO_OP_UPDATE = new CommitBuilder();
ObjectId getResult() { ObjectId getResult() {
return result; return result;
@ -270,7 +270,7 @@ public abstract class AbstractChangeUpdate {
return ins.insert(Constants.OBJ_TREE, new byte[] {}); return ins.insert(Constants.OBJ_TREE, new byte[] {});
} }
protected void verifyComment(Comment c) { void verifyComment(Comment c) {
checkArgument(c.getCommitId() != null, "commit ID required for comment: %s", c); checkArgument(c.getCommitId() != null, "commit ID required for comment: %s", c);
checkArgument( checkArgument(
c.author.getId().equals(getAccountId()), c.author.getId().equals(getAccountId()),