diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-04-03 15:58:32 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-04-03 15:58:32 +0200 |
| commit | 6267acd270b8cb9a64a4e804ad5f3fb47b9268bb (patch) | |
| tree | 8590f0dec8fcd82c90264316c0b9074e9e8af61b /security-utils | |
| parent | e962344ba28b9f84028a129a24c92b40fdc076b8 (diff) | |
Use URIBuilder
Diffstat (limited to 'security-utils')
| -rw-r--r-- | security-utils/src/main/java/com/yahoo/security/tls/https/VespaHttpClientBuilder.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/https/VespaHttpClientBuilder.java b/security-utils/src/main/java/com/yahoo/security/tls/https/VespaHttpClientBuilder.java index 3b0d7a2f76b..9fa51fc36cb 100644 --- a/security-utils/src/main/java/com/yahoo/security/tls/https/VespaHttpClientBuilder.java +++ b/security-utils/src/main/java/com/yahoo/security/tls/https/VespaHttpClientBuilder.java @@ -7,6 +7,7 @@ import com.yahoo.security.tls.TransportSecurityUtils; import org.apache.http.HttpRequest; import org.apache.http.HttpRequestInterceptor; import org.apache.http.client.methods.HttpRequestBase; +import org.apache.http.client.utils.URIBuilder; import org.apache.http.conn.HttpClientConnectionManager; import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; @@ -97,7 +98,7 @@ public class VespaHttpClientBuilder { int port = originalUri.getPort(); int rewrittenPort = port != -1 ? port : 80; try { - URI rewrittenUri = new URI("https", originalUri.getUserInfo(), originalUri.getHost(), rewrittenPort, originalUri.getPath(), originalUri.getQuery(), originalUri.getFragment()); + URI rewrittenUri = new URIBuilder(originalUri).setScheme("https").setPort(rewrittenPort).build(); log.log(Level.FINE, () -> String.format("Uri rewritten from '%s' to '%s'", originalUri, rewrittenUri)); return rewrittenUri; } catch (URISyntaxException e) { |