You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/01/28 13:45:20 UTC
svn commit: r1780690 - in
/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4:
HTTPProxyConfigurator.java HTTPSenderImpl.java RequestImpl.java
Author: veithen
Date: Sat Jan 28 13:45:20 2017
New Revision: 1780690
URL: http://svn.apache.org/viewvc?rev=1780690&view=rev
Log:
Eliminate all usages of the deprecated HttpParams API.
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPProxyConfigurator.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java
Modified: axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPProxyConfigurator.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPProxyConfigurator.java?rev=1780690&r1=1780689&r2=1780690&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPProxyConfigurator.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPProxyConfigurator.java Sat Jan 28 13:45:20 2017
@@ -33,8 +33,7 @@ import org.apache.http.auth.AuthScope;
import org.apache.http.auth.Credentials;
import org.apache.http.auth.NTCredentials;
import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.params.ClientPNames;
-import org.apache.http.conn.params.ConnRoutePNames;
+import org.apache.http.client.config.RequestConfig;
import org.apache.http.impl.client.AbstractHttpClient;
import javax.xml.namespace.QName;
@@ -63,7 +62,7 @@ public class HTTPProxyConfigurator {
* @throws org.apache.axis2.AxisFault
* if Proxy settings are invalid
*/
- public static void configure(MessageContext messageContext, AbstractHttpClient httpClient)
+ public static void configure(MessageContext messageContext, AbstractHttpClient httpClient, RequestConfig.Builder requestConfig)
throws AxisFault {
Credentials proxyCredentials = null;
@@ -142,11 +141,11 @@ public class HTTPProxyConfigurator {
if (proxyCredentials != null) {
// TODO : Set preemptive authentication, but its not recommended in HC 4
- httpClient.getParams().setParameter(ClientPNames.HANDLE_AUTHENTICATION, true);
+ requestConfig.setAuthenticationEnabled(true);
httpClient.getCredentialsProvider().setCredentials(AuthScope.ANY, proxyCredentials);
HttpHost proxy = new HttpHost(proxyHost, proxyPort);
- httpClient.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
+ requestConfig.setProxy(proxy);
}
}
Modified: axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java?rev=1780690&r1=1780689&r2=1780690&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java Sat Jan 28 13:45:20 2017
@@ -29,7 +29,6 @@ import org.apache.axis2.transport.http.R
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.client.params.AuthPolicy;
-import org.apache.http.client.params.ClientPNames;
import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.conn.scheme.PlainSocketFactory;
import org.apache.http.conn.scheme.Scheme;
@@ -38,10 +37,6 @@ import org.apache.http.conn.ssl.SSLSocke
import org.apache.http.impl.client.AbstractHttpClient;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.conn.PoolingClientConnectionManager;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.params.HttpParams;
import java.net.URL;
@@ -114,9 +109,7 @@ public class HTTPSenderImpl extends HTTP
* Create a new instance of HttpClient since the way it is used here
* it's not fully thread-safe.
*/
- HttpParams clientParams = new BasicHttpParams();
- clientParams.setParameter(CoreProtocolPNames.HTTP_ELEMENT_CHARSET, "UTF-8");
- httpClient = new DefaultHttpClient(connManager, clientParams);
+ httpClient = new DefaultHttpClient(connManager);
//We don't need to set timeout for connection manager, since we are doing it below
// and its enough
Modified: axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java?rev=1780690&r1=1780689&r2=1780690&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java Sat Jan 28 13:45:20 2017
@@ -46,17 +46,12 @@ import org.apache.http.auth.AuthScope;
import org.apache.http.auth.Credentials;
import org.apache.http.auth.NTCredentials;
import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.auth.params.AuthPNames;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.client.params.AuthPolicy;
-import org.apache.http.client.params.ClientPNames;
import org.apache.http.impl.auth.NTLMSchemeFactory;
import org.apache.http.impl.client.AbstractHttpClient;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.params.HttpParams;
import org.apache.http.protocol.BasicHttpContext;
import org.apache.http.protocol.HttpContext;
import org.apache.http.util.EntityUtils;
@@ -204,15 +199,9 @@ final class RequestImpl implements Reque
HTTPConstants.COMPRESSION_GZIP);
}
- if (msgContext.getProperty(HTTPConstants.HTTP_METHOD_PARAMS) != null) {
- HttpParams params = (HttpParams) msgContext
- .getProperty(HTTPConstants.HTTP_METHOD_PARAMS);
- method.setParams(params);
- }
-
String cookiePolicy = (String) msgContext.getProperty(HTTPConstants.COOKIE_POLICY);
if (cookiePolicy != null) {
- method.getParams().setParameter(ClientPNames.COOKIE_POLICY, cookiePolicy);
+ requestConfig.setCookieSpec(cookiePolicy);
}
method.setConfig(requestConfig.build());
@@ -249,7 +238,7 @@ final class RequestImpl implements Reque
if (log.isDebugEnabled()) {
log.debug("Configuring HTTP proxy.");
}
- HTTPProxyConfigurator.configure(msgContext, httpClient);
+ HTTPProxyConfigurator.configure(msgContext, httpClient, requestConfig);
}
}
@@ -260,7 +249,7 @@ final class RequestImpl implements Reque
*/
@Override
public void enableAuthentication(HTTPAuthenticator authenticator) {
- method.getParams().setBooleanParameter(ClientPNames.HANDLE_AUTHENTICATION, true);
+ requestConfig.setAuthenticationEnabled(true);
String username = authenticator.getUsername();
String password = authenticator.getPassword();
@@ -316,7 +305,7 @@ final class RequestImpl implements Reque
authPrefs.add(authenticator.getAuthPolicyPref(scheme));
}
- httpClient.getParams().setParameter(AuthPNames.TARGET_AUTH_PREF, authPrefs);
+ requestConfig.setTargetPreferredAuthSchemes(authPrefs);
}
}
}