Adapt to master with RefPermissionOrLabel Gerrit master introduced RefPermissionOrLabel which would need the virtualhost plugin to rename its overridden methods. Change-Id: I82973fc19eb0ce6451a1ef60ce790b844ea59854
diff --git a/src/main/java/com/gerritforge/gerrit/modules/virtualhost/ForHiddenProject.java b/src/main/java/com/gerritforge/gerrit/modules/virtualhost/ForHiddenProject.java index 769d242..4e17e69 100644 --- a/src/main/java/com/gerritforge/gerrit/modules/virtualhost/ForHiddenProject.java +++ b/src/main/java/com/gerritforge/gerrit/modules/virtualhost/ForHiddenProject.java
@@ -25,7 +25,7 @@ import com.google.gerrit.server.permissions.PermissionBackend.ForRef; import com.google.gerrit.server.permissions.PermissionBackend.RefFilterOptions; import com.google.gerrit.server.permissions.PermissionBackendException; -import com.google.gerrit.server.permissions.RefPermission; +import com.google.gerrit.server.permissions.RefPermissionOrLabel; import com.google.gerrit.server.query.change.ChangeData; import java.util.Collection; import java.util.Collections; @@ -56,12 +56,12 @@ } @Override - public void check(RefPermission perm) throws AuthException, PermissionBackendException { + public void check(RefPermissionOrLabel perm) throws AuthException, PermissionBackendException { throwDenied(); } @Override - public Set<RefPermission> test(Collection<RefPermission> permSet) + public <T extends RefPermissionOrLabel> Set<T> test(Collection<T> permSet) throws PermissionBackendException { return Collections.emptySet(); } @@ -72,7 +72,7 @@ } @Override - public BooleanCondition testCond(RefPermission perm) { + public BooleanCondition testCond(RefPermissionOrLabel perm) { return BooleanCondition.FALSE; } }