commit 7bbb996d0edf851b843e2632aa133c95a5ebd264
author David Pursehouse <dpursehouse@collab.net> Mon Jan 07 23:23:43 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 07 23:23:43 2019 +0000
tree a0da59372e5d94c375d1db9fd8ac7de79c25a488
parent 381e31956b3ac27f84127ea13a9f15d29b64021d
parent 0ce896f33593fe1ad853646195cd38ab0eade2b7

Merge changes I2541ef92,I6a08a4d1

* changes:
  ForProject: Deduplicate refs when converting to map
  Make DeleteChangeOp.Factory public

java/com/google/gerrit/server/permissions/PermissionBackend.java

diff --git a/java/com/google/gerrit/server/permissions/PermissionBackend.java b/java/com/google/gerrit/server/permissions/PermissionBackend.java
index f0f7f42..a87eb24 100644
--- a/java/com/google/gerrit/server/permissions/PermissionBackend.java
+++ b/java/com/google/gerrit/server/permissions/PermissionBackend.java
@@ -348,7 +348,7 @@
      */
     public Map<String, Ref> filter(List<Ref> refs, Repository repo, RefFilterOptions opts)
         throws PermissionBackendException {
-      return filter(refs.stream().collect(toMap(Ref::getName, r -> r)), repo, opts);
+      return filter(refs.stream().collect(toMap(Ref::getName, r -> r, (a, b) -> b)), repo, opts);
     }
   }
 

java/com/google/gerrit/server/restapi/change/DeleteChangeOp.java

diff --git a/java/com/google/gerrit/server/restapi/change/DeleteChangeOp.java b/java/com/google/gerrit/server/restapi/change/DeleteChangeOp.java
index 05de507..80bdd1a 100644
--- a/java/com/google/gerrit/server/restapi/change/DeleteChangeOp.java
+++ b/java/com/google/gerrit/server/restapi/change/DeleteChangeOp.java
@@ -38,8 +38,8 @@
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.revwalk.RevWalk;
 
-class DeleteChangeOp implements BatchUpdateOp {
-  interface Factory {
+public class DeleteChangeOp implements BatchUpdateOp {
+  public interface Factory {
     DeleteChangeOp create(Change.Id id);
   }