Remove unused code and set the right field with WARNING

2 files changed, 4 insertions, 9 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index 043a4fd4f3e..63711b55d27 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -285,7 +285,7 @@ public class ApplicationController {
             application = application.with(new Deployment(zone, revision, version, clock.instant()));
             store(application, lock);
 
-            return new ActivateResult(new RevisionId(applicationPackage.hash()), preparedApplication.messages(), preparedApplication.prepareResponse());
+            return new ActivateResult(new RevisionId(applicationPackage.hash()), preparedApplication.prepareResponse());
         }
     }
 
@@ -295,8 +295,9 @@ public class ApplicationController {
         logEntry.time = clock.instant().toEpochMilli();
         logEntry.message = "Ignoring deployment of " + get(applicationId) + " to " + zone + " as a deployment is not currently expected";
         PrepareResponse prepareResponse = new PrepareResponse();
+        prepareResponse.log = Collections.singletonList(logEntry);
         prepareResponse.configChangeActions = new ConfigChangeActions(Collections.emptyList(), Collections.emptyList());
-        return new ActivateResult(new RevisionId(applicationPackage.hash()), Collections.singletonList(logEntry), prepareResponse);
+        return new ActivateResult(new RevisionId(applicationPackage.hash()), prepareResponse);
     }
 
     private Application deleteRemovedDeployments(Application application) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/ActivateResult.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/ActivateResult.java
index 1fb6a4a8582..6b1c5d56a5f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/ActivateResult.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/ActivateResult.java
@@ -13,12 +13,10 @@ import java.util.List;
 public class ActivateResult {
 
     private final RevisionId revisionId;
-    private final List<Log> messages;
     private final PrepareResponse prepareResponse;
 
-    public ActivateResult(RevisionId revisionId, List<Log> messages, PrepareResponse prepareResponse) {
+    public ActivateResult(RevisionId revisionId, PrepareResponse prepareResponse) {
         this.revisionId = revisionId;
-        this.messages = messages;
         this.prepareResponse = prepareResponse;
     }
 
@@ -26,10 +24,6 @@ public class ActivateResult {
         return revisionId;
     }
 
-    public List<Log> getMessages() {
-        return messages;
-    }
-
     public PrepareResponse getPrepareResponse() {
         return prepareResponse;
     }