diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-12-03 09:51:29 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-12-03 12:34:52 +0100 |
commit | 19e8b5b05b1f220164bcf89e4e43feb4db6af84b (patch) | |
tree | e3e49bb5cab9dc3053deb41586bbef1bc40c4e10 /controller-server | |
parent | d3b7166a42985d15699cdce421421ef25d1fdd0e (diff) |
Reapply "Remove Servlet integration from container-core [run-systemtest]""
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ApplicationRequestToDiscFilterRequestWrapper.java | 80 |
1 files changed, 14 insertions, 66 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ApplicationRequestToDiscFilterRequestWrapper.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ApplicationRequestToDiscFilterRequestWrapper.java index b25cb913c83..5f580b6f6b3 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ApplicationRequestToDiscFilterRequestWrapper.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ApplicationRequestToDiscFilterRequestWrapper.java @@ -2,13 +2,9 @@ package com.yahoo.vespa.hosted.controller.restapi; import com.yahoo.application.container.handler.Request; -import com.yahoo.jdisc.HeaderFields; -import com.yahoo.jdisc.http.Cookie; import com.yahoo.jdisc.http.HttpRequest; import com.yahoo.jdisc.http.filter.DiscFilterRequest; -import com.yahoo.jdisc.http.servlet.ServletOrJdiscHttpRequest; -import java.net.SocketAddress; import java.net.URI; import java.security.Principal; import java.security.cert.X509Certificate; @@ -16,7 +12,11 @@ import java.util.Collections; import java.util.Enumeration; import java.util.List; import java.util.Map; -import java.util.concurrent.TimeUnit; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; /** * Wraps an {@link Request} into a {@link DiscFilterRequest}. Only a few methods are supported. @@ -35,72 +35,20 @@ public class ApplicationRequestToDiscFilterRequestWrapper extends DiscFilterRequ } public ApplicationRequestToDiscFilterRequestWrapper(Request request, List<X509Certificate> clientCertificateChain) { - super(new ServletOrJdiscHttpRequest() { - @Override - public void copyHeaders(HeaderFields target) { - request.getHeaders().forEach(target::add); - } - - @Override - public Map<String, List<String>> parameters() { - return Collections.emptyMap(); - } - - @Override - public URI getUri() { - return URI.create(request.getUri()).normalize(); // Consistent with what JDisc does. - } - - @Override - public HttpRequest.Version getVersion() { - throw new UnsupportedOperationException(); - } - - @Override - public String getRemoteHostAddress() { - throw new UnsupportedOperationException(); - } - - @Override - public String getRemoteHostName() { - throw new UnsupportedOperationException(); - } - - @Override - public int getRemotePort() { - throw new UnsupportedOperationException(); - } - - @Override - public void setRemoteAddress(SocketAddress remoteAddress) { - throw new UnsupportedOperationException(); - } - - @Override - public Map<String, Object> context() { - throw new UnsupportedOperationException(); - } - - @Override - public List<Cookie> decodeCookieHeader() { - throw new UnsupportedOperationException(); - } - - @Override - public void encodeCookieHeader(List<Cookie> cookies) { - throw new UnsupportedOperationException(); - } - - @Override - public long getConnectedAt(TimeUnit unit) { - throw new UnsupportedOperationException(); - } - }); + super(createDummyHttpRequest(request)); this.request = request; this.userPrincipal = request.getUserPrincipal().orElse(null); this.clientCertificateChain = clientCertificateChain; } + private static HttpRequest createDummyHttpRequest(Request req) { + HttpRequest dummy = mock(HttpRequest.class, invocation -> { throw new UnsupportedOperationException(); }); + doReturn(URI.create(req.getUri()).normalize()).when(dummy).getUri(); + doNothing().when(dummy).copyHeaders(any()); + doReturn(Map.of()).when(dummy).parameters(); + return dummy; + } + public Request getUpdatedRequest() { Request updatedRequest = new Request(this.request.getUri(), this.request.getBody(), this.request.getMethod(), this.userPrincipal); this.request.getHeaders().forEach(updatedRequest.getHeaders()::put); |