From eeed4dd47d8d5c160c282b147bd834852656d1bf Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Fri, 19 Apr 2019 09:27:30 -0700 Subject: [PATCH] Convert Change.Id to AutoValue See I6982fb24 for context. Change-Id: I95de46939a11d9a6116680f5b881cdfcf6fe705a --- .../elasticsearch/ElasticChangeIndex.java | 2 +- .../gerrit/httpd/DirectChangeByCommit.java | 2 +- .../httpd/NumericChangeIdRedirectServlet.java | 2 +- .../gerrit/lucene/LuceneChangeIndex.java | 2 +- .../google/gerrit/reviewdb/client/Change.java | 79 +++++++++---------- .../google/gerrit/reviewdb/client/Patch.java | 2 +- .../gerrit/reviewdb/client/PatchSet.java | 4 +- .../converter/ChangeIdProtoConverter.java | 2 +- .../server/api/changes/ChangesImpl.java | 2 +- .../gerrit/server/change/ChangeFinder.java | 4 +- .../gerrit/server/change/ChangeJson.java | 2 +- .../gerrit/server/change/RebaseUtil.java | 2 +- .../gerrit/server/events/EventBroker.java | 2 +- .../events/StreamEventsApiListener.java | 2 +- .../server/git/receive/ReceiveCommits.java | 2 +- .../server/mail/receive/MailProcessor.java | 2 +- .../server/notedb/ChangeNotesCache.java | 2 +- .../server/notedb/ChangeNotesParser.java | 2 +- .../server/notedb/ChangeNotesState.java | 4 +- .../query/change/ChangeQueryBuilder.java | 2 +- .../restapi/change/CherryPickChange.java | 2 +- .../server/restapi/change/CreateChange.java | 2 +- .../gerrit/server/restapi/change/Revert.java | 2 +- .../restapi/change/SubmittedTogether.java | 3 +- .../restapi/project/CreateAccessChange.java | 2 +- .../gerrit/sshd/ChangeArgumentParser.java | 2 +- .../google/gerrit/testing/TestChanges.java | 2 +- .../acceptance/api/accounts/AccountIT.java | 8 +- .../acceptance/api/change/ChangeIT.java | 6 +- .../api/change/PrivateChangeIT.java | 4 +- .../acceptance/api/revision/RevisionIT.java | 2 +- .../acceptance/git/PushPermissionsIT.java | 2 +- .../acceptance/git/RefAdvertisementIT.java | 2 +- .../rest/change/AbstractSubmit.java | 2 +- .../acceptance/rest/change/ActionsIT.java | 2 +- .../acceptance/rest/change/ChangeIdIT.java | 8 +- .../rest/change/ChangeMessagesIT.java | 5 +- .../rest/change/CreateChangeIT.java | 2 +- .../change/SubmitByMergeIfNecessaryIT.java | 4 +- .../server/change/ConsistencyCheckerIT.java | 2 +- .../server/notedb/NoteDbOnlyIT.java | 2 +- .../server/rules/PrologRuleEvaluatorIT.java | 2 +- .../gerrit/common/data/LabelFunctionTest.java | 2 +- .../gerrit/reviewdb/client/ChangeTest.java | 12 +-- .../reviewdb/client/PatchSetApprovalTest.java | 6 +- .../gerrit/reviewdb/client/PatchSetTest.java | 12 +-- .../gerrit/reviewdb/client/PatchTest.java | 4 +- .../gerrit/reviewdb/client/RefNamesTest.java | 2 +- .../converter/ChangeIdProtoConverterTest.java | 9 ++- .../ChangeMessageKeyProtoConverterTest.java | 4 +- .../ChangeMessageProtoConverterTest.java | 24 +++--- .../converter/ChangeProtoConverterTest.java | 24 +++--- ...PatchSetApprovalKeyProtoConverterTest.java | 4 +- .../PatchSetApprovalProtoConverterTest.java | 10 +-- .../PatchSetIdProtoConverterTest.java | 4 +- .../converter/PatchSetProtoConverterTest.java | 8 +- .../server/change/LabelNormalizerTest.java | 2 +- .../gerrit/server/edit/ChangeEditTest.java | 2 +- .../gerrit/server/git/GroupCollectorTest.java | 2 +- .../server/index/change/ChangeFieldTest.java | 2 +- .../index/change/StalenessCheckerTest.java | 2 +- .../server/notedb/ChangeNotesCacheTest.java | 2 +- .../server/notedb/ChangeNotesStateTest.java | 4 +- .../change/AbstractQueryChangesTest.java | 9 +-- .../server/query/change/ChangeDataTest.java | 2 +- .../query/change/RegexPathPredicateTest.java | 2 +- .../rules/IgnoreSelfApprovalRuleTest.java | 2 +- .../gerrit/server/update/BatchUpdateTest.java | 2 +- plugins/hooks | 2 +- 69 files changed, 173 insertions(+), 178 deletions(-) diff --git a/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java b/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java index f7edac2ae3..38f8578bb5 100644 --- a/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java +++ b/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java @@ -208,7 +208,7 @@ class ElasticChangeIndex extends AbstractElasticIndex int id = source.get(ChangeField.LEGACY_ID.getName()).getAsInt(); // IndexUtils#changeFields ensures either CHANGE or PROJECT is always present. String projectName = requireNonNull(source.get(ChangeField.PROJECT.getName()).getAsString()); - return changeDataFactory.create(Project.nameKey(projectName), new Change.Id(id)); + return changeDataFactory.create(Project.nameKey(projectName), Change.id(id)); } ChangeData cd = diff --git a/java/com/google/gerrit/httpd/DirectChangeByCommit.java b/java/com/google/gerrit/httpd/DirectChangeByCommit.java index 448d97b37b..f86c240cf5 100644 --- a/java/com/google/gerrit/httpd/DirectChangeByCommit.java +++ b/java/com/google/gerrit/httpd/DirectChangeByCommit.java @@ -47,7 +47,7 @@ class DirectChangeByCommit extends HttpServlet { // If exactly one change matches, link to that change. // TODO Link to a specific patch set, if one matched. ChangeInfo ci = results.iterator().next(); - token = PageLinks.toChange(Project.nameKey(ci.project), new Change.Id(ci._number)); + token = PageLinks.toChange(Project.nameKey(ci.project), Change.id(ci._number)); } else { // Otherwise, link to the query page. token = PageLinks.toChangeQuery(query); diff --git a/java/com/google/gerrit/httpd/NumericChangeIdRedirectServlet.java b/java/com/google/gerrit/httpd/NumericChangeIdRedirectServlet.java index d53a5c52a0..e1b983cfff 100644 --- a/java/com/google/gerrit/httpd/NumericChangeIdRedirectServlet.java +++ b/java/com/google/gerrit/httpd/NumericChangeIdRedirectServlet.java @@ -61,7 +61,7 @@ public class NumericChangeIdRedirectServlet extends HttpServlet { rsp.sendError(HttpServletResponse.SC_NOT_FOUND); return; } catch (PermissionBackendException | RuntimeException e) { - throw new IOException("Unable to lookup change " + id.id, e); + throw new IOException("Unable to lookup change " + id.get(), e); } String path = PageLinks.toChange(changeResource.getProject(), changeResource.getChange().getId()); diff --git a/java/com/google/gerrit/lucene/LuceneChangeIndex.java b/java/com/google/gerrit/lucene/LuceneChangeIndex.java index 6cccf961c3..ef64d360a5 100644 --- a/java/com/google/gerrit/lucene/LuceneChangeIndex.java +++ b/java/com/google/gerrit/lucene/LuceneChangeIndex.java @@ -450,7 +450,7 @@ public class LuceneChangeIndex implements ChangeIndex { cd = changeDataFactory.create(parseProtoFrom(proto, ChangeProtoConverter.INSTANCE)); } else { IndexableField f = Iterables.getFirst(doc.get(idFieldName), null); - Change.Id id = new Change.Id(f.numericValue().intValue()); + Change.Id id = Change.id(f.numericValue().intValue()); // IndexUtils#changeFields ensures either CHANGE or PROJECT is always present. IndexableField project = doc.get(PROJECT.getName()).iterator().next(); cd = changeDataFactory.create(Project.nameKey(project.stringValue()), id); diff --git a/java/com/google/gerrit/reviewdb/client/Change.java b/java/com/google/gerrit/reviewdb/client/Change.java index 6ca9679f56..4ac1f21f3c 100644 --- a/java/com/google/gerrit/reviewdb/client/Change.java +++ b/java/com/google/gerrit/reviewdb/client/Change.java @@ -14,12 +14,13 @@ package com.google.gerrit.reviewdb.client; +import static com.google.common.base.Preconditions.checkArgument; import static com.google.gerrit.reviewdb.client.RefNames.REFS_CHANGES; import com.google.auto.value.AutoValue; +import com.google.common.primitives.Ints; import com.google.gerrit.common.Nullable; import com.google.gerrit.extensions.client.ChangeStatus; -import com.google.gwtorm.client.IntKey; import com.google.gwtorm.client.StandardKeyEncoder; import java.sql.Timestamp; import java.util.Arrays; @@ -94,45 +95,17 @@ import java.util.Arrays; * notice of a replacement patch set is sent, or when notice of the change submission occurs. */ public final class Change { - public static class Id extends IntKey> { - private static final long serialVersionUID = 1L; - - public int id; - - protected Id() {} - - public Id(int id) { - this.id = id; - } - - @Override - public int get() { - return id; - } - - @Override - protected void set(int newValue) { - id = newValue; - } - - public String toRefPrefix() { - return refPrefixBuilder().toString(); - } - - StringBuilder refPrefixBuilder() { - StringBuilder r = new StringBuilder(32).append(REFS_CHANGES); - int m = id % 100; - if (m < 10) { - r.append('0'); - } - return r.append(m).append('/').append(id).append('/'); - } + public static Id id(int id) { + return new AutoValue_Change_Id(id); + } + @AutoValue + public abstract static class Id { /** Parse a Change.Id out of a string representation. */ public static Id parse(String str) { - final Id r = new Id(); - r.fromString(str); - return r; + Integer id = Ints.tryParse(str); + checkArgument(id != null, "invalid change ID: %s", str); + return Change.id(id); } public static Id fromRef(String ref) { @@ -147,7 +120,7 @@ public final class Change { if (ref.substring(ce).equals(RefNames.META_SUFFIX) || ref.substring(ce).equals(RefNames.ROBOT_COMMENTS_SUFFIX) || PatchSet.Id.fromRef(ref, ce) >= 0) { - return new Change.Id(Integer.parseInt(ref.substring(cs, ce))); + return Change.id(Integer.parseInt(ref.substring(cs, ce))); } return null; } @@ -170,7 +143,7 @@ public final class Change { } int ce = nextNonDigit(ref, cs); if (ce < ref.length() && ref.charAt(ce) == '/' && isNumeric(ref, ce + 1)) { - return new Change.Id(Integer.parseInt(ref.substring(cs, ce))); + return Change.id(Integer.parseInt(ref.substring(cs, ce))); } return null; } @@ -192,14 +165,14 @@ public final class Change { int endChangeId = nextNonDigit(ref, startChangeId); String id = ref.substring(startChangeId, endChangeId); if (id != null && !id.isEmpty()) { - return new Change.Id(Integer.parseInt(id)); + return Change.id(Integer.parseInt(id)); } return null; } public static Id fromRefPart(String ref) { Integer id = RefNames.parseShardedRefPart(ref); - return id != null ? new Change.Id(id) : null; + return id != null ? Change.id(id) : null; } static int startIndex(String ref) { @@ -250,6 +223,30 @@ public final class Change { } return i; } + + abstract int id(); + + public int get() { + return id(); + } + + public String toRefPrefix() { + return refPrefixBuilder().toString(); + } + + StringBuilder refPrefixBuilder() { + StringBuilder r = new StringBuilder(32).append(REFS_CHANGES); + int m = get() % 100; + if (m < 10) { + r.append('0'); + } + return r.append(m).append('/').append(get()).append('/'); + } + + @Override + public String toString() { + return Integer.toString(get()); + } } public static Key key(String key) { diff --git a/java/com/google/gerrit/reviewdb/client/Patch.java b/java/com/google/gerrit/reviewdb/client/Patch.java index 55dcf7646b..89f30576e1 100644 --- a/java/com/google/gerrit/reviewdb/client/Patch.java +++ b/java/com/google/gerrit/reviewdb/client/Patch.java @@ -54,7 +54,7 @@ public final class Patch { checkKeyFormat(changeId != null, str); Integer patchSetNum = Ints.tryParse(parts.get(1)); checkKeyFormat(patchSetNum != null, str); - return key(PatchSet.id(new Change.Id(changeId), patchSetNum), parts.get(2)); + return key(PatchSet.id(Change.id(changeId), patchSetNum), parts.get(2)); } private static void checkKeyFormat(boolean test, String input) { diff --git a/java/com/google/gerrit/reviewdb/client/PatchSet.java b/java/com/google/gerrit/reviewdb/client/PatchSet.java index 0894377161..f18d3f2fe4 100644 --- a/java/com/google/gerrit/reviewdb/client/PatchSet.java +++ b/java/com/google/gerrit/reviewdb/client/PatchSet.java @@ -92,7 +92,7 @@ public final class PatchSet { checkIdFormat(changeId != null, str); Integer id = Ints.tryParse(parts.get(1)); checkIdFormat(id != null, str); - return PatchSet.id(new Change.Id(changeId), id); + return PatchSet.id(Change.id(changeId), id); } private static void checkIdFormat(boolean test, String input) { @@ -111,7 +111,7 @@ public final class PatchSet { return null; } int changeId = Integer.parseInt(ref.substring(cs, ce)); - return PatchSet.id(new Change.Id(changeId), patchSetId); + return PatchSet.id(Change.id(changeId), patchSetId); } static int fromRef(String ref, int changeIdEnd) { diff --git a/java/com/google/gerrit/reviewdb/converter/ChangeIdProtoConverter.java b/java/com/google/gerrit/reviewdb/converter/ChangeIdProtoConverter.java index 14ed59c43b..a89434ec57 100644 --- a/java/com/google/gerrit/reviewdb/converter/ChangeIdProtoConverter.java +++ b/java/com/google/gerrit/reviewdb/converter/ChangeIdProtoConverter.java @@ -28,7 +28,7 @@ public enum ChangeIdProtoConverter implements ProtoConverter fromProjectNumber(String project, int changeNumber) { - Change.Id cId = new Change.Id(changeNumber); + Change.Id cId = Change.id(changeNumber); try { return ImmutableList.of( changeNotesFactory.createChecked(Project.NameKey.parse(project), cId)); diff --git a/java/com/google/gerrit/server/change/ChangeJson.java b/java/com/google/gerrit/server/change/ChangeJson.java index 0cc2f619f8..8b43c9ead3 100644 --- a/java/com/google/gerrit/server/change/ChangeJson.java +++ b/java/com/google/gerrit/server/change/ChangeJson.java @@ -297,7 +297,7 @@ public class ChangeJson { Map cache = Maps.newHashMapWithExpectedSize(in.size()); for (QueryResult r : in) { List infos = toChangeInfos(r.entities(), cache); - infos.forEach(c -> cache.put(new Change.Id(c._number), c)); + infos.forEach(c -> cache.put(Change.id(c._number), c)); if (!infos.isEmpty() && r.more()) { infos.get(infos.size() - 1)._moreChanges = true; } diff --git a/java/com/google/gerrit/server/change/RebaseUtil.java b/java/com/google/gerrit/server/change/RebaseUtil.java index 01a7946dfa..2531bcba5d 100644 --- a/java/com/google/gerrit/server/change/RebaseUtil.java +++ b/java/com/google/gerrit/server/change/RebaseUtil.java @@ -98,7 +98,7 @@ public class RebaseUtil { // Try parsing base as a change number (assume current patch set). Integer baseChangeId = Ints.tryParse(base); if (baseChangeId != null) { - ChangeNotes baseNotes = notesFor(rsrc, new Change.Id(baseChangeId)); + ChangeNotes baseNotes = notesFor(rsrc, Change.id(baseChangeId)); if (baseNotes != null) { return Base.create(baseNotes, psUtil.current(baseNotes)); } diff --git a/java/com/google/gerrit/server/events/EventBroker.java b/java/com/google/gerrit/server/events/EventBroker.java index a58102f320..d8efc8d4a1 100644 --- a/java/com/google/gerrit/server/events/EventBroker.java +++ b/java/com/google/gerrit/server/events/EventBroker.java @@ -201,7 +201,7 @@ public class EventBroker implements EventDispatcher { return isVisibleTo(change, user); } catch (NoSuchChangeException e) { logger.atFine().log( - "Change %s cannot be found, falling back on ref visibility check", cid.id); + "Change %s cannot be found, falling back on ref visibility check", cid.get()); } } return isVisibleTo(refEvent.getBranchNameKey(), user); diff --git a/java/com/google/gerrit/server/events/StreamEventsApiListener.java b/java/com/google/gerrit/server/events/StreamEventsApiListener.java index bc47b78339..d28c9201bf 100644 --- a/java/com/google/gerrit/server/events/StreamEventsApiListener.java +++ b/java/com/google/gerrit/server/events/StreamEventsApiListener.java @@ -137,7 +137,7 @@ public class StreamEventsApiListener private ChangeNotes getNotes(ChangeInfo info) { try { - return changeNotesFactory.createChecked(new Change.Id(info._number)); + return changeNotesFactory.createChecked(Change.id(info._number)); } catch (NoSuchChangeException e) { throw new StorageException(e); } diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java index 2210622911..a7e8a35960 100644 --- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java +++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java @@ -2424,7 +2424,7 @@ class ReceiveCommits { private void setChangeId(int id) { possiblyOverrideWorkInProgress(); - changeId = new Change.Id(id); + changeId = Change.id(id); ins = changeInserterFactory .create(changeId, commit, refName) diff --git a/java/com/google/gerrit/server/mail/receive/MailProcessor.java b/java/com/google/gerrit/server/mail/receive/MailProcessor.java index 1f8471b523..7ae5064421 100644 --- a/java/com/google/gerrit/server/mail/receive/MailProcessor.java +++ b/java/com/google/gerrit/server/mail/receive/MailProcessor.java @@ -211,7 +211,7 @@ public class MailProcessor { throws UpdateException, RestApiException { try (ManualRequestContext ctx = oneOffRequestContext.openAs(sender)) { List changeDataList = - queryProvider.get().byLegacyChangeId(new Change.Id(metadata.changeNumber)); + queryProvider.get().byLegacyChangeId(Change.id(metadata.changeNumber)); if (changeDataList.size() != 1) { logger.atSevere().log( "Message %s references unique change %s," diff --git a/java/com/google/gerrit/server/notedb/ChangeNotesCache.java b/java/com/google/gerrit/server/notedb/ChangeNotesCache.java index bd381666be..517898aaed 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotesCache.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotesCache.java @@ -99,7 +99,7 @@ public class ChangeNotesCache { ChangeNotesKeyProto proto = Protos.parseUnchecked(ChangeNotesKeyProto.parser(), in); return Key.create( Project.nameKey(proto.getProject()), - new Change.Id(proto.getChangeId()), + Change.id(proto.getChangeId()), ObjectIdConverter.create().fromByteString(proto.getId())); } } diff --git a/java/com/google/gerrit/server/notedb/ChangeNotesParser.java b/java/com/google/gerrit/server/notedb/ChangeNotesParser.java index 3acfb915ca..c4a118b200 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotesParser.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotesParser.java @@ -976,7 +976,7 @@ class ChangeNotesParser { if (revertOf == null) { throw invalidFooter(FOOTER_REVERT_OF, footer); } - return new Change.Id(revertOf); + return Change.id(revertOf); } private void pruneReviewers() { diff --git a/java/com/google/gerrit/server/notedb/ChangeNotesState.java b/java/com/google/gerrit/server/notedb/ChangeNotesState.java index 24853196f8..daebd32c07 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotesState.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotesState.java @@ -543,7 +543,7 @@ public abstract class ChangeNotesState { @Override public ChangeNotesState deserialize(byte[] in) { ChangeNotesStateProto proto = Protos.parseUnchecked(ChangeNotesStateProto.parser(), in); - Change.Id changeId = new Change.Id(proto.getChangeId()); + Change.Id changeId = Change.id(proto.getChangeId()); ChangeNotesState.Builder b = builder() @@ -623,7 +623,7 @@ public abstract class ChangeNotesState { .workInProgress(proto.getWorkInProgress()) .reviewStarted(proto.getReviewStarted()); if (proto.getHasRevertOf()) { - b.revertOf(new Change.Id(proto.getRevertOf())); + b.revertOf(Change.id(proto.getRevertOf())); } return b.build(); } diff --git a/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java b/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java index 218d5269ee..e9c2ddb1fb 100644 --- a/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java +++ b/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java @@ -461,7 +461,7 @@ public class ChangeQueryBuilder extends QueryBuilder { EnumSet.of(ListChangesOption.CURRENT_REVISION, ListChangesOption.SUBMITTABLE); private static final Comparator COMPARATOR = - Comparator.comparing(ChangeData::project).thenComparing(cd -> cd.getId().id, reverseOrder()); + Comparator.comparing(ChangeData::project) + .thenComparing(cd -> cd.getId().get(), reverseOrder()); private final ChangeJson.Factory json; private final Provider queryProvider; diff --git a/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java b/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java index 7388587ded..2734da2d9b 100644 --- a/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java +++ b/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java @@ -134,7 +134,7 @@ public class CreateAccessChange implements RestModifyView parseId(String id) throws UnloggedFailure { try { - return Arrays.asList(new Change.Id(Integer.parseInt(id))); + return Arrays.asList(Change.id(Integer.parseInt(id))); } catch (NumberFormatException e) { throw new UnloggedFailure(2, "Invalid change ID " + id, e); } diff --git a/java/com/google/gerrit/testing/TestChanges.java b/java/com/google/gerrit/testing/TestChanges.java index 9f8752380e..20948d6eb1 100644 --- a/java/com/google/gerrit/testing/TestChanges.java +++ b/java/com/google/gerrit/testing/TestChanges.java @@ -52,7 +52,7 @@ public class TestChanges { } public static Change newChange(Project.NameKey project, Account.Id userId, int id) { - Change.Id changeId = new Change.Id(id); + Change.Id changeId = Change.id(id); Change c = new Change( Change.key("Iabcd1234abcd1234abcd1234abcd1234abcd1234"), diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java index c2b4b9e28e..feeaf38f2c 100644 --- a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java +++ b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java @@ -660,7 +660,7 @@ public class AccountIT extends AbstractDaemonTest { assertThat(change.stars).contains(DEFAULT_LABEL); refUpdateCounter.assertRefUpdateFor( RefUpdateCounter.projectRef( - allUsers, RefNames.refsStarredChanges(new Change.Id(change._number), admin.id()))); + allUsers, RefNames.refsStarredChanges(Change.id(change._number), admin.id()))); gApi.accounts().self().unstarChange(triplet); change = info(triplet); @@ -668,7 +668,7 @@ public class AccountIT extends AbstractDaemonTest { assertThat(change.stars).isNull(); refUpdateCounter.assertRefUpdateFor( RefUpdateCounter.projectRef( - allUsers, RefNames.refsStarredChanges(new Change.Id(change._number), admin.id()))); + allUsers, RefNames.refsStarredChanges(Change.id(change._number), admin.id()))); accountIndexedCounter.assertNoReindex(); } @@ -699,7 +699,7 @@ public class AccountIT extends AbstractDaemonTest { assertThat(starredChange.stars).containsExactly("blue", "red", DEFAULT_LABEL).inOrder(); refUpdateCounter.assertRefUpdateFor( RefUpdateCounter.projectRef( - allUsers, RefNames.refsStarredChanges(new Change.Id(change._number), admin.id()))); + allUsers, RefNames.refsStarredChanges(Change.id(change._number), admin.id()))); gApi.accounts() .self() @@ -718,7 +718,7 @@ public class AccountIT extends AbstractDaemonTest { assertThat(starredChange.stars).containsExactly("red", "yellow").inOrder(); refUpdateCounter.assertRefUpdateFor( RefUpdateCounter.projectRef( - allUsers, RefNames.refsStarredChanges(new Change.Id(change._number), admin.id()))); + allUsers, RefNames.refsStarredChanges(Change.id(change._number), admin.id()))); accountIndexedCounter.assertNoReindex(); diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java index b4eb8c4d58..d639db3872 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -1087,7 +1087,7 @@ public class ChangeIT extends AbstractDaemonTest { assertThat(query(changeId)).isEmpty(); - String ref = new Change.Id(id).toRefPrefix() + "1"; + String ref = Change.id(id).toRefPrefix() + "1"; eventRecorder.assertRefUpdatedEvents(projectName.get(), ref, null, commit, commit, null); eventRecorder.assertChangeDeletedEvents(changeId, deleteAs.email()); } finally { @@ -2882,7 +2882,7 @@ public class ChangeIT extends AbstractDaemonTest { try (Repository repo = repoManager.openRepository(project); RevWalk rw = new RevWalk(repo)) { RevCommit commitPatchSetCreation = - rw.parseCommit(repo.exactRef(changeMetaRef(new Change.Id(c._number))).getObjectId()); + rw.parseCommit(repo.exactRef(changeMetaRef(Change.id(c._number))).getObjectId()); assertThat(commitPatchSetCreation.getShortMessage()).isEqualTo("Create patch set 2"); PersonIdent expectedAuthor = @@ -2952,7 +2952,7 @@ public class ChangeIT extends AbstractDaemonTest { // Amend change as user PushOneCommit.Result r2 = amendChange(r1.getChangeId(), "refs/for/master", user, userTestRepo); - r2.assertErrorStatus("cannot add patch set to " + r1.getChange().getId().id + "."); + r2.assertErrorStatus("cannot add patch set to " + r1.getChange().getId().get() + "."); } @Test diff --git a/javatests/com/google/gerrit/acceptance/api/change/PrivateChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/PrivateChangeIT.java index bfcb1a8358..a4d944b1f1 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/PrivateChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/PrivateChangeIT.java @@ -173,7 +173,7 @@ public class PrivateChangeIT extends AbstractDaemonTest { PushOneCommit.Result result = createChange(); String changeId = result.getChangeId(); merge(result); - markMergedChangePrivate(new Change.Id(gApi.changes().id(changeId).get()._number)); + markMergedChangePrivate(Change.id(gApi.changes().id(changeId).get()._number)); gApi.changes().id(changeId).setPrivate(false, null); assertThat(gApi.changes().id(changeId).get().isPrivate).isNull(); @@ -218,7 +218,7 @@ public class PrivateChangeIT extends AbstractDaemonTest { String changeId = result.getChangeId(); gApi.changes().id(changeId).addReviewer(admin.id().toString()); merge(result); - markMergedChangePrivate(new Change.Id(gApi.changes().id(changeId).get()._number)); + markMergedChangePrivate(Change.id(gApi.changes().id(changeId).get()._number)); requestScopeOperations.setApiUser(user.id()); gApi.changes().id(changeId).setPrivate(false, null); diff --git a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java index a2092af069..9e91245ceb 100644 --- a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java +++ b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java @@ -1330,7 +1330,7 @@ public class RevisionIT extends AbstractDaemonTest { exception.expect(BadRequestException.class); exception.expectMessage( - String.format("not found in revision %d,1", r.getChange().change().getId().id)); + String.format("not found in revision %d,1", r.getChange().change().getId().get())); gApi.changes().id(r.getChangeId()).revision(1).review(reviewInput); } diff --git a/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java b/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java index 6073bebd57..f682342ca8 100644 --- a/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java +++ b/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java @@ -273,7 +273,7 @@ public class PushPermissionsIT extends AbstractDaemonTest { ci.project = project.get(); ci.branch = "master"; ci.subject = "A change"; - Change.Id id = new Change.Id(gApi.changes().create(ci).get()._number); + Change.Id id = Change.id(gApi.changes().create(ci).get()._number); requestScopeOperations.setApiUser(admin.id()); ObjectId ps1Id = forceFetch(PatchSet.id(id, 1).toRefName()); diff --git a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java index 4da1d113fb..28d19252ad 100644 --- a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java +++ b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java @@ -384,7 +384,7 @@ public class RefAdvertisementIT extends AbstractDaemonTest { public void uploadPackAllRefsAreVisibleOrphanedTag() throws Exception { allow("refs/*", Permission.READ, REGISTERED_USERS); // Delete the pending change on 'branch' and 'branch' itself so that the tag gets orphaned - gApi.changes().id(cd4.getId().id).delete(); + gApi.changes().id(cd4.getId().get()).delete(); gApi.projects().name(project.get()).branch("refs/heads/branch").delete(); requestScopeOperations.setApiUser(user.id()); diff --git a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java index 8331a73799..6da050721b 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java @@ -1212,7 +1212,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest { assertThat(c.currentRevision).isEqualTo(expectedId.name()); assertThat(c.revisions.get(expectedId.name())._number).isEqualTo(expectedNum); try (Repository repo = repoManager.openRepository(Project.nameKey(c.project))) { - String refName = PatchSet.id(new Change.Id(c._number), expectedNum).toRefName(); + String refName = PatchSet.id(Change.id(c._number), expectedNum).toRefName(); Ref ref = repo.exactRef(refName); assertThat(ref).named(refName).isNotNull(); assertThat(ref.getObjectId()).isEqualTo(expectedId); diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ActionsIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ActionsIT.java index b6cbf50cd7..5fb42da750 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/ActionsIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/ActionsIT.java @@ -351,7 +351,7 @@ public class ActionsIT extends AbstractDaemonTest { String id = createChange().getChangeId(); amendChange(id); ChangeInfo origChange = gApi.changes().id(id).get(CHANGE_ACTIONS); - Change.Id changeId = new Change.Id(origChange._number); + Change.Id changeId = Change.id(origChange._number); class Visitor implements ActionVisitor { @Override diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ChangeIdIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ChangeIdIT.java index 3f1608c2a1..46327312b7 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/ChangeIdIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/ChangeIdIT.java @@ -98,14 +98,14 @@ public class ChangeIdIT extends AbstractDaemonTest { // This test tests a redirect that is primarily intended for the UI (though the backend doesn't // really care who the caller is). The redirect rewrites a shorthand change number URL (/123) to // it's canonical long form (/c/project/+/123). - int changeId = createChange().getChange().getId().id; + int changeId = createChange().getChange().getId().get(); RestResponse res = anonymousRestSession.get("/" + changeId); res.assertTemporaryRedirect("/c/" + project.get() + "/+/" + changeId + "/"); } @Test public void changeNumberRedirectsWithTrailingSlash() throws Exception { - int changeId = createChange().getChange().getId().id; + int changeId = createChange().getChange().getId().get(); RestResponse res = anonymousRestSession.get("/" + changeId + "/"); res.assertTemporaryRedirect("/c/" + project.get() + "/+/" + changeId + "/"); } @@ -125,8 +125,8 @@ public class ChangeIdIT extends AbstractDaemonTest { @Test public void hiddenChangeNotFound() throws Exception { Change.Id changeId = createChange().getChange().getId(); - gApi.changes().id(changeId.id).setPrivate(true, null); - RestResponse res = anonymousRestSession.get("/" + changeId.id); + gApi.changes().id(changeId.get()).setPrivate(true, null); + RestResponse res = anonymousRestSession.get("/" + changeId.get()); res.assertNotFound(); } diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java index 51c5fc8686..ca325aacf0 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java @@ -279,7 +279,7 @@ public class ChangeMessagesIT extends AbstractDaemonTest { List messagesBeforeDeletion = gApi.changes().id(changeNum).messages(); List commentsBefore = getChangeSortedComments(changeNum); - List commitsBefore = getChangeMetaCommitsInReverseOrder(new Change.Id(changeNum)); + List commitsBefore = getChangeMetaCommitsInReverseOrder(Change.id(changeNum)); String id = messagesBeforeDeletion.get(deletedMessageIndex).id; DeleteChangeMessageInput input = new DeleteChangeMessageInput(reason); @@ -340,8 +340,7 @@ public class ChangeMessagesIT extends AbstractDaemonTest { TestAccount deletedBy, String deleteReason) throws Exception { - List commitsAfterDeletion = - getChangeMetaCommitsInReverseOrder(new Change.Id(changeNum)); + List commitsAfterDeletion = getChangeMetaCommitsInReverseOrder(Change.id(changeNum)); assertThat(commitsAfterDeletion).hasSize(commitsBeforeDeletion.size()); for (int i = 0; i < commitsBeforeDeletion.size(); i++) { diff --git a/javatests/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java b/javatests/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java index 0629f6b285..72eca4044c 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java @@ -274,7 +274,7 @@ public class CreateChangeIT extends AbstractDaemonTest { try (Repository repo = repoManager.openRepository(project); RevWalk rw = new RevWalk(repo)) { RevCommit commit = - rw.parseCommit(repo.exactRef(changeMetaRef(new Change.Id(c._number))).getObjectId()); + rw.parseCommit(repo.exactRef(changeMetaRef(Change.id(c._number))).getObjectId()); assertThat(commit.getShortMessage()).isEqualTo("Create change"); diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java index 5a440c1968..8ee632f7d2 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java @@ -699,7 +699,7 @@ public class SubmitByMergeIfNecessaryIT extends AbstractSubmitByMerge { assertThat(e.getMessage()) .isEqualTo( "A change to be submitted with " - + change2Result.getChange().getId().id + + change2Result.getChange().getId().get() + " is not visible"); } assertRefUpdatedEvents(); @@ -759,7 +759,7 @@ public class SubmitByMergeIfNecessaryIT extends AbstractSubmitByMerge { assertThat(e.getMessage()) .isEqualTo( "A change to be submitted with " - + change1.getChange().getId().id + + change1.getChange().getId().get() + " is not visible"); } assertRefUpdatedEvents(); diff --git a/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java b/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java index ad172f5072..238c129915 100644 --- a/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java +++ b/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java @@ -744,7 +744,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { } private ChangeNotes insertChange(TestAccount owner, String dest) throws Exception { - Change.Id id = new Change.Id(sequences.nextChangeId()); + Change.Id id = Change.id(sequences.nextChangeId()); ChangeInserter ins; try (BatchUpdate bu = newUpdate(owner.id())) { RevCommit commit = patchSetCommit(PatchSet.id(id, 1)); diff --git a/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java b/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java index 748c4eaf9b..6e71a30a67 100644 --- a/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java +++ b/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java @@ -188,7 +188,7 @@ public class NoteDbOnlyIT extends AbstractDaemonTest { @Test public void missingChange() throws Exception { - Change.Id changeId = new Change.Id(1234567); + Change.Id changeId = Change.id(1234567); assertNoSuchChangeException(() -> notesFactory.create(project, changeId)); assertNoSuchChangeException(() -> notesFactory.createChecked(project, changeId)); } diff --git a/javatests/com/google/gerrit/acceptance/server/rules/PrologRuleEvaluatorIT.java b/javatests/com/google/gerrit/acceptance/server/rules/PrologRuleEvaluatorIT.java index fa13be499b..a88060c211 100644 --- a/javatests/com/google/gerrit/acceptance/server/rules/PrologRuleEvaluatorIT.java +++ b/javatests/com/google/gerrit/acceptance/server/rules/PrologRuleEvaluatorIT.java @@ -149,7 +149,7 @@ public class PrologRuleEvaluatorIT extends AbstractDaemonTest { } private ChangeData makeChangeData() { - ChangeData cd = ChangeData.createForTest(project, new Change.Id(1), 1); + ChangeData cd = ChangeData.createForTest(project, Change.id(1), 1); cd.setChange(TestChanges.newChange(project, admin.id())); return cd; } diff --git a/javatests/com/google/gerrit/common/data/LabelFunctionTest.java b/javatests/com/google/gerrit/common/data/LabelFunctionTest.java index 141e5a0d14..f6b430050c 100644 --- a/javatests/com/google/gerrit/common/data/LabelFunctionTest.java +++ b/javatests/com/google/gerrit/common/data/LabelFunctionTest.java @@ -32,7 +32,7 @@ import org.junit.Test; public class LabelFunctionTest extends GerritBaseTests { private static final String LABEL_NAME = "Verified"; private static final LabelId LABEL_ID = LabelId.create(LABEL_NAME); - private static final Change.Id CHANGE_ID = new Change.Id(100); + private static final Change.Id CHANGE_ID = Change.id(100); private static final PatchSet.Id PS_ID = PatchSet.id(CHANGE_ID, 1); private static final LabelType VERIFIED_LABEL = makeLabel(); private static final PatchSetApproval APPROVAL_2 = makeApproval(2); diff --git a/javatests/com/google/gerrit/reviewdb/client/ChangeTest.java b/javatests/com/google/gerrit/reviewdb/client/ChangeTest.java index 86176556b4..ccc0bd24de 100644 --- a/javatests/com/google/gerrit/reviewdb/client/ChangeTest.java +++ b/javatests/com/google/gerrit/reviewdb/client/ChangeTest.java @@ -123,8 +123,8 @@ public class ChangeTest { @Test public void toRefPrefix() { - assertThat(new Change.Id(1).toRefPrefix()).isEqualTo("refs/changes/01/1/"); - assertThat(new Change.Id(1234).toRefPrefix()).isEqualTo("refs/changes/34/1234/"); + assertThat(Change.id(1).toRefPrefix()).isEqualTo("refs/changes/01/1/"); + assertThat(Change.id(1234).toRefPrefix()).isEqualTo("refs/changes/34/1234/"); } @Test @@ -150,7 +150,7 @@ public class ChangeTest { @Test public void idToString() { - assertThat(new Change.Id(3).toString()).isEqualTo("3"); + assertThat(Change.id(3).toString()).isEqualTo("3"); } @Test @@ -161,7 +161,7 @@ public class ChangeTest { } private static void assertRef(int changeId, String refName) { - assertThat(Change.Id.fromRef(refName)).isEqualTo(new Change.Id(changeId)); + assertThat(Change.Id.fromRef(refName)).isEqualTo(Change.id(changeId)); } private static void assertNotRef(String refName) { @@ -169,7 +169,7 @@ public class ChangeTest { } private static void assertAllUsersRef(int changeId, String refName) { - assertThat(Change.Id.fromAllUsersRef(refName)).isEqualTo(new Change.Id(changeId)); + assertThat(Change.Id.fromAllUsersRef(refName)).isEqualTo(Change.id(changeId)); } private static void assertNotAllUsersRef(String refName) { @@ -177,7 +177,7 @@ public class ChangeTest { } private static void assertRefPart(int changeId, String refName) { - assertEquals(new Change.Id(changeId), Change.Id.fromRefPart(refName)); + assertEquals(Change.id(changeId), Change.Id.fromRefPart(refName)); } private static void assertNotRefPart(String refName) { diff --git a/javatests/com/google/gerrit/reviewdb/client/PatchSetApprovalTest.java b/javatests/com/google/gerrit/reviewdb/client/PatchSetApprovalTest.java index 8e1c83581c..af078f6673 100644 --- a/javatests/com/google/gerrit/reviewdb/client/PatchSetApprovalTest.java +++ b/javatests/com/google/gerrit/reviewdb/client/PatchSetApprovalTest.java @@ -26,13 +26,13 @@ public class PatchSetApprovalTest extends GerritBaseTests { public void keyEquality() { PatchSetApproval.Key k1 = PatchSetApproval.key( - PatchSet.id(new Change.Id(1), 2), Account.id(3), LabelId.create("My-Label")); + PatchSet.id(Change.id(1), 2), Account.id(3), LabelId.create("My-Label")); PatchSetApproval.Key k2 = PatchSetApproval.key( - PatchSet.id(new Change.Id(1), 2), Account.id(3), LabelId.create("My-Label")); + PatchSet.id(Change.id(1), 2), Account.id(3), LabelId.create("My-Label")); PatchSetApproval.Key k3 = PatchSetApproval.key( - PatchSet.id(new Change.Id(1), 2), Account.id(3), LabelId.create("Other-Label")); + PatchSet.id(Change.id(1), 2), Account.id(3), LabelId.create("Other-Label")); assertThat(k2).isEqualTo(k1); assertThat(k3).isNotEqualTo(k1); diff --git a/javatests/com/google/gerrit/reviewdb/client/PatchSetTest.java b/javatests/com/google/gerrit/reviewdb/client/PatchSetTest.java index 1e70557403..77822e239d 100644 --- a/javatests/com/google/gerrit/reviewdb/client/PatchSetTest.java +++ b/javatests/com/google/gerrit/reviewdb/client/PatchSetTest.java @@ -83,14 +83,14 @@ public class PatchSetTest { @Test public void toRefName() { - assertThat(PatchSet.id(new Change.Id(1), 23).toRefName()).isEqualTo("refs/changes/01/1/23"); - assertThat(PatchSet.id(new Change.Id(1234), 5).toRefName()).isEqualTo("refs/changes/34/1234/5"); + assertThat(PatchSet.id(Change.id(1), 23).toRefName()).isEqualTo("refs/changes/01/1/23"); + assertThat(PatchSet.id(Change.id(1234), 5).toRefName()).isEqualTo("refs/changes/34/1234/5"); } @Test public void parseId() { - assertThat(PatchSet.Id.parse("1,2")).isEqualTo(PatchSet.id(new Change.Id(1), 2)); - assertThat(PatchSet.Id.parse("01,02")).isEqualTo(PatchSet.id(new Change.Id(1), 2)); + assertThat(PatchSet.Id.parse("1,2")).isEqualTo(PatchSet.id(Change.id(1), 2)); + assertThat(PatchSet.Id.parse("01,02")).isEqualTo(PatchSet.id(Change.id(1), 2)); assertInvalidId(null); assertInvalidId(""); assertInvalidId("1"); @@ -103,12 +103,12 @@ public class PatchSetTest { @Test public void idToString() { - assertThat(PatchSet.id(new Change.Id(2), 3).toString()).isEqualTo("2,3"); + assertThat(PatchSet.id(Change.id(2), 3).toString()).isEqualTo("2,3"); } private static void assertRef(int changeId, int psId, String refName) { assertThat(PatchSet.isChangeRef(refName)).isTrue(); - assertThat(PatchSet.Id.fromRef(refName)).isEqualTo(PatchSet.id(new Change.Id(changeId), psId)); + assertThat(PatchSet.Id.fromRef(refName)).isEqualTo(PatchSet.id(Change.id(changeId), psId)); } private static void assertNotRef(String refName) { diff --git a/javatests/com/google/gerrit/reviewdb/client/PatchTest.java b/javatests/com/google/gerrit/reviewdb/client/PatchTest.java index 630f317e03..5c8b37fef4 100644 --- a/javatests/com/google/gerrit/reviewdb/client/PatchTest.java +++ b/javatests/com/google/gerrit/reviewdb/client/PatchTest.java @@ -34,9 +34,9 @@ public class PatchTest extends GerritBaseTests { @Test public void parseKey() { assertThat(Patch.Key.parse("1,2,foo.txt")) - .isEqualTo(Patch.key(PatchSet.id(new Change.Id(1), 2), "foo.txt")); + .isEqualTo(Patch.key(PatchSet.id(Change.id(1), 2), "foo.txt")); assertThat(Patch.Key.parse("01,02,foo.txt")) - .isEqualTo(Patch.key(PatchSet.id(new Change.Id(1), 2), "foo.txt")); + .isEqualTo(Patch.key(PatchSet.id(Change.id(1), 2), "foo.txt")); assertInvalidKey(null); assertInvalidKey(""); assertInvalidKey("1,2"); diff --git a/javatests/com/google/gerrit/reviewdb/client/RefNamesTest.java b/javatests/com/google/gerrit/reviewdb/client/RefNamesTest.java index 6519464baa..b4010947ed 100644 --- a/javatests/com/google/gerrit/reviewdb/client/RefNamesTest.java +++ b/javatests/com/google/gerrit/reviewdb/client/RefNamesTest.java @@ -33,7 +33,7 @@ public class RefNamesTest { @Rule public ExpectedException expectedException = ExpectedException.none(); private final Account.Id accountId = Account.id(1011123); - private final Change.Id changeId = new Change.Id(67473); + private final Change.Id changeId = Change.id(67473); private final PatchSet.Id psId = PatchSet.id(changeId, 42); @Test diff --git a/javatests/com/google/gerrit/reviewdb/converter/ChangeIdProtoConverterTest.java b/javatests/com/google/gerrit/reviewdb/converter/ChangeIdProtoConverterTest.java index d5ebb515b6..ee5d3ff608 100644 --- a/javatests/com/google/gerrit/reviewdb/converter/ChangeIdProtoConverterTest.java +++ b/javatests/com/google/gerrit/reviewdb/converter/ChangeIdProtoConverterTest.java @@ -30,7 +30,7 @@ public class ChangeIdProtoConverterTest { @Test public void allValuesConvertedToProto() { - Change.Id changeId = new Change.Id(94); + Change.Id changeId = Change.id(94); Entities.Change_Id proto = changeIdProtoConverter.toProto(changeId); @@ -40,7 +40,7 @@ public class ChangeIdProtoConverterTest { @Test public void allValuesConvertedToProtoAndBackAgain() { - Change.Id changeId = new Change.Id(2903482); + Change.Id changeId = Change.id(2903482); Change.Id convertedChangeId = changeIdProtoConverter.fromProto(changeIdProtoConverter.toProto(changeId)); @@ -61,7 +61,8 @@ public class ChangeIdProtoConverterTest { /** See {@link SerializedClassSubject} for background and what to do if this test fails. */ @Test - public void fieldsExistAsExpected() { - assertThatSerializedClass(Change.Id.class).hasFields(ImmutableMap.of("id", int.class)); + public void methodsExistAsExpected() { + assertThatSerializedClass(Change.Id.class) + .hasAutoValueMethods(ImmutableMap.of("id", int.class)); } } diff --git a/javatests/com/google/gerrit/reviewdb/converter/ChangeMessageKeyProtoConverterTest.java b/javatests/com/google/gerrit/reviewdb/converter/ChangeMessageKeyProtoConverterTest.java index 422fca648f..ed4e887884 100644 --- a/javatests/com/google/gerrit/reviewdb/converter/ChangeMessageKeyProtoConverterTest.java +++ b/javatests/com/google/gerrit/reviewdb/converter/ChangeMessageKeyProtoConverterTest.java @@ -33,7 +33,7 @@ public class ChangeMessageKeyProtoConverterTest { @Test public void allValuesConvertedToProto() { - ChangeMessage.Key messageKey = ChangeMessage.key(new Change.Id(704), "aabbcc"); + ChangeMessage.Key messageKey = ChangeMessage.key(Change.id(704), "aabbcc"); Entities.ChangeMessage_Key proto = messageKeyProtoConverter.toProto(messageKey); @@ -47,7 +47,7 @@ public class ChangeMessageKeyProtoConverterTest { @Test public void allValuesConvertedToProtoAndBackAgain() { - ChangeMessage.Key messageKey = ChangeMessage.key(new Change.Id(704), "aabbcc"); + ChangeMessage.Key messageKey = ChangeMessage.key(Change.id(704), "aabbcc"); ChangeMessage.Key convertedMessageKey = messageKeyProtoConverter.fromProto(messageKeyProtoConverter.toProto(messageKey)); diff --git a/javatests/com/google/gerrit/reviewdb/converter/ChangeMessageProtoConverterTest.java b/javatests/com/google/gerrit/reviewdb/converter/ChangeMessageProtoConverterTest.java index ed95c273b4..be7a5ee27f 100644 --- a/javatests/com/google/gerrit/reviewdb/converter/ChangeMessageProtoConverterTest.java +++ b/javatests/com/google/gerrit/reviewdb/converter/ChangeMessageProtoConverterTest.java @@ -38,10 +38,10 @@ public class ChangeMessageProtoConverterTest { public void allValuesConvertedToProto() { ChangeMessage changeMessage = new ChangeMessage( - ChangeMessage.key(new Change.Id(543), "change-message-21"), + ChangeMessage.key(Change.id(543), "change-message-21"), Account.id(63), new Timestamp(9876543), - PatchSet.id(new Change.Id(34), 13)); + PatchSet.id(Change.id(34), 13)); changeMessage.setMessage("This is a change message."); changeMessage.setTag("An arbitrary tag."); changeMessage.setRealAuthor(Account.id(10003)); @@ -71,10 +71,10 @@ public class ChangeMessageProtoConverterTest { public void mainValuesConvertedToProto() { ChangeMessage changeMessage = new ChangeMessage( - ChangeMessage.key(new Change.Id(543), "change-message-21"), + ChangeMessage.key(Change.id(543), "change-message-21"), Account.id(63), new Timestamp(9876543), - PatchSet.id(new Change.Id(34), 13)); + PatchSet.id(Change.id(34), 13)); Entities.ChangeMessage proto = changeMessageProtoConverter.toProto(changeMessage); @@ -99,7 +99,7 @@ public class ChangeMessageProtoConverterTest { public void realAuthorIsNotAutomaticallySetToAuthorWhenConvertedToProto() { ChangeMessage changeMessage = new ChangeMessage( - ChangeMessage.key(new Change.Id(543), "change-message-21"), Account.id(63), null, null); + ChangeMessage.key(Change.id(543), "change-message-21"), Account.id(63), null, null); Entities.ChangeMessage proto = changeMessageProtoConverter.toProto(changeMessage); @@ -119,8 +119,7 @@ public class ChangeMessageProtoConverterTest { // writtenOn may not be null according to the column definition but it's optional for the // protobuf definition. -> assume as optional and hence test null ChangeMessage changeMessage = - new ChangeMessage( - ChangeMessage.key(new Change.Id(543), "change-message-21"), null, null, null); + new ChangeMessage(ChangeMessage.key(Change.id(543), "change-message-21"), null, null, null); Entities.ChangeMessage proto = changeMessageProtoConverter.toProto(changeMessage); @@ -138,10 +137,10 @@ public class ChangeMessageProtoConverterTest { public void allValuesConvertedToProtoAndBackAgain() { ChangeMessage changeMessage = new ChangeMessage( - ChangeMessage.key(new Change.Id(543), "change-message-21"), + ChangeMessage.key(Change.id(543), "change-message-21"), Account.id(63), new Timestamp(9876543), - PatchSet.id(new Change.Id(34), 13)); + PatchSet.id(Change.id(34), 13)); changeMessage.setMessage("This is a change message."); changeMessage.setTag("An arbitrary tag."); changeMessage.setRealAuthor(Account.id(10003)); @@ -155,10 +154,10 @@ public class ChangeMessageProtoConverterTest { public void mainValuesConvertedToProtoAndBackAgain() { ChangeMessage changeMessage = new ChangeMessage( - ChangeMessage.key(new Change.Id(543), "change-message-21"), + ChangeMessage.key(Change.id(543), "change-message-21"), Account.id(63), new Timestamp(9876543), - PatchSet.id(new Change.Id(34), 13)); + PatchSet.id(Change.id(34), 13)); ChangeMessage convertedChangeMessage = changeMessageProtoConverter.fromProto(changeMessageProtoConverter.toProto(changeMessage)); @@ -168,8 +167,7 @@ public class ChangeMessageProtoConverterTest { @Test public void mandatoryValuesConvertedToProtoAndBackAgain() { ChangeMessage changeMessage = - new ChangeMessage( - ChangeMessage.key(new Change.Id(543), "change-message-21"), null, null, null); + new ChangeMessage(ChangeMessage.key(Change.id(543), "change-message-21"), null, null, null); ChangeMessage convertedChangeMessage = changeMessageProtoConverter.fromProto(changeMessageProtoConverter.toProto(changeMessage)); diff --git a/javatests/com/google/gerrit/reviewdb/converter/ChangeProtoConverterTest.java b/javatests/com/google/gerrit/reviewdb/converter/ChangeProtoConverterTest.java index 2462e51c3b..58ed0af3a1 100644 --- a/javatests/com/google/gerrit/reviewdb/converter/ChangeProtoConverterTest.java +++ b/javatests/com/google/gerrit/reviewdb/converter/ChangeProtoConverterTest.java @@ -39,21 +39,21 @@ public class ChangeProtoConverterTest { Change change = new Change( Change.key("change 1"), - new Change.Id(14), + Change.id(14), Account.id(35), Branch.nameKey(Project.nameKey("project 67"), "branch 74"), new Timestamp(987654L)); change.setLastUpdatedOn(new Timestamp(1234567L)); change.setStatus(Change.Status.MERGED); change.setCurrentPatchSet( - PatchSet.id(new Change.Id(14), 23), "subject XYZ", "original subject ABC"); + PatchSet.id(Change.id(14), 23), "subject XYZ", "original subject ABC"); change.setTopic("my topic"); change.setSubmissionId("submission ID 234"); change.setAssignee(Account.id(100001)); change.setPrivate(true); change.setWorkInProgress(true); change.setReviewStarted(true); - change.setRevertOf(new Change.Id(180)); + change.setRevertOf(Change.id(180)); Entities.Change proto = changeProtoConverter.toProto(change); @@ -89,7 +89,7 @@ public class ChangeProtoConverterTest { Change change = new Change( Change.key("change 1"), - new Change.Id(14), + Change.id(14), Account.id(35), Branch.nameKey(Project.nameKey("project 67"), "branch-74"), new Timestamp(987654L)); @@ -125,12 +125,12 @@ public class ChangeProtoConverterTest { Change change = new Change( Change.key("change 1"), - new Change.Id(14), + Change.id(14), Account.id(35), Branch.nameKey(Project.nameKey("project 67"), "branch-74"), new Timestamp(987654L)); // O as ID actually means that no current patch set is present. - change.setCurrentPatchSet(PatchSet.id(new Change.Id(14), 0), null, null); + change.setCurrentPatchSet(PatchSet.id(Change.id(14), 0), null, null); Entities.Change proto = changeProtoConverter.toProto(change); @@ -163,11 +163,11 @@ public class ChangeProtoConverterTest { Change change = new Change( Change.key("change 1"), - new Change.Id(14), + Change.id(14), Account.id(35), Branch.nameKey(Project.nameKey("project 67"), "branch-74"), new Timestamp(987654L)); - change.setCurrentPatchSet(PatchSet.id(new Change.Id(14), 23), "subject ABC", null); + change.setCurrentPatchSet(PatchSet.id(Change.id(14), 23), "subject ABC", null); Entities.Change proto = changeProtoConverter.toProto(change); @@ -200,21 +200,21 @@ public class ChangeProtoConverterTest { Change change = new Change( Change.key("change 1"), - new Change.Id(14), + Change.id(14), Account.id(35), Branch.nameKey(Project.nameKey("project 67"), "branch-74"), new Timestamp(987654L)); change.setLastUpdatedOn(new Timestamp(1234567L)); change.setStatus(Change.Status.MERGED); change.setCurrentPatchSet( - PatchSet.id(new Change.Id(14), 23), "subject XYZ", "original subject ABC"); + PatchSet.id(Change.id(14), 23), "subject XYZ", "original subject ABC"); change.setTopic("my topic"); change.setSubmissionId("submission ID 234"); change.setAssignee(Account.id(100001)); change.setPrivate(true); change.setWorkInProgress(true); change.setReviewStarted(true); - change.setRevertOf(new Change.Id(180)); + change.setRevertOf(Change.id(180)); Change convertedChange = changeProtoConverter.fromProto(changeProtoConverter.toProto(change)); assertEqualChange(convertedChange, change); @@ -225,7 +225,7 @@ public class ChangeProtoConverterTest { Change change = new Change( Change.key("change 1"), - new Change.Id(14), + Change.id(14), Account.id(35), Branch.nameKey(Project.nameKey("project 67"), "branch-74"), new Timestamp(987654L)); diff --git a/javatests/com/google/gerrit/reviewdb/converter/PatchSetApprovalKeyProtoConverterTest.java b/javatests/com/google/gerrit/reviewdb/converter/PatchSetApprovalKeyProtoConverterTest.java index 5b7b10113e..5e09e73e4c 100644 --- a/javatests/com/google/gerrit/reviewdb/converter/PatchSetApprovalKeyProtoConverterTest.java +++ b/javatests/com/google/gerrit/reviewdb/converter/PatchSetApprovalKeyProtoConverterTest.java @@ -38,7 +38,7 @@ public class PatchSetApprovalKeyProtoConverterTest { public void allValuesConvertedToProto() { PatchSetApproval.Key key = PatchSetApproval.key( - PatchSet.id(new Change.Id(42), 14), Account.id(100013), LabelId.create("label-8")); + PatchSet.id(Change.id(42), 14), Account.id(100013), LabelId.create("label-8")); Entities.PatchSetApproval_Key proto = protoConverter.toProto(key); @@ -58,7 +58,7 @@ public class PatchSetApprovalKeyProtoConverterTest { public void allValuesConvertedToProtoAndBackAgain() { PatchSetApproval.Key key = PatchSetApproval.key( - PatchSet.id(new Change.Id(42), 14), Account.id(100013), LabelId.create("label-8")); + PatchSet.id(Change.id(42), 14), Account.id(100013), LabelId.create("label-8")); PatchSetApproval.Key convertedKey = protoConverter.fromProto(protoConverter.toProto(key)); diff --git a/javatests/com/google/gerrit/reviewdb/converter/PatchSetApprovalProtoConverterTest.java b/javatests/com/google/gerrit/reviewdb/converter/PatchSetApprovalProtoConverterTest.java index 10ea092e6f..f65f204306 100644 --- a/javatests/com/google/gerrit/reviewdb/converter/PatchSetApprovalProtoConverterTest.java +++ b/javatests/com/google/gerrit/reviewdb/converter/PatchSetApprovalProtoConverterTest.java @@ -41,7 +41,7 @@ public class PatchSetApprovalProtoConverterTest { PatchSetApproval patchSetApproval = new PatchSetApproval( PatchSetApproval.key( - PatchSet.id(new Change.Id(42), 14), Account.id(100013), LabelId.create("label-8")), + PatchSet.id(Change.id(42), 14), Account.id(100013), LabelId.create("label-8")), (short) 456, new Date(987654L)); patchSetApproval.setTag("tag-21"); @@ -74,7 +74,7 @@ public class PatchSetApprovalProtoConverterTest { PatchSetApproval patchSetApproval = new PatchSetApproval( PatchSetApproval.key( - PatchSet.id(new Change.Id(42), 14), Account.id(100013), LabelId.create("label-8")), + PatchSet.id(Change.id(42), 14), Account.id(100013), LabelId.create("label-8")), (short) 456, new Date(987654L)); @@ -103,7 +103,7 @@ public class PatchSetApprovalProtoConverterTest { PatchSetApproval patchSetApproval = new PatchSetApproval( PatchSetApproval.key( - PatchSet.id(new Change.Id(42), 14), Account.id(100013), LabelId.create("label-8")), + PatchSet.id(Change.id(42), 14), Account.id(100013), LabelId.create("label-8")), (short) 456, new Date(987654L)); patchSetApproval.setTag("tag-21"); @@ -120,7 +120,7 @@ public class PatchSetApprovalProtoConverterTest { PatchSetApproval patchSetApproval = new PatchSetApproval( PatchSetApproval.key( - PatchSet.id(new Change.Id(42), 14), Account.id(100013), LabelId.create("label-8")), + PatchSet.id(Change.id(42), 14), Account.id(100013), LabelId.create("label-8")), (short) 456, new Date(987654L)); @@ -146,7 +146,7 @@ public class PatchSetApprovalProtoConverterTest { .build(); PatchSetApproval patchSetApproval = protoConverter.fromProto(proto); - assertThat(patchSetApproval.getPatchSetId()).isEqualTo(PatchSet.id(new Change.Id(42), 14)); + assertThat(patchSetApproval.getPatchSetId()).isEqualTo(PatchSet.id(Change.id(42), 14)); assertThat(patchSetApproval.getAccountId()).isEqualTo(Account.id(100013)); assertThat(patchSetApproval.getLabelId()).isEqualTo(LabelId.create("label-8")); // Default values for unset protobuf fields which can't be unset in the entity object. diff --git a/javatests/com/google/gerrit/reviewdb/converter/PatchSetIdProtoConverterTest.java b/javatests/com/google/gerrit/reviewdb/converter/PatchSetIdProtoConverterTest.java index 4b28a48d30..76a290ab4d 100644 --- a/javatests/com/google/gerrit/reviewdb/converter/PatchSetIdProtoConverterTest.java +++ b/javatests/com/google/gerrit/reviewdb/converter/PatchSetIdProtoConverterTest.java @@ -33,7 +33,7 @@ public class PatchSetIdProtoConverterTest { @Test public void allValuesConvertedToProto() { - PatchSet.Id patchSetId = PatchSet.id(new Change.Id(103), 73); + PatchSet.Id patchSetId = PatchSet.id(Change.id(103), 73); Entities.PatchSet_Id proto = patchSetIdProtoConverter.toProto(patchSetId); @@ -47,7 +47,7 @@ public class PatchSetIdProtoConverterTest { @Test public void allValuesConvertedToProtoAndBackAgain() { - PatchSet.Id patchSetId = PatchSet.id(new Change.Id(20), 13); + PatchSet.Id patchSetId = PatchSet.id(Change.id(20), 13); PatchSet.Id convertedPatchSetId = patchSetIdProtoConverter.fromProto(patchSetIdProtoConverter.toProto(patchSetId)); diff --git a/javatests/com/google/gerrit/reviewdb/converter/PatchSetProtoConverterTest.java b/javatests/com/google/gerrit/reviewdb/converter/PatchSetProtoConverterTest.java index a641eaf79d..a1a7cf6f4c 100644 --- a/javatests/com/google/gerrit/reviewdb/converter/PatchSetProtoConverterTest.java +++ b/javatests/com/google/gerrit/reviewdb/converter/PatchSetProtoConverterTest.java @@ -36,7 +36,7 @@ public class PatchSetProtoConverterTest { @Test public void allValuesConvertedToProto() { - PatchSet patchSet = new PatchSet(PatchSet.id(new Change.Id(103), 73)); + PatchSet patchSet = new PatchSet(PatchSet.id(Change.id(103), 73)); patchSet.setRevision(new RevId("aabbccddeeff")); patchSet.setUploader(Account.id(452)); patchSet.setCreatedOn(new Timestamp(930349320L)); @@ -64,7 +64,7 @@ public class PatchSetProtoConverterTest { @Test public void mandatoryValuesConvertedToProto() { - PatchSet patchSet = new PatchSet(PatchSet.id(new Change.Id(103), 73)); + PatchSet patchSet = new PatchSet(PatchSet.id(Change.id(103), 73)); Entities.PatchSet proto = patchSetProtoConverter.toProto(patchSet); @@ -80,7 +80,7 @@ public class PatchSetProtoConverterTest { @Test public void allValuesConvertedToProtoAndBackAgain() { - PatchSet patchSet = new PatchSet(PatchSet.id(new Change.Id(103), 73)); + PatchSet patchSet = new PatchSet(PatchSet.id(Change.id(103), 73)); patchSet.setRevision(new RevId("aabbccddeeff")); patchSet.setUploader(Account.id(452)); patchSet.setCreatedOn(new Timestamp(930349320L)); @@ -95,7 +95,7 @@ public class PatchSetProtoConverterTest { @Test public void mandatoryValuesConvertedToProtoAndBackAgain() { - PatchSet patchSet = new PatchSet(PatchSet.id(new Change.Id(103), 73)); + PatchSet patchSet = new PatchSet(PatchSet.id(Change.id(103), 73)); PatchSet convertedPatchSet = patchSetProtoConverter.fromProto(patchSetProtoConverter.toProto(patchSet)); diff --git a/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java b/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java index 4bfefed7a5..a50d8a8ca6 100644 --- a/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java +++ b/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java @@ -115,7 +115,7 @@ public class LabelNormalizerTest extends GerritBaseTests { input.newBranch = true; input.subject = "Test change"; ChangeInfo info = gApi.changes().create(input).get(); - notes = changeNotesFactory.createChecked(allProjects, new Change.Id(info._number)); + notes = changeNotesFactory.createChecked(allProjects, Change.id(info._number)); change = notes.getChange(); } diff --git a/javatests/com/google/gerrit/server/edit/ChangeEditTest.java b/javatests/com/google/gerrit/server/edit/ChangeEditTest.java index 86a315387c..307ff89587 100644 --- a/javatests/com/google/gerrit/server/edit/ChangeEditTest.java +++ b/javatests/com/google/gerrit/server/edit/ChangeEditTest.java @@ -27,7 +27,7 @@ public class ChangeEditTest extends GerritBaseTests { @Test public void changeEditRef() throws Exception { Account.Id accountId = Account.id(1000042); - Change.Id changeId = new Change.Id(56414); + Change.Id changeId = Change.id(56414); PatchSet.Id psId = PatchSet.id(changeId, 50); String refName = RefNames.refsEdit(accountId, changeId, psId); assertEquals("refs/users/42/1000042/edit-56414/50", refName); diff --git a/javatests/com/google/gerrit/server/git/GroupCollectorTest.java b/javatests/com/google/gerrit/server/git/GroupCollectorTest.java index 222e04ba46..a712c94e37 100644 --- a/javatests/com/google/gerrit/server/git/GroupCollectorTest.java +++ b/javatests/com/google/gerrit/server/git/GroupCollectorTest.java @@ -285,7 +285,7 @@ public class GroupCollectorTest extends GerritBaseTests { // TODO(dborowitz): Tests for octopus merges. private static PatchSet.Id psId(int c, int p) { - return PatchSet.id(new Change.Id(c), p); + return PatchSet.id(Change.id(c), p); } private RevWalk newWalk(ObjectId start, ObjectId branchTip) throws Exception { diff --git a/javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java b/javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java index d3762afe04..4159cf6901 100644 --- a/javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java +++ b/javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java @@ -63,7 +63,7 @@ public class ChangeFieldTest extends GerritBaseTests { .containsExactly( "REVIEWER,1", "REVIEWER,1," + t1.getTime(), "CC,2", "CC,2," + t2.getTime()); - assertThat(ChangeField.parseReviewerFieldValues(new Change.Id(1), values)).isEqualTo(reviewers); + assertThat(ChangeField.parseReviewerFieldValues(Change.id(1), values)).isEqualTo(reviewers); } @Test diff --git a/javatests/com/google/gerrit/server/index/change/StalenessCheckerTest.java b/javatests/com/google/gerrit/server/index/change/StalenessCheckerTest.java index 2df03d571c..c8f3341eee 100644 --- a/javatests/com/google/gerrit/server/index/change/StalenessCheckerTest.java +++ b/javatests/com/google/gerrit/server/index/change/StalenessCheckerTest.java @@ -44,7 +44,7 @@ public class StalenessCheckerTest extends GerritBaseTests { private static final Project.NameKey P1 = Project.nameKey("project1"); private static final Project.NameKey P2 = Project.nameKey("project2"); - private static final Change.Id C = new Change.Id(1234); + private static final Change.Id C = Change.id(1234); private GitRepositoryManager repoManager; private Repository r1; diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesCacheTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesCacheTest.java index e880968660..114108077f 100644 --- a/javatests/com/google/gerrit/server/notedb/ChangeNotesCacheTest.java +++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesCacheTest.java @@ -32,7 +32,7 @@ public final class ChangeNotesCacheTest { ChangeNotesCache.Key key = ChangeNotesCache.Key.create( Project.nameKey("project"), - new Change.Id(1234), + Change.id(1234), ObjectId.fromString("deadbeefdeadbeefdeadbeefdeadbeefdeadbeef")); byte[] serialized = ChangeNotesCache.Key.Serializer.INSTANCE.serialize(key); assertThat(ChangeNotesKeyProto.parseFrom(serialized)) diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java index 2dab9b016d..ebb4691ba8 100644 --- a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java +++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java @@ -62,7 +62,7 @@ import org.junit.Before; import org.junit.Test; public class ChangeNotesStateTest extends GerritBaseTests { - private static final Change.Id ID = new Change.Id(123); + private static final Change.Id ID = Change.id(123); private static final ObjectId SHA = ObjectId.fromString("1234567812345678123456781234567812345678"); private static final ByteString SHA_BYTES = ObjectIdConverter.create().toByteString(SHA); @@ -298,7 +298,7 @@ public class ChangeNotesStateTest extends GerritBaseTests { @Test public void serializeRevertOf() throws Exception { assertRoundTrip( - newBuilder().columns(cols.toBuilder().revertOf(new Change.Id(999)).build()).build(), + newBuilder().columns(cols.toBuilder().revertOf(Change.id(999)).build()).build(), ChangeNotesStateProto.newBuilder() .setMetaId(SHA_BYTES) .setChangeId(ID.get()) diff --git a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index e7a97e89fc..f07ba4c2ef 100644 --- a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -2435,7 +2435,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { public void byCommitsOnBranchNotMergedSkipsMissingChanges() throws Exception { TestRepository repo = createProject("repo"); ObjectId missing = - repo.branch(PatchSet.id(new Change.Id(987654), 1).toRefName()) + repo.branch(PatchSet.id(Change.id(987654), 1).toRefName()) .commit() .message("No change for this commit") .insertChangeId() @@ -2591,8 +2591,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { gApi.changes().id(changeToRevert.id).current().submit(); ChangeInfo changeThatReverts = gApi.changes().id(changeToRevert.id).revert().get(); - assertQueryByIds( - "revertof:" + changeToRevert._number, new Change.Id(changeThatReverts._number)); + assertQueryByIds("revertof:" + changeToRevert._number, Change.id(changeThatReverts._number)); } /** Change builder for helping in tests for dashboard sections. */ @@ -3208,7 +3207,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { branch = "refs/heads/" + branch; } - Change.Id id = new Change.Id(seq.nextChangeId()); + Change.Id id = Change.id(seq.nextChangeId()); ChangeInserter ins = changeFactory .create(id, commit, branch) @@ -3392,7 +3391,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { } protected static Iterable ids(Iterable changes) { - return Streams.stream(changes).map(c -> new Change.Id(c._number)).collect(toList()); + return Streams.stream(changes).map(c -> Change.id(c._number)).collect(toList()); } protected static long lastUpdatedMs(Change c) { diff --git a/javatests/com/google/gerrit/server/query/change/ChangeDataTest.java b/javatests/com/google/gerrit/server/query/change/ChangeDataTest.java index 46ebf9bcdd..8158cdfb89 100644 --- a/javatests/com/google/gerrit/server/query/change/ChangeDataTest.java +++ b/javatests/com/google/gerrit/server/query/change/ChangeDataTest.java @@ -29,7 +29,7 @@ public class ChangeDataTest extends GerritBaseTests { @Test public void setPatchSetsClearsCurrentPatchSet() throws Exception { Project.NameKey project = Project.nameKey("project"); - ChangeData cd = ChangeData.createForTest(project, new Change.Id(1), 1); + ChangeData cd = ChangeData.createForTest(project, Change.id(1), 1); cd.setChange(TestChanges.newChange(project, Account.id(1000))); PatchSet curr1 = cd.currentPatchSet(); int currId = curr1.getId().get(); diff --git a/javatests/com/google/gerrit/server/query/change/RegexPathPredicateTest.java b/javatests/com/google/gerrit/server/query/change/RegexPathPredicateTest.java index db9180821e..1b2d3bfdf3 100644 --- a/javatests/com/google/gerrit/server/query/change/RegexPathPredicateTest.java +++ b/javatests/com/google/gerrit/server/query/change/RegexPathPredicateTest.java @@ -83,7 +83,7 @@ public class RegexPathPredicateTest extends GerritBaseTests { private static ChangeData change(String... files) { Arrays.sort(files); - ChangeData cd = ChangeData.createForTest(Project.nameKey("project"), new Change.Id(1), 1); + ChangeData cd = ChangeData.createForTest(Project.nameKey("project"), Change.id(1), 1); cd.setCurrentFilePaths(Arrays.asList(files)); return cd; } diff --git a/javatests/com/google/gerrit/server/rules/IgnoreSelfApprovalRuleTest.java b/javatests/com/google/gerrit/server/rules/IgnoreSelfApprovalRuleTest.java index 3a377e2526..3839a39105 100644 --- a/javatests/com/google/gerrit/server/rules/IgnoreSelfApprovalRuleTest.java +++ b/javatests/com/google/gerrit/server/rules/IgnoreSelfApprovalRuleTest.java @@ -33,7 +33,7 @@ import java.util.List; import org.junit.Test; public class IgnoreSelfApprovalRuleTest extends GerritBaseTests { - private static final Change.Id CHANGE_ID = new Change.Id(100); + private static final Change.Id CHANGE_ID = Change.id(100); private static final PatchSet.Id PS_ID = PatchSet.id(CHANGE_ID, 1); private static final LabelType VERIFIED = makeLabel("Verified"); private static final Account.Id USER1 = makeAccount(100001); diff --git a/javatests/com/google/gerrit/server/update/BatchUpdateTest.java b/javatests/com/google/gerrit/server/update/BatchUpdateTest.java index f3d2ac7610..698a0b5321 100644 --- a/javatests/com/google/gerrit/server/update/BatchUpdateTest.java +++ b/javatests/com/google/gerrit/server/update/BatchUpdateTest.java @@ -228,7 +228,7 @@ public class BatchUpdateTest extends GerritBaseTests { private Change.Id createChangeWithUpdates(int totalUpdates) throws Exception { checkArgument(totalUpdates > 0); checkArgument(totalUpdates <= MAX_UPDATES); - Change.Id id = new Change.Id(sequences.nextChangeId()); + Change.Id id = Change.id(sequences.nextChangeId()); try (BatchUpdate bu = batchUpdateFactory.create(project, user.get(), TimeUtil.nowTs())) { bu.insertChange( changeInserterFactory.create( diff --git a/plugins/hooks b/plugins/hooks index a108d1df76..9401a4ec26 160000 --- a/plugins/hooks +++ b/plugins/hooks @@ -1 +1 @@ -Subproject commit a108d1df76ee42dd20cc7c64ab166f6c05ee8283 +Subproject commit 9401a4ec2656f05fa636def116ce566bf7318bc7