summaryrefslogtreecommitdiffstats
path: root/vespa-athenz
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2022-06-02 16:11:32 +0200
committergjoranv <gv@verizonmedia.com>2022-06-08 11:45:26 +0200
commitda36b1957fad0b49ba53de7c35b859a3b55bc501 (patch)
treee19b0cb0e4d0b211fb67154ba3c769b3943b4985 /vespa-athenz
parentdcddd40a4e24b004f00d3be7d9c0e66cf1e2d9a1 (diff)
Don't provide Jetty bundles from 'container' artifact
Add dependency on 'jetty-http' with scope test instead of adding false dependencies with 'container-test'.
Diffstat (limited to 'vespa-athenz')
-rw-r--r--vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java
index 8a587592c71..5b884e3dfb3 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java
@@ -16,7 +16,6 @@ import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
-import org.eclipse.jetty.http.HttpStatus;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
@@ -80,7 +79,8 @@ public class DefaultIdentityDocumentClient implements IdentityDocumentClient {
.build();
try (CloseableHttpResponse response = client.execute(request)) {
String responseContent = EntityUtils.toString(response.getEntity());
- if (HttpStatus.isSuccess(response.getStatusLine().getStatusCode())) {
+ int statusCode = response.getStatusLine().getStatusCode();
+ if (statusCode >= 200 && statusCode <= 299) {
SignedIdentityDocumentEntity entity = objectMapper.readValue(responseContent, SignedIdentityDocumentEntity.class);
return EntityBindingsMapper.toSignedIdentityDocument(entity);
} else {
@@ -88,7 +88,7 @@ public class DefaultIdentityDocumentClient implements IdentityDocumentClient {
String.format(
"Failed to retrieve identity document for host %s: %d - %s",
host,
- response.getStatusLine().getStatusCode(),
+ statusCode,
responseContent));
}
}