diff --git a/java/com/google/gerrit/acceptance/DisabledChangeIndex.java b/java/com/google/gerrit/acceptance/DisabledChangeIndex.java index 0d473afcc9..d39edec937 100644 --- a/java/com/google/gerrit/acceptance/DisabledChangeIndex.java +++ b/java/com/google/gerrit/acceptance/DisabledChangeIndex.java @@ -20,7 +20,6 @@ import com.google.gerrit.index.query.DataSource; import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.Change.Id; import com.google.gerrit.server.index.change.ChangeIndex; import com.google.gerrit.server.query.change.ChangeData; import java.io.IOException; @@ -59,7 +58,7 @@ public class DisabledChangeIndex implements ChangeIndex { } @Override - public void delete(Id key) throws IOException { + public void delete(Change.Id key) throws IOException { throw new UnsupportedOperationException("ChangeIndex is disabled"); } diff --git a/java/com/google/gerrit/acceptance/ReadOnlyChangeIndex.java b/java/com/google/gerrit/acceptance/ReadOnlyChangeIndex.java index 5209f9065c..d4fd318c64 100644 --- a/java/com/google/gerrit/acceptance/ReadOnlyChangeIndex.java +++ b/java/com/google/gerrit/acceptance/ReadOnlyChangeIndex.java @@ -19,7 +19,7 @@ import com.google.gerrit.index.Schema; import com.google.gerrit.index.query.DataSource; import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; -import com.google.gerrit.reviewdb.client.Change.Id; +import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.server.index.change.ChangeIndex; import com.google.gerrit.server.query.change.ChangeData; import java.io.IOException; @@ -51,7 +51,7 @@ class ReadOnlyChangeIndex implements ChangeIndex { } @Override - public void delete(Id key) throws IOException { + public void delete(Change.Id key) throws IOException { // do nothing } diff --git a/java/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImpl.java b/java/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImpl.java index 1f2fa683b6..28be3f3a7e 100644 --- a/java/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImpl.java +++ b/java/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImpl.java @@ -17,7 +17,6 @@ package com.google.gerrit.acceptance.testsuite.project; import com.google.common.base.Preconditions; import com.google.gerrit.acceptance.testsuite.project.TestProjectCreation.Builder; import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.client.Project.NameKey; import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.project.CreateProjectArgs; @@ -63,7 +62,7 @@ public class ProjectOperationsImpl implements ProjectOperations { } @Override - public ProjectOperations.PerProjectOperations project(NameKey key) { + public ProjectOperations.PerProjectOperations project(Project.NameKey key) { return new PerProjectOperations(key); } diff --git a/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java b/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java index cf4022bae5..69dde395f5 100644 --- a/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java +++ b/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java @@ -40,7 +40,6 @@ import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.Change.Id; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.converter.ChangeProtoConverter; import com.google.gerrit.reviewdb.converter.PatchSetApprovalProtoConverter; @@ -181,7 +180,7 @@ class ElasticChangeIndex extends AbstractElasticIndex } @Override - protected String getDeleteActions(Id c) { + protected String getDeleteActions(Change.Id c) { if (client.adapter().usePostV5Type()) { return delete(ElasticQueryAdapter.POST_V5_TYPE, c); } diff --git a/java/com/google/gerrit/httpd/raw/ToolServlet.java b/java/com/google/gerrit/httpd/raw/ToolServlet.java index 2f522a2944..0d707a6fd6 100644 --- a/java/com/google/gerrit/httpd/raw/ToolServlet.java +++ b/java/com/google/gerrit/httpd/raw/ToolServlet.java @@ -25,7 +25,6 @@ import static org.eclipse.jgit.util.HttpSupport.HDR_PRAGMA; import com.google.gerrit.common.Version; import com.google.gerrit.server.tools.ToolsCatalog; -import com.google.gerrit.server.tools.ToolsCatalog.Entry; import com.google.gerrit.util.http.RequestUtil; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -50,7 +49,7 @@ public class ToolServlet extends HttpServlet { @Override protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException { - Entry ent = toc.get(req.getPathInfo()); + ToolsCatalog.Entry ent = toc.get(req.getPathInfo()); if (ent == null) { rsp.sendError(SC_NOT_FOUND); return; @@ -71,7 +70,7 @@ public class ToolServlet extends HttpServlet { } } - private void doGetFile(Entry ent, HttpServletResponse rsp) throws IOException { + private void doGetFile(ToolsCatalog.Entry ent, HttpServletResponse rsp) throws IOException { byte[] tosend = ent.getBytes(); rsp.setDateHeader(HDR_EXPIRES, 0L); @@ -84,8 +83,8 @@ public class ToolServlet extends HttpServlet { } } - private void doGetDirectory(Entry ent, HttpServletRequest req, HttpServletResponse rsp) - throws IOException { + private void doGetDirectory( + ToolsCatalog.Entry ent, HttpServletRequest req, HttpServletResponse rsp) throws IOException { String path = "/tools/" + ent.getPath(); Document page = newDocument(); @@ -108,9 +107,9 @@ public class ToolServlet extends HttpServlet { Element ul = page.createElement("ul"); body.appendChild(ul); - for (Entry e : ent.getChildren()) { + for (ToolsCatalog.Entry e : ent.getChildren()) { String name = e.getName(); - if (e.getType() == Entry.Type.DIR && !name.endsWith("/")) { + if (e.getType() == ToolsCatalog.Entry.Type.DIR && !name.endsWith("/")) { name += "/"; } diff --git a/java/com/google/gerrit/server/DynamicOptions.java b/java/com/google/gerrit/server/DynamicOptions.java index dcc96d5c13..11d33360d1 100644 --- a/java/com/google/gerrit/server/DynamicOptions.java +++ b/java/com/google/gerrit/server/DynamicOptions.java @@ -26,7 +26,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.WeakHashMap; /** Helper class to define and parse options from plugins on ssh and RestAPI commands. */ @@ -267,7 +266,7 @@ public class DynamicOptions { } public void parseDynamicBeans(CmdLineParser clp) { - for (Entry e : beansByPlugin.entrySet()) { + for (Map.Entry e : beansByPlugin.entrySet()) { clp.parseWithPrefix("--" + e.getKey(), e.getValue()); } clp.drainOptionQueue(); @@ -276,14 +275,14 @@ public class DynamicOptions { public void setDynamicBeans() { if (bean instanceof BeanReceiver) { BeanReceiver receiver = (BeanReceiver) bean; - for (Entry e : beansByPlugin.entrySet()) { + for (Map.Entry e : beansByPlugin.entrySet()) { receiver.setDynamicBean(e.getKey(), e.getValue()); } } } public void onBeanParseStart() { - for (Entry e : beansByPlugin.entrySet()) { + for (Map.Entry e : beansByPlugin.entrySet()) { DynamicBean instance = e.getValue(); if (instance instanceof BeanParseListener) { BeanParseListener listener = (BeanParseListener) instance; @@ -293,7 +292,7 @@ public class DynamicOptions { } public void onBeanParseEnd() { - for (Entry e : beansByPlugin.entrySet()) { + for (Map.Entry e : beansByPlugin.entrySet()) { DynamicBean instance = e.getValue(); if (instance instanceof BeanParseListener) { BeanParseListener listener = (BeanParseListener) instance; diff --git a/java/com/google/gerrit/server/PublishCommentUtil.java b/java/com/google/gerrit/server/PublishCommentUtil.java index 25db8d9105..75a364ccb2 100644 --- a/java/com/google/gerrit/server/PublishCommentUtil.java +++ b/java/com/google/gerrit/server/PublishCommentUtil.java @@ -21,7 +21,6 @@ import static java.util.stream.Collectors.toSet; import com.google.gerrit.common.Nullable; import com.google.gerrit.reviewdb.client.Comment; import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.reviewdb.client.PatchSet.Id; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.patch.PatchListCache; import com.google.gerrit.server.patch.PatchListNotAvailableException; @@ -55,7 +54,7 @@ public class PublishCommentUtil { return; } - Map patchSets = + Map patchSets = psUtil.getAsMap(notes, drafts.stream().map(d -> psId(notes, d)).collect(toSet())); for (Comment d : drafts) { PatchSet ps = patchSets.get(psId(notes, d)); diff --git a/java/com/google/gerrit/server/account/Preferences.java b/java/com/google/gerrit/server/account/Preferences.java index 6767b85dec..f33d8fe3db 100644 --- a/java/com/google/gerrit/server/account/Preferences.java +++ b/java/com/google/gerrit/server/account/Preferences.java @@ -50,7 +50,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Optional; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.lib.CommitBuilder; @@ -574,7 +573,7 @@ public class Preferences { } int i = 1; - for (Entry e : urlAliases.entrySet()) { + for (Map.Entry e : urlAliases.entrySet()) { cfg.setString(URL_ALIAS, URL_ALIAS + i, KEY_MATCH, e.getKey()); cfg.setString(URL_ALIAS, URL_ALIAS + i, KEY_TOKEN, e.getValue()); i++; diff --git a/java/com/google/gerrit/server/change/LabelsJson.java b/java/com/google/gerrit/server/change/LabelsJson.java index 11442d28a1..d76cadc49b 100644 --- a/java/com/google/gerrit/server/change/LabelsJson.java +++ b/java/com/google/gerrit/server/change/LabelsJson.java @@ -41,7 +41,6 @@ import com.google.gerrit.extensions.common.ApprovalInfo; import com.google.gerrit.extensions.common.LabelInfo; import com.google.gerrit.extensions.common.VotingRangeInfo; import com.google.gerrit.reviewdb.client.Account; -import com.google.gerrit.reviewdb.client.Account.Id; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchSetApproval; import com.google.gerrit.server.ApprovalsUtil; @@ -287,7 +286,8 @@ public class LabelsJson { } Set labelNames = new HashSet<>(); - SetMultimap current = MultimapBuilder.hashKeys().hashSetValues().build(); + SetMultimap current = + MultimapBuilder.hashKeys().hashSetValues().build(); for (PatchSetApproval a : cd.currentApprovals()) { allUsers.add(a.getAccountId()); LabelType type = labelTypes.byLabel(a.getLabelId()); @@ -441,13 +441,13 @@ public class LabelsJson { // Include a user in the output for this label if either: // - They are an explicit reviewer. // - They ever voted on this change. - Set allUsers = new HashSet<>(); + Set allUsers = new HashSet<>(); allUsers.addAll(cd.reviewers().byState(ReviewerStateInternal.REVIEWER)); for (PatchSetApproval psa : cd.approvals().values()) { allUsers.add(psa.getAccountId()); } - Table current = + Table current = HashBasedTable.create(allUsers.size(), cd.getLabelTypes().getLabelTypes().size()); for (PatchSetApproval psa : cd.currentApprovals()) { current.put(psa.getAccountId(), psa.getLabel(), psa); diff --git a/java/com/google/gerrit/server/change/NotifyUtil.java b/java/com/google/gerrit/server/change/NotifyUtil.java index c29faee1d8..fa6fdfc8a6 100644 --- a/java/com/google/gerrit/server/change/NotifyUtil.java +++ b/java/com/google/gerrit/server/change/NotifyUtil.java @@ -33,7 +33,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import org.eclipse.jgit.errors.ConfigInvalidException; @Singleton @@ -80,7 +79,7 @@ public class NotifyUtil { } ListMultimap m = null; - for (Entry e : notifyDetails.entrySet()) { + for (Map.Entry e : notifyDetails.entrySet()) { List accounts = e.getValue().accounts; if (accounts != null) { if (m == null) { diff --git a/java/com/google/gerrit/server/change/RevisionJson.java b/java/com/google/gerrit/server/change/RevisionJson.java index b67028da60..42175eb559 100644 --- a/java/com/google/gerrit/server/change/RevisionJson.java +++ b/java/com/google/gerrit/server/change/RevisionJson.java @@ -47,7 +47,6 @@ import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Patch; import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.reviewdb.client.PatchSet.Id; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.AnonymousUser; import com.google.gerrit.server.CurrentUser; @@ -212,7 +211,7 @@ public class RevisionJson { AccountLoader accountLoader, ChangeData cd, Map map, - Optional limitToPsId, + Optional limitToPsId, ChangeInfo changeInfo) throws PatchListNotAvailableException, GpgException, OrmException, IOException, PermissionBackendException { diff --git a/java/com/google/gerrit/server/events/StreamEventsApiListener.java b/java/com/google/gerrit/server/events/StreamEventsApiListener.java index faddfe66a0..750b579099 100644 --- a/java/com/google/gerrit/server/events/StreamEventsApiListener.java +++ b/java/com/google/gerrit/server/events/StreamEventsApiListener.java @@ -63,7 +63,6 @@ import java.io.IOException; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import java.util.Map.Entry; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevWalk; @@ -182,7 +181,7 @@ public class StreamEventsApiListener private static Map convertApprovalsMap(Map approvals) { Map result = new HashMap<>(); - for (Entry e : approvals.entrySet()) { + for (Map.Entry e : approvals.entrySet()) { Short value = e.getValue().value == null ? null : e.getValue().value.shortValue(); result.put(e.getKey(), value); } @@ -190,7 +189,7 @@ public class StreamEventsApiListener } private ApprovalAttribute getApprovalAttribute( - LabelTypes labelTypes, Entry approval, Map oldApprovals) { + LabelTypes labelTypes, Map.Entry approval, Map oldApprovals) { ApprovalAttribute a = new ApprovalAttribute(); a.type = approval.getKey(); @@ -220,7 +219,7 @@ public class StreamEventsApiListener if (approvals.size() > 0) { ApprovalAttribute[] r = new ApprovalAttribute[approvals.size()]; int i = 0; - for (Entry approval : approvals.entrySet()) { + for (Map.Entry approval : approvals.entrySet()) { r[i++] = getApprovalAttribute(labelTypes, approval, convertApprovalsMap(oldApprovals)); } diff --git a/java/com/google/gerrit/server/git/MergeUtil.java b/java/com/google/gerrit/server/git/MergeUtil.java index ee4d71ea2d..8599fbe471 100644 --- a/java/com/google/gerrit/server/git/MergeUtil.java +++ b/java/com/google/gerrit/server/git/MergeUtil.java @@ -41,7 +41,6 @@ import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.LabelId; import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.reviewdb.client.PatchSet.Id; import com.google.gerrit.reviewdb.client.PatchSetApproval; import com.google.gerrit.server.ApprovalsUtil; import com.google.gerrit.server.IdentifiedUser; @@ -575,7 +574,7 @@ public class MergeUtil { * @return new message */ public String createCommitMessageOnSubmit( - RevCommit n, RevCommit mergeTip, ChangeNotes notes, Id id) { + RevCommit n, RevCommit mergeTip, ChangeNotes notes, PatchSet.Id id) { return commitMessageGenerator.generate( n, mergeTip, notes.getChange().getDest(), createDetailedCommitMessage(n, notes, id)); } diff --git a/java/com/google/gerrit/server/git/receive/AsyncReceiveCommits.java b/java/com/google/gerrit/server/git/receive/AsyncReceiveCommits.java index abbba86779..43d7ffc41d 100644 --- a/java/com/google/gerrit/server/git/receive/AsyncReceiveCommits.java +++ b/java/com/google/gerrit/server/git/receive/AsyncReceiveCommits.java @@ -39,7 +39,6 @@ import com.google.gerrit.server.git.DefaultAdvertiseRefsHook; import com.google.gerrit.server.git.MultiProgressMonitor; import com.google.gerrit.server.git.ProjectRunnable; import com.google.gerrit.server.git.TransferConfig; -import com.google.gerrit.server.git.receive.ResultChangeIds.Key; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackend.RefFilterOptions; import com.google.gerrit.server.permissions.PermissionBackendException; @@ -344,14 +343,14 @@ public class AsyncReceiveCommits implements PreReceiveHook { int totalChanges = 0; if (resultChangeIds.isMagicPush()) { - List created = resultChangeIds.get(Key.CREATED); - metrics.changes.record(Key.CREATED, created.size()); - List replaced = resultChangeIds.get(Key.REPLACED); - metrics.changes.record(Key.REPLACED, replaced.size()); + List created = resultChangeIds.get(ResultChangeIds.Key.CREATED); + metrics.changes.record(ResultChangeIds.Key.CREATED, created.size()); + List replaced = resultChangeIds.get(ResultChangeIds.Key.REPLACED); + metrics.changes.record(ResultChangeIds.Key.REPLACED, replaced.size()); totalChanges += replaced.size() + created.size(); } else { - List autoclosed = resultChangeIds.get(Key.AUTOCLOSED); - metrics.changes.record(Key.AUTOCLOSED, autoclosed.size()); + List autoclosed = resultChangeIds.get(ResultChangeIds.Key.AUTOCLOSED); + metrics.changes.record(ResultChangeIds.Key.AUTOCLOSED, autoclosed.size()); } if (totalChanges > 0) { diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java index 55def631d4..388d13a5c4 100644 --- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java +++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java @@ -110,7 +110,6 @@ import com.google.gerrit.server.git.MultiProgressMonitor.Task; import com.google.gerrit.server.git.ReceivePackInitializer; import com.google.gerrit.server.git.TagCache; import com.google.gerrit.server.git.ValidationError; -import com.google.gerrit.server.git.receive.ResultChangeIds.Key; import com.google.gerrit.server.git.validators.CommitValidationMessage; import com.google.gerrit.server.git.validators.RefOperationValidationException; import com.google.gerrit.server.git.validators.RefOperationValidators; @@ -810,8 +809,10 @@ class ReceiveCommits { replaceByChange .values() .stream() - .forEach(req -> resultChangeIds.add(Key.REPLACED, req.ontoChange)); - newChanges.stream().forEach(req -> resultChangeIds.add(Key.CREATED, req.changeId)); + .forEach(req -> resultChangeIds.add(ResultChangeIds.Key.REPLACED, req.ontoChange)); + newChanges + .stream() + .forEach(req -> resultChangeIds.add(ResultChangeIds.Key.CREATED, req.changeId)); if (magicBranchCmd != null) { magicBranchCmd.setResult(OK); @@ -3176,7 +3177,7 @@ class ReceiveCommits { // If we are here, we didn't throw UpdateException. Record the result. // The ordering is indeterminate due to the HashSet; unfortunately, Change.Id doesn't // fit into TreeSet. - ids.stream().forEach(id -> resultChangeIds.add(Key.AUTOCLOSED, id)); + ids.stream().forEach(id -> resultChangeIds.add(ResultChangeIds.Key.AUTOCLOSED, id)); return null; }, diff --git a/java/com/google/gerrit/server/git/validators/CommitValidators.java b/java/com/google/gerrit/server/git/validators/CommitValidators.java index e3dfa75bd2..e3b4c5127d 100644 --- a/java/com/google/gerrit/server/git/validators/CommitValidators.java +++ b/java/com/google/gerrit/server/git/validators/CommitValidators.java @@ -32,7 +32,6 @@ import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.BooleanProjectConfig; import com.google.gerrit.reviewdb.client.Branch; -import com.google.gerrit.reviewdb.client.Branch.NameKey; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.GerritPersonIdent; @@ -158,7 +157,7 @@ public class CommitValidators { public CommitValidators forGerritCommits( PermissionBackend.ForProject forProject, - NameKey branch, + Branch.NameKey branch, IdentifiedUser user, SshInfo sshInfo, RevWalk rw, diff --git a/java/com/google/gerrit/server/group/GroupAuditService.java b/java/com/google/gerrit/server/group/GroupAuditService.java index 4b851ea0b8..4c02adaf5f 100644 --- a/java/com/google/gerrit/server/group/GroupAuditService.java +++ b/java/com/google/gerrit/server/group/GroupAuditService.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.group; import com.google.common.collect.ImmutableSet; import com.google.gerrit.reviewdb.client.Account; -import com.google.gerrit.reviewdb.client.Account.Id; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.AuditEvent; import java.sql.Timestamp; @@ -27,7 +26,7 @@ public interface GroupAuditService { void dispatchAddMembers( Account.Id actor, AccountGroup.UUID updatedGroup, - ImmutableSet addedMembers, + ImmutableSet addedMembers, Timestamp addedOn); void dispatchDeleteMembers( diff --git a/java/com/google/gerrit/server/notedb/LegacyChangeNoteRead.java b/java/com/google/gerrit/server/notedb/LegacyChangeNoteRead.java index 819c8ac730..916cc16d79 100644 --- a/java/com/google/gerrit/server/notedb/LegacyChangeNoteRead.java +++ b/java/com/google/gerrit/server/notedb/LegacyChangeNoteRead.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableList; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Comment; -import com.google.gerrit.reviewdb.client.Comment.Key; import com.google.gerrit.reviewdb.client.CommentRange; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.RevId; @@ -71,7 +70,7 @@ public class LegacyChangeNoteRead { if (p.value >= note.length) { return ImmutableList.of(); } - Set seen = new HashSet<>(); + Set seen = new HashSet<>(); List result = new ArrayList<>(); int sizeOfNote = note.length; byte[] psb = ChangeNoteUtil.PATCH_SET.getBytes(UTF_8); diff --git a/java/com/google/gerrit/server/plugins/PluginLoader.java b/java/com/google/gerrit/server/plugins/PluginLoader.java index 592bed8bc2..9279f0fee4 100644 --- a/java/com/google/gerrit/server/plugins/PluginLoader.java +++ b/java/com/google/gerrit/server/plugins/PluginLoader.java @@ -55,7 +55,6 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Queue; import java.util.Set; import java.util.TreeSet; @@ -431,20 +430,21 @@ public class PluginLoader implements LifecycleListener { cleanInBackground(); } - private void addAllEntries(Map from, TreeSet> to) { - Iterator> it = from.entrySet().iterator(); + private void addAllEntries(Map from, TreeSet> to) { + Iterator> it = from.entrySet().iterator(); while (it.hasNext()) { - Entry entry = it.next(); + Map.Entry entry = it.next(); to.add(new AbstractMap.SimpleImmutableEntry<>(entry.getKey(), entry.getValue())); } } - private TreeSet> jarsFirstSortedPluginsSet(Map activePlugins) { - TreeSet> sortedPlugins = + private TreeSet> jarsFirstSortedPluginsSet( + Map activePlugins) { + TreeSet> sortedPlugins = Sets.newTreeSet( - new Comparator>() { + new Comparator>() { @Override - public int compare(Entry e1, Entry e2) { + public int compare(Map.Entry e1, Map.Entry e2) { Path n1 = e1.getValue().getFileName(); Path n2 = e2.getValue().getFileName(); return ComparisonChain.start() diff --git a/java/com/google/gerrit/server/project/ProjectConfig.java b/java/com/google/gerrit/server/project/ProjectConfig.java index f051d109f6..60d9ec6a39 100644 --- a/java/com/google/gerrit/server/project/ProjectConfig.java +++ b/java/com/google/gerrit/server/project/ProjectConfig.java @@ -75,7 +75,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Map.Entry; import java.util.Objects; import java.util.Optional; import java.util.Set; @@ -1481,7 +1480,7 @@ public class ProjectConfig extends VersionedMetaData implements ValidationError. rc.unsetSection(PLUGIN, name); } - for (Entry e : pluginConfigs.entrySet()) { + for (Map.Entry e : pluginConfigs.entrySet()) { String plugin = e.getKey(); Config pluginConfig = e.getValue(); for (String name : pluginConfig.getNames(PLUGIN, plugin)) { diff --git a/java/com/google/gerrit/server/project/Reachable.java b/java/com/google/gerrit/server/project/Reachable.java index 76ee8c90f9..29340d99d2 100644 --- a/java/com/google/gerrit/server/project/Reachable.java +++ b/java/com/google/gerrit/server/project/Reachable.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.project; import com.google.common.flogger.FluentLogger; import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.client.Project.NameKey; import com.google.gerrit.server.change.IncludedInResolver; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackend.RefFilterOptions; @@ -48,7 +47,8 @@ public class Reachable { } /** @return true if a commit is reachable from a given set of refs. */ - public boolean fromRefs(NameKey project, Repository repo, RevCommit commit, List refs) { + public boolean fromRefs( + Project.NameKey project, Repository repo, RevCommit commit, List refs) { try (RevWalk rw = new RevWalk(repo)) { Map filtered = permissionBackend diff --git a/java/com/google/gerrit/server/quota/DefaultQuotaBackend.java b/java/com/google/gerrit/server/quota/DefaultQuotaBackend.java index c6e67ca1be..1f4f48c5ca 100644 --- a/java/com/google/gerrit/server/quota/DefaultQuotaBackend.java +++ b/java/com/google/gerrit/server/quota/DefaultQuotaBackend.java @@ -20,7 +20,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.Project.NameKey; +import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.plugincontext.PluginSetContext; import com.google.gerrit.server.plugincontext.PluginSetEntryContext; @@ -125,13 +125,13 @@ public class DefaultQuotaBackend implements QuotaBackend { } @Override - public QuotaBackend.WithResource project(NameKey project) { + public QuotaBackend.WithResource project(Project.NameKey project) { QuotaRequestContext ctx = requestContext.toBuilder().project(project).build(); return new WithResource(quotaEnforcers, ctx); } @Override - public QuotaBackend.WithResource change(Change.Id change, NameKey project) { + public QuotaBackend.WithResource change(Change.Id change, Project.NameKey project) { QuotaRequestContext ctx = requestContext.toBuilder().change(change).project(project).build(); return new WithResource(quotaEnforcers, ctx); } diff --git a/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java b/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java index 87564abf64..135718b54a 100644 --- a/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java +++ b/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java @@ -32,7 +32,6 @@ import com.google.gerrit.extensions.restapi.RestModifyView; import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.reviewdb.client.Account; -import com.google.gerrit.reviewdb.client.Account.Id; import com.google.gerrit.reviewdb.client.Comment; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.Project; @@ -170,7 +169,7 @@ public class DeleteDraftComments private final Account.Id accountId; private DeletedDraftCommentInfo result; - Op(CommentFormatter commentFormatter, Id accountId) { + Op(CommentFormatter commentFormatter, Account.Id accountId) { this.commentFormatter = commentFormatter; this.accountId = accountId; } diff --git a/java/com/google/gerrit/server/restapi/change/ReviewerRecommender.java b/java/com/google/gerrit/server/restapi/change/ReviewerRecommender.java index eb79b79bfb..b2cbe80f0f 100644 --- a/java/com/google/gerrit/server/restapi/change/ReviewerRecommender.java +++ b/java/com/google/gerrit/server/restapi/change/ReviewerRecommender.java @@ -50,7 +50,6 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; @@ -190,7 +189,7 @@ public class ReviewerRecommender { } // Sort results - Stream> sorted = + Stream> sorted = reviewerScores .entrySet() .stream() diff --git a/java/com/google/gerrit/server/restapi/project/PutConfig.java b/java/com/google/gerrit/server/restapi/project/PutConfig.java index 921a59126e..150989be85 100644 --- a/java/com/google/gerrit/server/restapi/project/PutConfig.java +++ b/java/com/google/gerrit/server/restapi/project/PutConfig.java @@ -55,7 +55,6 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.regex.Pattern; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.RepositoryNotFoundException; @@ -192,10 +191,10 @@ public class PutConfig implements RestModifyView { ProjectConfig projectConfig, Map> pluginConfigValues) throws BadRequestException { - for (Entry> e : pluginConfigValues.entrySet()) { + for (Map.Entry> e : pluginConfigValues.entrySet()) { String pluginName = e.getKey(); PluginConfig cfg = projectConfig.getPluginConfig(pluginName); - for (Entry v : e.getValue().entrySet()) { + for (Map.Entry v : e.getValue().entrySet()) { ProjectConfigEntry projectConfigEntry = pluginConfigEntries.get(pluginName, v.getKey()); if (projectConfigEntry != null) { if (!PARAMETER_NAME_PATTERN.matcher(v.getKey()).matches()) { diff --git a/java/com/google/gerrit/server/restapi/project/RepositoryStatistics.java b/java/com/google/gerrit/server/restapi/project/RepositoryStatistics.java index 2a2fc866f8..9f686eb4b7 100644 --- a/java/com/google/gerrit/server/restapi/project/RepositoryStatistics.java +++ b/java/com/google/gerrit/server/restapi/project/RepositoryStatistics.java @@ -15,7 +15,7 @@ package com.google.gerrit.server.restapi.project; import com.google.common.base.CaseFormat; -import java.util.Map.Entry; +import java.util.Map; import java.util.Properties; import java.util.TreeMap; @@ -23,7 +23,7 @@ public class RepositoryStatistics extends TreeMap { private static final long serialVersionUID = 1L; RepositoryStatistics(Properties p) { - for (Entry e : p.entrySet()) { + for (Map.Entry e : p.entrySet()) { put( CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, e.getKey().toString()), e.getValue()); diff --git a/java/com/google/gerrit/sshd/commands/ScpCommand.java b/java/com/google/gerrit/sshd/commands/ScpCommand.java index b3a9a16cc1..5122b3503b 100644 --- a/java/com/google/gerrit/sshd/commands/ScpCommand.java +++ b/java/com/google/gerrit/sshd/commands/ScpCommand.java @@ -27,7 +27,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.flogger.FluentLogger; import com.google.gerrit.server.AccessPath; import com.google.gerrit.server.tools.ToolsCatalog; -import com.google.gerrit.server.tools.ToolsCatalog.Entry; import com.google.gerrit.sshd.BaseCommand; import com.google.inject.Inject; import java.io.ByteArrayOutputStream; @@ -104,14 +103,14 @@ final class ScpCommand extends BaseCommand { root = ""; } - final Entry ent = toc.get(root); + final ToolsCatalog.Entry ent = toc.get(root); if (ent == null) { throw new IOException(root + " not found"); - } else if (Entry.Type.FILE == ent.getType()) { + } else if (ToolsCatalog.Entry.Type.FILE == ent.getType()) { readFile(ent); - } else if (Entry.Type.DIR == ent.getType()) { + } else if (ToolsCatalog.Entry.Type.DIR == ent.getType()) { if (!opt_r) { throw new IOException(root + " not a regular file"); } @@ -156,7 +155,7 @@ final class ScpCommand extends BaseCommand { } } - private void readFile(Entry ent) throws IOException { + private void readFile(ToolsCatalog.Entry ent) throws IOException { byte[] data = ent.getBytes(); if (data == null) { throw new FileNotFoundException(ent.getPath()); @@ -170,12 +169,12 @@ final class ScpCommand extends BaseCommand { readAck(); } - private void readDir(Entry dir) throws IOException { + private void readDir(ToolsCatalog.Entry dir) throws IOException { header(dir, 0); readAck(); - for (Entry e : dir.getChildren()) { - if (Entry.Type.DIR == e.getType()) { + for (ToolsCatalog.Entry e : dir.getChildren()) { + if (ToolsCatalog.Entry.Type.DIR == e.getType()) { readDir(e); } else { readFile(e); @@ -187,7 +186,8 @@ final class ScpCommand extends BaseCommand { readAck(); } - private void header(Entry dir, int len) throws IOException, UnsupportedEncodingException { + private void header(ToolsCatalog.Entry dir, int len) + throws IOException, UnsupportedEncodingException { final StringBuilder buf = new StringBuilder(); switch (dir.getType()) { case DIR: diff --git a/java/com/google/gerrit/sshd/commands/ShowCaches.java b/java/com/google/gerrit/sshd/commands/ShowCaches.java index e4c14d89c6..be13a84cf4 100644 --- a/java/com/google/gerrit/sshd/commands/ShowCaches.java +++ b/java/com/google/gerrit/sshd/commands/ShowCaches.java @@ -47,7 +47,6 @@ import java.text.SimpleDateFormat; import java.util.Collection; import java.util.Date; import java.util.Map; -import java.util.Map.Entry; import org.apache.sshd.common.io.IoAcceptor; import org.apache.sshd.common.io.IoSession; import org.apache.sshd.common.io.mina.MinaSession; @@ -267,7 +266,7 @@ final class ShowCaches extends SshCommand { stdout.print(String.format(" %14s", s.name())); } stdout.print('\n'); - for (Entry> e : threadSummary.counts.entrySet()) { + for (Map.Entry> e : threadSummary.counts.entrySet()) { stdout.print(String.format(" %-22s", e.getKey())); for (Thread.State s : Thread.State.values()) { stdout.print(String.format(" %14d", nullToZero(e.getValue().get(s)))); diff --git a/java/com/google/gerrit/util/cli/OptionHandlers.java b/java/com/google/gerrit/util/cli/OptionHandlers.java index 84a0809b28..95474101d5 100644 --- a/java/com/google/gerrit/util/cli/OptionHandlers.java +++ b/java/com/google/gerrit/util/cli/OptionHandlers.java @@ -24,7 +24,7 @@ import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.TypeLiteral; import java.lang.reflect.ParameterizedType; -import java.util.Map.Entry; +import java.util.Map; @Singleton public class OptionHandlers { @@ -53,7 +53,7 @@ public class OptionHandlers { private static ImmutableMap, Provider>> build(Injector i) { ImmutableMap.Builder, Provider>> map = ImmutableMap.builder(); for (; i != null; i = i.getParent()) { - for (Entry, Binding> e : i.getBindings().entrySet()) { + for (Map.Entry, Binding> e : i.getBindings().entrySet()) { TypeLiteral type = e.getKey().getTypeLiteral(); if (type.getRawType() == OptionHandlerFactory.class && e.getKey().getAnnotation() == null diff --git a/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java b/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java index 0bbe76910f..dc84d13fc6 100644 --- a/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java +++ b/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java @@ -26,7 +26,6 @@ import com.google.gerrit.extensions.client.ChangeStatus; import com.google.gerrit.extensions.client.SubmitType; import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.client.Project.NameKey; import com.google.gerrit.server.change.TestSubmitInput; import com.google.gerrit.testing.ConfigSuite; import java.util.ArrayDeque; @@ -273,7 +272,7 @@ public class SubmoduleSubscriptionsWholeTopicMergeIT extends AbstractSubmoduleSu @Test public void updateManySubmodules() throws Exception { final int NUM = 3; - Project.NameKey subKey[] = new NameKey[NUM]; + Project.NameKey subKey[] = new Project.NameKey[NUM]; TestRepository sub[] = new TestRepository[NUM]; String prefix = RandomStringUtils.randomAlphabetic(8); for (int i = 0; i < subKey.length; i++) { diff --git a/javatests/com/google/gerrit/acceptance/ssh/SetReviewersIT.java b/javatests/com/google/gerrit/acceptance/ssh/SetReviewersIT.java index 237859c1a0..7b0088e862 100644 --- a/javatests/com/google/gerrit/acceptance/ssh/SetReviewersIT.java +++ b/javatests/com/google/gerrit/acceptance/ssh/SetReviewersIT.java @@ -21,7 +21,7 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.UseSsh; -import com.google.gerrit.reviewdb.client.Account.Id; +import com.google.gerrit.reviewdb.client.Account; import org.junit.Before; import org.junit.Test; @@ -52,7 +52,7 @@ public class SetReviewersIT extends AbstractDaemonTest { adminSshSession.exec( String.format("gerrit set-reviewers -%s %s %s", add ? "a" : "r", user.email, id)); adminSshSession.assertSuccess(); - ImmutableSet reviewers = change.getChange().getReviewers().all(); + ImmutableSet reviewers = change.getChange().getReviewers().all(); if (add) { assertThat(reviewers).contains(user.id); } else { diff --git a/javatests/com/google/gerrit/common/data/LabelFunctionTest.java b/javatests/com/google/gerrit/common/data/LabelFunctionTest.java index ef71b6725a..a534a9e8f8 100644 --- a/javatests/com/google/gerrit/common/data/LabelFunctionTest.java +++ b/javatests/com/google/gerrit/common/data/LabelFunctionTest.java @@ -21,7 +21,6 @@ import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.LabelId; import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.reviewdb.client.PatchSet.Id; import com.google.gerrit.reviewdb.client.PatchSetApproval; import com.google.gerrit.testing.GerritBaseTests; import java.sql.Date; @@ -103,7 +102,8 @@ public class LabelFunctionTest extends GerritBaseTests { return new PatchSetApproval(key, (short) value, Date.from(Instant.now())); } - private static PatchSetApproval.Key makeKey(Id psId, Account.Id accountId, LabelId labelId) { + private static PatchSetApproval.Key makeKey( + PatchSet.Id psId, Account.Id accountId, LabelId labelId) { return new PatchSetApproval.Key(psId, accountId, labelId); } diff --git a/javatests/com/google/gerrit/server/config/ListCapabilitiesTest.java b/javatests/com/google/gerrit/server/config/ListCapabilitiesTest.java index a4a196b666..081a2f75b1 100644 --- a/javatests/com/google/gerrit/server/config/ListCapabilitiesTest.java +++ b/javatests/com/google/gerrit/server/config/ListCapabilitiesTest.java @@ -20,7 +20,7 @@ import com.google.gerrit.common.data.GlobalCapability; import com.google.gerrit.extensions.annotations.Exports; import com.google.gerrit.extensions.config.CapabilityDefinition; import com.google.gerrit.extensions.registration.DynamicMap; -import com.google.gerrit.reviewdb.client.Account.Id; +import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.restapi.config.ListCapabilities; @@ -88,7 +88,7 @@ public class ListCapabilitiesTest extends GerritBaseTests { } @Override - public WithUser absentUser(Id id) { + public WithUser absentUser(Account.Id id) { throw new UnsupportedOperationException(); } diff --git a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index 9164fdbfab..fb1ac12c0b 100644 --- a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -71,7 +71,6 @@ import com.google.gerrit.index.IndexConfig; import com.google.gerrit.index.Schema; import com.google.gerrit.lifecycle.LifecycleManager; import com.google.gerrit.reviewdb.client.Account; -import com.google.gerrit.reviewdb.client.Account.Id; import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Patch; @@ -2424,7 +2423,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { return this; } - DashboardChangeState draftAndDeleteCommentBy(Id commenterId) { + DashboardChangeState draftAndDeleteCommentBy(Account.Id commenterId) { deleteDraftCommentBy.add(commenterId); return this; } diff --git a/plugins/replication b/plugins/replication index 3a470d7b52..38fc58bdd9 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 3a470d7b5268dfd3f8c2f95a7e0c493f8fb3629a +Subproject commit 38fc58bdd9b3c751b0da985e2c17b00dfab3b4fd diff --git a/plugins/webhooks b/plugins/webhooks index 48703a1cf5..edf3122969 160000 --- a/plugins/webhooks +++ b/plugins/webhooks @@ -1 +1 @@ -Subproject commit 48703a1cf5dce6af87f700ccda2c6f5949a6fa1c +Subproject commit edf3122969d445b65feef2174828e115fb1ceedc