Adapt to changed REST interfaces in Gerrit core
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Iae47c7625c4978a9826e25ad637150763313e81a
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeletePreconditions.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeletePreconditions.java
index de6b816..4b8d30d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeletePreconditions.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeletePreconditions.java
@@ -137,7 +137,7 @@
private void assertHasNoChildProjects(ProjectResource rsrc) throws CannotDeleteProjectException {
try {
- List<ProjectInfo> children = listChildProjectsProvider.get().withLimit(1).apply(rsrc);
+ List<ProjectInfo> children = listChildProjectsProvider.get().withLimit(1).apply(rsrc).value();
if (!children.isEmpty()) {
throw new CannotDeleteProjectException(
"Cannot delete project because it has at least one child: "
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteProject.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteProject.java
index 4ffd01c..a5fe6e7 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteProject.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteProject.java
@@ -66,7 +66,8 @@
}
@Override
- public Object apply(ProjectResource rsrc, Input input) throws IOException, RestApiException {
+ public Response<?> apply(ProjectResource rsrc, Input input)
+ throws IOException, RestApiException {
preConditions.assertDeletePermission(rsrc);
preConditions.assertCanBeDeleted(rsrc, input);
diff --git a/src/test/java/com/googlesource/gerrit/plugins/deleteproject/DeletePreconditionsTest.java b/src/test/java/com/googlesource/gerrit/plugins/deleteproject/DeletePreconditionsTest.java
index b2cc319..b56eacf 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/deleteproject/DeletePreconditionsTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/deleteproject/DeletePreconditionsTest.java
@@ -28,6 +28,7 @@
import com.google.gerrit.extensions.common.ProjectInfo;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
+import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.git.GitRepositoryManager;
@@ -139,7 +140,7 @@
ListChildProjects childProjects = mock(ListChildProjects.class);
when(listChildProjectsProvider.get()).thenReturn(childProjects);
when(childProjects.withLimit(1)).thenReturn(childProjects);
- when(childProjects.apply(rsrc)).thenReturn(ImmutableList.of(new ProjectInfo()));
+ when(childProjects.apply(rsrc)).thenReturn(Response.ok(ImmutableList.of(new ProjectInfo())));
expectedException.expect(ResourceConflictException.class);
expectedException.expectMessage("Cannot delete project because it has at least one child:");
preConditions.assertCanBeDeleted(rsrc, new DeleteProject.Input());
