diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-04-26 14:18:24 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2018-04-26 14:52:19 +0200 |
| commit | 9a8cadbc2a131bd406e5c7fe8794e3e55b9390eb (patch) | |
| tree | 6cdd1557a7a29166ef91b8b0e11c541a2379503a /controller-server | |
| parent | 6cf9d69055c604b18ce1d364d0ebbee83e9b4c52 (diff) | |
Fix exception message
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java | 8 |
1 files changed, 7 insertions, 1 deletions
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 c98bc79485a..d8ed99f116c 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 @@ -78,6 +78,7 @@ import com.yahoo.vespa.hosted.controller.restapi.filter.SetBouncerPassthruHeader import com.yahoo.vespa.hosted.controller.tenant.AthenzTenant; import com.yahoo.vespa.hosted.controller.tenant.Tenant; import com.yahoo.vespa.hosted.controller.tenant.UserTenant; +import com.yahoo.vespa.hosted.controller.versions.VespaVersion; import com.yahoo.vespa.serviceview.bindings.ApplicationView; import com.yahoo.yolean.Exceptions; @@ -98,6 +99,7 @@ import java.util.Objects; import java.util.Optional; import java.util.Scanner; import java.util.logging.Level; +import java.util.stream.Collectors; /** * This implements the application/v4 API which is used to deploy and manage applications @@ -675,7 +677,11 @@ public class ApplicationApiHandler extends LoggingRequestHandler { if ( ! systemHasVersion(version)) throw new IllegalArgumentException("Cannot trigger deployment of version '" + version + "': " + "Version is not active in this system. " + - "Active versions: " + controller.versionStatus().versions()); + "Active versions: " + controller.versionStatus().versions() + .stream() + .map(VespaVersion::versionNumber) + .map(Version::toString) + .collect(Collectors.joining(", "))); ApplicationId id = ApplicationId.from(tenantName, applicationName, "default"); controller.applications().lockOrThrow(id, application -> { |