Use QueryProjects#apply without parameters
The apply(TopLevelResource) method doesn't actually use the given resource parameter, and only exists to satisfy the interface of its parent RestReadView. A variant of the method without the TopLevelResource parameter was added in change Ia8ded07a5. Modify callers to use that. Change-Id: I15af0d1cb35750c8aec4b2f42339901c48332889
This commit is contained in:
@@ -22,7 +22,6 @@ import com.google.gerrit.extensions.api.projects.Projects;
|
|||||||
import com.google.gerrit.extensions.common.ProjectInfo;
|
import com.google.gerrit.extensions.common.ProjectInfo;
|
||||||
import com.google.gerrit.extensions.restapi.BadRequestException;
|
import com.google.gerrit.extensions.restapi.BadRequestException;
|
||||||
import com.google.gerrit.extensions.restapi.RestApiException;
|
import com.google.gerrit.extensions.restapi.RestApiException;
|
||||||
import com.google.gerrit.extensions.restapi.TopLevelResource;
|
|
||||||
import com.google.gerrit.extensions.restapi.UnprocessableEntityException;
|
import com.google.gerrit.extensions.restapi.UnprocessableEntityException;
|
||||||
import com.google.gerrit.server.permissions.PermissionBackendException;
|
import com.google.gerrit.server.permissions.PermissionBackendException;
|
||||||
import com.google.gerrit.server.restapi.project.ListProjects;
|
import com.google.gerrit.server.restapi.project.ListProjects;
|
||||||
@@ -158,7 +157,7 @@ class ProjectsImpl implements Projects {
|
|||||||
.withQuery(r.getQuery())
|
.withQuery(r.getQuery())
|
||||||
.withLimit(r.getLimit())
|
.withLimit(r.getLimit())
|
||||||
.withStart(r.getStart())
|
.withStart(r.getStart())
|
||||||
.apply(TopLevelResource.INSTANCE);
|
.apply();
|
||||||
} catch (OrmException e) {
|
} catch (OrmException e) {
|
||||||
throw new RestApiException("Cannot query projects", e);
|
throw new RestApiException("Cannot query projects", e);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ import com.google.gerrit.extensions.restapi.BadRequestException;
|
|||||||
import com.google.gerrit.extensions.restapi.ResourceConflictException;
|
import com.google.gerrit.extensions.restapi.ResourceConflictException;
|
||||||
import com.google.gerrit.extensions.restapi.RestApiException;
|
import com.google.gerrit.extensions.restapi.RestApiException;
|
||||||
import com.google.gerrit.extensions.restapi.RestReadView;
|
import com.google.gerrit.extensions.restapi.RestReadView;
|
||||||
import com.google.gerrit.extensions.restapi.TopLevelResource;
|
|
||||||
import com.google.gerrit.reviewdb.client.Project;
|
import com.google.gerrit.reviewdb.client.Project;
|
||||||
import com.google.gerrit.server.permissions.PermissionBackend;
|
import com.google.gerrit.server.permissions.PermissionBackend;
|
||||||
import com.google.gerrit.server.permissions.PermissionBackendException;
|
import com.google.gerrit.server.permissions.PermissionBackendException;
|
||||||
@@ -90,7 +89,7 @@ public class ListChildProjects implements RestReadView<ProjectResource> {
|
|||||||
.get()
|
.get()
|
||||||
.withQuery("parent:" + parent.get())
|
.withQuery("parent:" + parent.get())
|
||||||
.withLimit(limit)
|
.withLimit(limit)
|
||||||
.apply(TopLevelResource.INSTANCE)
|
.apply()
|
||||||
.stream()
|
.stream()
|
||||||
.filter(
|
.filter(
|
||||||
p ->
|
p ->
|
||||||
|
|||||||
Reference in New Issue
Block a user