From 3a8ff484fb1b6b4c1d39f085e89a754f58acabac Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Sun, 23 Apr 2017 19:02:00 +0200 Subject: Revert "ning 1.9.40" --- .../yahoo/jdisc/http/client/ChunkedRequest.java | 6 ++++- .../com/yahoo/jdisc/http/client/EmptyResponse.java | 5 ++-- .../com/yahoo/jdisc/http/client/HttpClient.java | 28 ++++++++++++---------- .../client/filter/core/ResponseFilterBridge.java | 17 +++++-------- .../yahoo/jdisc/http/test/ClientTestDriver.java | 5 ++-- .../filter/core/ResponseFilterBridgeTestCase.java | 2 +- 6 files changed, 33 insertions(+), 30 deletions(-) (limited to 'jdisc_http_service') diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/ChunkedRequest.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/ChunkedRequest.java index 862074d4b15..6da40f3c443 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/ChunkedRequest.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/ChunkedRequest.java @@ -26,7 +26,11 @@ final class ChunkedRequest { RequestBuilder builder = RequestBuilderFactory.newInstance(request, method); ChunkedRequestContent content = new ChunkedRequestContent(request); builder.setBody(content); - ningClient.executeRequest(builder.build(), new AsyncResponseHandler(request, handler, metric, ctx)); + try { + ningClient.executeRequest(builder.build(), new AsyncResponseHandler(request, handler, metric, ctx)); + } catch (IOException e) { + throw new RuntimeException(e); + } return content; } } diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/EmptyResponse.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/EmptyResponse.java index 5529aa62f5f..19e9190a32b 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/EmptyResponse.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/EmptyResponse.java @@ -1,10 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.http.client; -import com.ning.http.client.cookie.Cookie; +import com.ning.http.client.Cookie; import com.ning.http.client.FluentCaseInsensitiveStringsMap; import com.ning.http.client.Response; -import com.ning.http.client.uri.Uri; import java.io.IOException; import java.io.InputStream; @@ -71,7 +70,7 @@ final class EmptyResponse implements Response { } @Override - public Uri getUri() { + public URI getUri() throws MalformedURLException { return null; } diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/HttpClient.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/HttpClient.java index f0027364baa..5480e8fca87 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/HttpClient.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/HttpClient.java @@ -188,34 +188,38 @@ public class HttpClient extends AbstractClientProvider { HostnameVerifier hostnameVerifier, SSLContext sslContext, List responseFilters) { AsyncHttpClientConfig.Builder builder = new AsyncHttpClientConfig.Builder(); - builder.setAllowPoolingConnections(config.connectionPoolEnabled()); - builder.setAllowPoolingSslConnections(config.sslConnectionPoolEnabled()); - builder.setCompressionEnforced(config.compressionEnabled()); - builder.setConnectTimeout((int)(config.connectionTimeout() * 1000)); + builder.setAllowPoolingConnection(config.connectionPoolEnabled()); + builder.setAllowSslConnectionPool(config.sslConnectionPoolEnabled()); + builder.setCompressionEnabled(config.compressionEnabled()); + builder.setConnectionTimeoutInMs((int)(config.connectionTimeout() * 1000)); builder.setExecutorService(Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2, threadFactory)); - builder.setFollowRedirect(config.followRedirects()); + builder.setFollowRedirects(config.followRedirects()); builder.setHostnameVerifier(hostnameVerifier); builder.setIOThreadMultiplier(2); - builder.setPooledConnectionIdleTimeout((int)(config.idleConnectionInPoolTimeout() * 1000)); + builder.setIdleConnectionInPoolTimeoutInMs((int)(config.idleConnectionInPoolTimeout() * 1000)); + builder.setIdleConnectionTimeoutInMs((int)(config.idleConnectionTimeout() * 1000)); builder.setMaxRequestRetry(config.chunkedEncodingEnabled() ? 0 : config.maxNumRetries()); - builder.setMaxConnectionsPerHost(config.maxNumConnectionsPerHost()); - builder.setMaxConnections(config.maxNumConnections()); - builder.setMaxRedirects(config.maxNumRedirects()); + builder.setMaximumConnectionsPerHost(config.maxNumConnectionsPerHost()); + builder.setMaximumConnectionsTotal(config.maxNumConnections()); + builder.setMaximumNumberOfRedirects(config.maxNumRedirects()); if (!config.proxyServer().isEmpty()) { builder.setProxyServer(ProxyServerFactory.newInstance(URI.create(config.proxyServer()))); } - builder.setRequestTimeout((int)(config.requestTimeout() * 1000)); + builder.setRemoveQueryParamsOnRedirect(config.removeQueryParamsOnRedirect()); + builder.setRequestCompressionLevel(config.compressionLevel()); + builder.setRequestTimeoutInMs((int)(config.requestTimeout() * 1000)); builder.setSSLContext(sslContext); builder.setUseProxyProperties(config.useProxyProperties()); + builder.setUseRawUrl(config.useRawUri()); builder.setUserAgent(config.userAgent()); - builder.setWebSocketTimeout((int)(config.idleWebSocketTimeout() * 1000)); + builder.setWebSocketIdleTimeoutInMs((int)(config.idleWebSocketTimeout() * 1000)); for (final ResponseFilter responseFilter : responseFilters) { builder.addResponseFilter(new com.ning.http.client.filter.ResponseFilter() { @Override @SuppressWarnings("rawtypes") - public FilterContext filter(FilterContext filterContext) throws FilterException { + public FilterContext filter(FilterContext filterContext) throws FilterException { /* * TODO: returned ResponseFilterContext is ignored right now. * For now, we return the input filterContext until there is a need for custom filterContext diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/filter/core/ResponseFilterBridge.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/filter/core/ResponseFilterBridge.java index 8754dc150b7..6d895ad0f93 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/filter/core/ResponseFilterBridge.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/filter/core/ResponseFilterBridge.java @@ -5,7 +5,6 @@ import com.ning.http.client.filter.FilterContext; import com.yahoo.jdisc.Request; import com.yahoo.jdisc.http.client.filter.ResponseFilterContext; -import java.net.URISyntaxException; import java.util.Collections; /** @@ -14,16 +13,12 @@ import java.util.Collections; public class ResponseFilterBridge { public static ResponseFilterContext toResponseFilterContext(FilterContext filterContext, Request request) { - try { - return new ResponseFilterContext.Builder() - .uri(filterContext.getRequest().getUri().toJavaNetURI()) - .statusCode(filterContext.getResponseStatus().getStatusCode()) - .headers(filterContext.getResponseHeaders().getHeaders()) - .requestContext(request == null ? Collections.emptyMap() : request.context()) - .build(); - } catch (URISyntaxException e) { - throw new RuntimeException("Bad URI", e); - } + return new ResponseFilterContext.Builder() + .uri(filterContext.getRequest().getURI()) + .statusCode(filterContext.getResponseStatus().getStatusCode()) + .headers(filterContext.getResponseHeaders().getHeaders()) + .requestContext(request == null ? Collections.emptyMap() : request.context()) + .build(); } } diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/test/ClientTestDriver.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/test/ClientTestDriver.java index f3b7b595227..1a5553fb608 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/test/ClientTestDriver.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/test/ClientTestDriver.java @@ -4,7 +4,8 @@ package com.yahoo.jdisc.http.test; import com.google.inject.AbstractModule; import com.google.inject.Module; import com.google.inject.TypeLiteral; -import com.ning.http.util.DefaultHostnameVerifier; +import com.google.inject.name.Names; +import com.ning.http.util.AllowAllHostnameVerifier; import com.yahoo.jdisc.application.ContainerBuilder; import com.yahoo.jdisc.http.client.HttpClient; import com.yahoo.jdisc.http.client.HttpClientConfig; @@ -90,7 +91,7 @@ public class ClientTestDriver { @Override protected void configure() { - bind(HostnameVerifier.class).to(DefaultHostnameVerifier.class); + bind(HostnameVerifier.class).to(AllowAllHostnameVerifier.class); bind(new TypeLiteral>() { }).toInstance(Collections.emptyList()); } }; diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/client/filter/core/ResponseFilterBridgeTestCase.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/client/filter/core/ResponseFilterBridgeTestCase.java index 8930c429a89..b2154349549 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/client/filter/core/ResponseFilterBridgeTestCase.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/client/filter/core/ResponseFilterBridgeTestCase.java @@ -59,7 +59,7 @@ public class ResponseFilterBridgeTestCase { URL url = new URL("http://localhost:8080/echo"); URI reqURI = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(), url.getPath(), url.getQuery(), url.getRef()); - when(request.getUri().toJavaNetURI()).thenReturn(reqURI); + when(request.getURI()).thenReturn(reqURI); HttpResponseStatus responseStatus = mock(HttpResponseStatus.class); when(responseStatus.getStatusCode()).thenReturn(200); -- cgit v1.2.3