diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-12-03 08:11:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-03 08:11:22 +0100 |
commit | 258c5987675c7b757c8c574a59e1793d1f68ea72 (patch) | |
tree | 8bd0929c62fbd2cf4ad761101ffb5df6bcce79fa /athenz-identity-provider-service/src/main | |
parent | 6e2ddaa1b917dadfda06f882a08c69a3c6b56558 (diff) |
Revert "Remove Servlet integration from container-core [run-systemtest]"
Diffstat (limited to 'athenz-identity-provider-service/src/main')
-rw-r--r-- | athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/ca/restapi/CertificateAuthorityApiHandler.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/ca/restapi/CertificateAuthorityApiHandler.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/ca/restapi/CertificateAuthorityApiHandler.java index fdb598639a7..de9ae889e2d 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/ca/restapi/CertificateAuthorityApiHandler.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/ca/restapi/CertificateAuthorityApiHandler.java @@ -6,8 +6,7 @@ import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.LoggingRequestHandler; import com.yahoo.container.jdisc.secretstore.SecretStore; -import com.yahoo.jdisc.http.server.jetty.RequestUtils; - +import com.yahoo.jdisc.http.servlet.ServletRequest; import java.util.logging.Level; import com.yahoo.restapi.ErrorResponse; import com.yahoo.restapi.Path; @@ -169,7 +168,7 @@ public class CertificateAuthorityApiHandler extends LoggingRequestHandler { } private List<X509Certificate> getRequestCertificateChain(HttpRequest request) { - return Optional.ofNullable(request.getJDiscRequest().context().get(RequestUtils.JDISC_REQUEST_X509CERT)) + return Optional.ofNullable(request.getJDiscRequest().context().get(ServletRequest.JDISC_REQUEST_X509CERT)) .map(X509Certificate[].class::cast) .map(Arrays::asList) .orElse(Collections.emptyList()); |