diff options
author | Harald Musum <musum@yahooinc.com> | 2023-05-22 14:58:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-22 14:58:34 +0200 |
commit | f8fda07e9542664277e1835c9d6d1fd136ea6b6a (patch) | |
tree | 7142bc363c83a669abec26288b83d2225da1c77c /controller-api | |
parent | 38601194dc7ece53e180005f10f26c3858956ce6 (diff) |
Revert "Revert "Use another exception and error in response when quota is exceed""
Diffstat (limited to 'controller-api')
-rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerException.java | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerException.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerException.java index 2b35334e14b..7b5166dc84e 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerException.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerException.java @@ -1,13 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.integration.configserver; -import com.yahoo.slime.Inspector; -import com.yahoo.slime.SlimeUtils; - -import java.util.stream.Stream; - -import static java.nio.charset.StandardCharsets.UTF_8; - /** * An exception due to server error, a bad request, or similar. * @@ -49,17 +42,8 @@ public class ConfigServerException extends RuntimeException { CERTIFICATE_NOT_READY, LOAD_BALANCER_NOT_READY, INCOMPLETE_RESPONSE, - CONFIG_NOT_CONVERGED - } - - public static ConfigServerException readException(byte[] body, String context) { - Inspector root = SlimeUtils.jsonToSlime(body).get(); - String codeName = root.field("error-code").asString(); - ErrorCode code = Stream.of(ErrorCode.values()) - .filter(value -> value.name().equals(codeName)) - .findAny().orElse(ErrorCode.INCOMPLETE_RESPONSE); - String message = root.field("message").valid() ? root.field("message").asString() : new String(body, UTF_8); - return new ConfigServerException(code, message, context); + CONFIG_NOT_CONVERGED, + QUOTA_EXCEEDED } } |