Code review fixes

4 files changed, 8 insertions, 7 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackage.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackage.java
index 827a7554a36..d0e8a0f2816 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackage.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackage.java
@@ -190,7 +190,7 @@ public class ApplicationPackage {
     }
 
     /** Creates a valid application package that will remove all application's deployments */
-    public static ApplicationPackage createEmptyForDeploymentRemoval() {
+    public static ApplicationPackage deploymentRemoval() {
         DeploymentSpec deploymentSpec = DeploymentSpec.empty;
         ValidationOverrides validationOverrides = allValidationOverrides();
         try (ZipBuilder zipBuilder = new ZipBuilder(deploymentSpec.xmlForm().length() + validationOverrides.xmlForm().length() + 500)) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 7f03cc84802..15d34828734 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -284,7 +284,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
         if (path.matches("/application/v4/tenant/{tenant}")) return deleteTenant(path.get("tenant"), request);
         if (path.matches("/application/v4/tenant/{tenant}/key")) return removeDeveloperKey(path.get("tenant"), request);
         if (path.matches("/application/v4/tenant/{tenant}/application/{application}")) return deleteApplication(path.get("tenant"), path.get("application"), request);
-        if (path.matches("/application/v4/tenant/{tenant}/application/{application}/deployment")) return removeProdAllDeployments(path.get("tenant"), path.get("application"));
+        if (path.matches("/application/v4/tenant/{tenant}/application/{application}/deployment")) return removeAllProdDeployments(path.get("tenant"), path.get("application"));
         if (path.matches("/application/v4/tenant/{tenant}/application/{application}/deploying")) return cancelDeploy(path.get("tenant"), path.get("application"), "default", "all");
         if (path.matches("/application/v4/tenant/{tenant}/application/{application}/deploying/{choice}")) return cancelDeploy(path.get("tenant"), path.get("application"), "default", path.get("choice"));
         if (path.matches("/application/v4/tenant/{tenant}/application/{application}/key")) return removeDeployKey(path.get("tenant"), path.get("application"), request);
@@ -1907,10 +1907,11 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
                                                             dataParts.get(EnvironmentResource.APPLICATION_TEST_ZIP));
     }
 
-    private HttpResponse removeProdAllDeployments(String tenant, String application) {
-        return JobControllerApiHandlerHelper.submitResponse(controller.jobController(), tenant, application,
+    private HttpResponse removeAllProdDeployments(String tenant, String application) {
+        JobControllerApiHandlerHelper.submitResponse(controller.jobController(), tenant, application,
                 Optional.empty(), Optional.empty(), Optional.empty(), 1,
-                ApplicationPackage.createEmptyForDeploymentRemoval(), new byte[0]);
+                ApplicationPackage.deploymentRemoval(), new byte[0]);
+        return new MessageResponse("All deployments removed");
     }
 
     private static Map<String, byte[]> parseDataParts(HttpRequest request) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackageTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackageTest.java
index 63e0d7cd6c6..f7f0c9ce58e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackageTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackageTest.java
@@ -16,7 +16,7 @@ import static org.junit.Assert.assertTrue;
 public class ApplicationPackageTest {
     @Test
     public void test_createEmptyForDeploymentRemoval() {
-        ApplicationPackage app = ApplicationPackage.createEmptyForDeploymentRemoval();
+        ApplicationPackage app = ApplicationPackage.deploymentRemoval();
         assertEquals(DeploymentSpec.empty, app.deploymentSpec());
         assertEquals(List.of(), app.trustedCertificates());
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index 0b26b66ccef..10682218353 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -996,7 +996,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
         tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/deployment", DELETE)
                         .userIdentity(USER_ID)
                         .oktaAccessToken(OKTA_AT).oktaIdentityToken(OKTA_IT),
-                "{\"message\":\"Application package version: 1.0.2-unknown\"}");
+                "{\"message\":\"All deployments removed\"}");
 
         assertEquals(Set.of(ZoneId.from("dev.us-east-1")), app.instance().deployments().keySet());
     }