opendev/gerrit
Code Issues Proposed changes

Migrate from to-be-deprecated multimap factory methods

Browse Source 
Guava will soon prefer explicitly stating intention with
MultimapBuilder, rather than callers having to know about specific
Multimap implementations.

Change-Id: I96babb895eb5a51f27ef65f02eaf99bf07d913a9
This commit is contained in:
Dave Borowitz
2016-12-07 10:04:10 -05:00
committed by Edwin Kempin
parent 6360a1b694
commit b3e1918cc8
30 changed files with 98 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedIn.java
View File

@@ -14,8 +14,8 @@
package com.google.gerrit.server.change;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import com.google.common.collect.MultimapBuilder;
import com.google.gerrit.extensions.config.ExternalIncludedIn;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.restapi.BadRequestException;
@@ -81,7 +81,8 @@ class IncludedIn implements RestReadView<ChangeResource> {
}
IncludedInResolver.Result d = IncludedInResolver.resolve(r, rw, rev);
Multimap<String, String> external = ArrayListMultimap.create();
Multimap<String, String> external =
MultimapBuilder.hashKeys().arrayListValues().build();
for (ExternalIncludedIn ext : includedIn) {
Multimap<String, String> extIncludedIns = ext.getIncludedIn(
project.get(), rev.name(), d.getTags(), d.getBranches());