opendev/gerrit
Code Issues Proposed changes

Merge "ListProjects: Remove parent candidates option"

Browse Source
This commit is contained in:
David Pursehouse
2019-01-22 23:56:30 +00:00
committed by Gerrit Code Review
parent 231b22e8d5 f7479fda63
commit 3307aed7b1
3 changed files with 2 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/com/google/gerrit/extensions/api/projects/Projects.java
View File

@@ -80,7 +80,6 @@ public interface Projects {
abstract class ListRequest {
public enum FilterType {
CODE,
PARENT_CANDIDATES,
PERMISSIONS,
ALL
}

3
java/com/google/gerrit/server/api/projects/ProjectsImpl.java
View File

@@ -118,9 +118,6 @@ class ProjectsImpl implements Projects {
case CODE:
type = FilterType.CODE;
break;
case PARENT_CANDIDATES:
type = FilterType.PARENT_CANDIDATES;
break;
case PERMISSIONS:
type = FilterType.PERMISSIONS;
break;

47
java/com/google/gerrit/server/restapi/project/ListProjects.java
View File

@@ -69,7 +69,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.SortedMap;
import java.util.SortedSet;
import java.util.TreeMap;
@@ -97,17 +96,6 @@ public class ListProjects implements RestReadView<TopLevelResource> {
return true;
}
},
PARENT_CANDIDATES {
@Override
boolean matches(Repository git) {
return true;
}
@Override
boolean useMatch() {
return false;
}
},
PERMISSIONS {
@Override
boolean matches(Repository git) throws IOException {
@@ -339,11 +327,6 @@ public class ListProjects implements RestReadView<TopLevelResource> {
new PrintWriter(new BufferedWriter(new OutputStreamWriter(displayOutputStream, UTF_8)));
}
if (type == FilterType.PARENT_CANDIDATES) {
// Historically, PARENT_CANDIDATES implied showDescription.
showDescription = true;
}
int foundIndex = 0;
int found = 0;
TreeMap<String, ProjectInfo> output = new TreeMap<>();
@@ -447,10 +430,8 @@ public class ListProjects implements RestReadView<TopLevelResource> {
continue;
}
if (type != FilterType.PARENT_CANDIDATES) {
List<WebLinkInfo> links = webLinks.getProjectLinks(projectName.get());
info.webLinks = links.isEmpty() ? null : links;
}
List<WebLinkInfo> links = webLinks.getProjectLinks(projectName.get());
info.webLinks = links.isEmpty() ? null : links;
if (foundIndex++ < start) {
continue;
@@ -509,9 +490,6 @@ public class ListProjects implements RestReadView<TopLevelResource> {
private Collection<Project.NameKey> filter(PermissionBackend.WithUser perm)
throws BadRequestException, PermissionBackendException {
Stream<Project.NameKey> matches = scan();
if (type == FilterType.PARENT_CANDIDATES) {
matches = parentsOf(matches);
}
List<Project.NameKey> results = new ArrayList<>();
List<Project.NameKey> projectNameKeys = matches.sorted().collect(toList());
@@ -536,27 +514,6 @@ public class ListProjects implements RestReadView<TopLevelResource> {
return results;
}
private Stream<Project.NameKey> parentsOf(Stream<Project.NameKey> matches) {
return matches
.map(
p -> {
ProjectState ps = projectCache.get(p);
if (ps != null) {
Project.NameKey parent = ps.getProject().getParent();
if (parent != null) {
if (projectCache.get(parent) != null) {
return parent;
}
logger.atWarning().log(
"parent project %s of project %s not found", parent.get(), ps.getName());
}
}
return null;
})
.filter(Objects::nonNull)
.distinct();
}
private boolean isParentAccessible(
Map<Project.NameKey, Boolean> checked, PermissionBackend.WithUser perm, ProjectState state)
throws PermissionBackendException {