diff options
author | Jon Bratseth <bratseth@vespa.ai> | 2023-06-14 11:31:53 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@vespa.ai> | 2023-06-14 11:31:53 +0200 |
commit | 7fe56a076bb3ee34071a8c81e051f6a5669a3cac (patch) | |
tree | 1803846e74348e412648acbaecdecd9ba3b07a5e /configserver | |
parent | acfa9206524c4e49e946522dfdbe4c9e8d292785 (diff) |
No functional changes
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java index 9a6e4632071..61fe2f77224 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java @@ -68,7 +68,6 @@ import static com.yahoo.vespa.config.server.application.ConfigConvergenceChecker import static com.yahoo.vespa.config.server.application.ConfigConvergenceChecker.ServiceResponse; import static com.yahoo.yolean.Exceptions.uncheck; - /** * Operations on applications (delete, wait for config convergence, restart, application content etc.) * @@ -393,18 +392,16 @@ public class ApplicationHandler extends HttpHandler { static class HttpServiceResponse extends JSONResponse { public static HttpServiceResponse createResponse(ConfigConvergenceChecker.ServiceResponse serviceResponse, String hostAndPort, URI uri) { - switch (serviceResponse.status) { - case ok: - return createOkResponse(uri, hostAndPort, serviceResponse.wantedGeneration, serviceResponse.currentGeneration, serviceResponse.converged); - case hostNotFound: - return createHostNotFoundInAppResponse(uri, hostAndPort, serviceResponse.wantedGeneration); - case notFound: - return createNotFoundResponse(uri, hostAndPort, serviceResponse.wantedGeneration, serviceResponse.errorMessage.orElse("")); - case error: - return createErrorResponse(uri, hostAndPort, serviceResponse.wantedGeneration, serviceResponse.errorMessage.orElse("")); - default: - throw new IllegalArgumentException("Unknown status " + serviceResponse.status); - } + return switch (serviceResponse.status) { + case ok -> + createOkResponse(uri, hostAndPort, serviceResponse.wantedGeneration, serviceResponse.currentGeneration, serviceResponse.converged); + case hostNotFound -> + createHostNotFoundInAppResponse(uri, hostAndPort, serviceResponse.wantedGeneration); + case notFound -> + createNotFoundResponse(uri, hostAndPort, serviceResponse.wantedGeneration, serviceResponse.errorMessage.orElse("")); + case error -> + createErrorResponse(uri, hostAndPort, serviceResponse.wantedGeneration, serviceResponse.errorMessage.orElse("")); + }; } private HttpServiceResponse(int status, URI uri, String hostname, Long wantedGeneration) { |