Adjust to core moving to List interface for ref filtering Change-Id: Idb4333e0168a5f836bb2f3ad2c3c399f88333bdf
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitiles/FilteredRepository.java b/src/main/java/com/googlesource/gerrit/plugins/gitiles/FilteredRepository.java index 58f2b0f..fd2bb25 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/gitiles/FilteredRepository.java +++ b/src/main/java/com/googlesource/gerrit/plugins/gitiles/FilteredRepository.java
@@ -14,8 +14,9 @@ package com.googlesource.gerrit.plugins.gitiles; +import static java.util.stream.Collectors.toMap; + import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.restapi.AuthException; @@ -31,6 +32,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; import java.io.IOException; +import java.util.Collection; import java.util.List; import java.util.Map; import org.eclipse.jgit.attributes.AttributesNodeProvider; @@ -204,7 +206,10 @@ return null; } try { - return perm.filter(ImmutableMap.of(name, ref), git, RefFilterOptions.defaults()).get(name); + return perm.filter(ImmutableList.of(ref), git, RefFilterOptions.defaults()).stream() + .filter(r -> r.getName().equals(name)) + .findAny() + .orElse(null); } catch (PermissionBackendException e) { throw new IOException(e); } @@ -212,7 +217,7 @@ @Override public Map<String, Ref> getRefs(String prefix) throws IOException { - Map<String, Ref> refs; + Collection<Ref> refs; try { refs = perm.filter( @@ -221,11 +226,8 @@ throw new IOException(e); } Map<String, Ref> result = Maps.newHashMapWithExpectedSize(refs.size()); - for (Ref ref : refs.values()) { - // VisibleRefFilter adds the prefix to the keys, re-strip it. - result.put(ref.getName().substring(prefix.length()), ref); - } - return refs; + // VisibleRefFilter adds the prefix to the keys, re-strip it. + return refs.stream().collect(toMap(r -> r.getName().substring(prefix.length()), r -> r)); } @Override