opendev/gerrit
Code Issues Proposed changes

PatchLineComment: Replace RevId with ObjectId

Browse Source 
This change does not affect Comment's field names or types, since that
type is used in the NoteDb JSON storage format, so it needs to remain
backwards compatible. It's possible we could change this and then use a
custom type adapter in Gson, but that may be more effort than it's
worth.

See Iff5644e2 context on removing RevId usages.

Change-Id: If054aca4867f5868e108616e7524b15f5c52de55
This commit is contained in:
Dave Borowitz
2019-04-23 12:46:53 -07:00
parent f600467e92
commit 59b42fbf18
4 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/com/google/gerrit/server/notedb/LegacyChangeNoteRead.java
View File

@@ -23,7 +23,6 @@ import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Comment;
import com.google.gerrit.reviewdb.client.CommentRange;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.RevId;
import com.google.gerrit.server.config.GerritServerId;
import com.google.inject.Inject;
import java.sql.Timestamp;
@@ -34,6 +33,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Set;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.util.GitDateParser;
import org.eclipse.jgit.util.MutableInteger;
@@ -77,7 +77,8 @@ public class LegacyChangeNoteRead {
byte[] bpsb = ChangeNoteUtil.BASE_PATCH_SET.getBytes(UTF_8);
byte[] bpn = ChangeNoteUtil.PARENT_NUMBER.getBytes(UTF_8);
RevId revId = new RevId(parseStringField(note, p, changeId, ChangeNoteUtil.REVISION));
ObjectId commitId =
ObjectId.fromString(parseStringField(note, p, changeId, ChangeNoteUtil.REVISION));
String fileName = null;
PatchSet.Id psId = null;
boolean isForBase = false;
@@ -105,7 +106,7 @@ public class LegacyChangeNoteRead {
ChangeNoteUtil.BASE_PATCH_SET);
}
Comment c = parseComment(note, p, fileName, psId, revId, isForBase, parentNumber);
Comment c = parseComment(note, p, fileName, psId, commitId, isForBase, parentNumber);
fileName = c.key.filename;
if (!seen.add(c.key)) {
throw parseException(changeId, "multiple comments for %s in note", c.key);
@@ -120,7 +121,7 @@ public class LegacyChangeNoteRead {
MutableInteger curr,
String currentFileName,
PatchSet.Id psId,
RevId revId,
ObjectId commitId,
boolean isForBase,
Integer parentNumber)
throws ConfigInvalidException {
@@ -189,7 +190,7 @@ public class LegacyChangeNoteRead {
c.lineNbr = range.getEndLine();
c.parentUuid = parentUUID;
c.tag = tag;
c.setRevId(revId);
c.setRevId(commitId);
if (raId != null) {
c.setRealAuthor(raId);
}