From 29234349cc188aa8f7fc948b3208d83a87f461e3 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Mon, 26 Apr 2021 16:54:12 +0200 Subject: Avoid leaking apache classes --- .../api/integration/configserver/ConfigServerException.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 5e4d3345b7a..d651eda7139 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 @@ -44,14 +44,14 @@ public class ConfigServerException extends RuntimeException { INCOMPLETE_RESPONSE } - public static ConfigServerException readException(int statusCode, byte[] body, ClassicHttpRequest request) { + 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() : "(no message)"; - return new ConfigServerException(code, message, request + " failed with status " + statusCode); + return new ConfigServerException(code, message, context); } } -- cgit v1.2.3