Author: kwright
Date: Thu Mar 20 13:00:02 2014
New Revision: 1579611
URL: http://svn.apache.org/r1579611
Log:
Fix deprecation warnings for jira connector. Part of CONNECTORS-911
Modified:
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraSession.java
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java
Modified:
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraSession.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraSession.java?rev=1579611&r1=1579610&r2=1579611&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraSession.java
(original)
+++
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraSession.java
Thu Mar 20 13:00:02 2014
@@ -39,9 +39,16 @@ import java.util.HashMap;
import java.util.List;
import java.util.ArrayList;
-import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.HttpClientConnectionManager;
import org.apache.http.client.HttpClient;
-import org.apache.http.impl.conn.PoolingClientConnectionManager;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.protocol.HttpRequestExecutor;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.config.SocketConfig;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.HttpHost;
@@ -50,20 +57,11 @@ import org.apache.http.auth.UsernamePass
import org.apache.http.auth.NTCredentials;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.client.DefaultRedirectStrategy;
import org.apache.http.util.EntityUtils;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpParams;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.conn.params.ConnRoutePNames;
-import org.apache.http.client.params.ClientPNames;
import org.apache.http.client.HttpRequestRetryHandler;
import org.apache.http.protocol.HttpContext;
-import org.apache.http.conn.scheme.Scheme;
-import org.apache.http.conn.ssl.SSLSocketFactory;
-import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
-import org.apache.http.params.CoreProtocolPNames;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.entity.ContentType;
import org.apache.http.ParseException;
@@ -82,7 +80,7 @@ public class JiraSession {
private final String clientId;
private final String clientSecret;
- private ClientConnectionManager connectionManager;
+ private HttpClientConnectionManager connectionManager;
private HttpClient httpClient;
// Current host name
@@ -118,47 +116,29 @@ public class JiraSession {
int connectionTimeout = 60000;
javax.net.ssl.SSLSocketFactory httpsSocketFactory =
KeystoreManagerFactory.getTrustingSecureSocketFactory();
- SSLSocketFactory myFactory = new SSLSocketFactory(new
InterruptibleSocketFactory(httpsSocketFactory,connectionTimeout),
- new AllowAllHostnameVerifier());
- Scheme myHttpsProtocol = new Scheme("https", 443, myFactory);
-
- PoolingClientConnectionManager localConnectionManager = new
PoolingClientConnectionManager();
- localConnectionManager.setMaxTotal(1);
- connectionManager = localConnectionManager;
- // Set up protocol registry
- connectionManager.getSchemeRegistry().register(myHttpsProtocol);
-
- BasicHttpParams params = new BasicHttpParams();
- params.setBooleanParameter(CoreProtocolPNames.USE_EXPECT_CONTINUE,true);
- params.setIntParameter(CoreProtocolPNames.WAIT_FOR_CONTINUE,socketTimeout);
- params.setBooleanParameter(CoreConnectionPNames.TCP_NODELAY,true);
-
params.setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK,true);
-
params.setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT,connectionTimeout);
- params.setIntParameter(CoreConnectionPNames.SO_TIMEOUT,socketTimeout);
- params.setBooleanParameter(ClientPNames.ALLOW_CIRCULAR_REDIRECTS,true);
- DefaultHttpClient localHttpClient = new
DefaultHttpClient(connectionManager,params);
- // No retries
- localHttpClient.setHttpRequestRetryHandler(new HttpRequestRetryHandler()
- {
- public boolean retryRequest(
- IOException exception,
- int executionCount,
- HttpContext context)
- {
- return false;
- }
-
- });
- localHttpClient.setRedirectStrategy(new DefaultRedirectStrategy());
-
+ SSLConnectionSocketFactory myFactory = new SSLConnectionSocketFactory(new
InterruptibleSocketFactory(httpsSocketFactory,connectionTimeout),
+ SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+
+ connectionManager = new PoolingHttpClientConnectionManager();
+
+ CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+
// If authentication needed, set that
if (clientId != null)
{
- localHttpClient.getCredentialsProvider().setCredentials(
+ credentialsProvider.setCredentials(
AuthScope.ANY,
new UsernamePasswordCredentials(clientId,clientSecret));
}
-
+
+ RequestConfig.Builder requestBuilder = RequestConfig.custom()
+ .setCircularRedirectsAllowed(true)
+ .setSocketTimeout(socketTimeout)
+ .setStaleConnectionCheckEnabled(true)
+ .setExpectContinueEnabled(true)
+ .setConnectTimeout(connectionTimeout)
+ .setConnectionRequestTimeout(socketTimeout);
+
// If there's a proxy, set that too.
if (proxyHost != null && proxyHost.length() > 0)
{
@@ -186,17 +166,30 @@ public class JiraSession {
if (proxyDomain == null)
proxyDomain = "";
- localHttpClient.getCredentialsProvider().setCredentials(
+ credentialsProvider.setCredentials(
new AuthScope(proxyHost, proxyPortInt),
new NTCredentials(proxyUsername, proxyPassword, currentHost,
proxyDomain));
}
HttpHost proxy = new HttpHost(proxyHost, proxyPortInt);
-
- localHttpClient.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY,
proxy);
+ requestBuilder.setProxy(proxy);
}
- httpClient = localHttpClient;
+ httpClient = HttpClients.custom()
+ .setConnectionManager(connectionManager)
+ .setMaxConnTotal(1)
+ .disableAutomaticRetries()
+ .setDefaultRequestConfig(requestBuilder.build())
+ .setDefaultSocketConfig(SocketConfig.custom()
+ .setTcpNoDelay(true)
+ .setSoTimeout(socketTimeout)
+ .build())
+ .setDefaultCredentialsProvider(credentialsProvider)
+ .setSSLSocketFactory(myFactory)
+ .setRequestExecutor(new HttpRequestExecutor(socketTimeout))
+ .setRedirectStrategy(new DefaultRedirectStrategy())
+ .build();
+
}
/**
Modified:
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java?rev=1579611&r1=1579610&r2=1579611&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java
(original)
+++
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java
Thu Mar 20 13:00:02 2014
@@ -39,9 +39,16 @@ import java.util.HashMap;
import java.util.List;
import java.util.ArrayList;
-import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.HttpClientConnectionManager;
import org.apache.http.client.HttpClient;
-import org.apache.http.impl.conn.PoolingClientConnectionManager;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.protocol.HttpRequestExecutor;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.config.SocketConfig;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.HttpHost;
@@ -50,20 +57,11 @@ import org.apache.http.auth.UsernamePass
import org.apache.http.auth.NTCredentials;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.client.DefaultRedirectStrategy;
import org.apache.http.util.EntityUtils;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpParams;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.conn.params.ConnRoutePNames;
-import org.apache.http.client.params.ClientPNames;
import org.apache.http.client.HttpRequestRetryHandler;
import org.apache.http.protocol.HttpContext;
-import org.apache.http.conn.scheme.Scheme;
-import org.apache.http.conn.ssl.SSLSocketFactory;
-import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
-import org.apache.http.params.CoreProtocolPNames;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.entity.ContentType;
import org.apache.http.ParseException;
@@ -82,7 +80,7 @@ public class JiraSession {
private final String clientId;
private final String clientSecret;
- private ClientConnectionManager connectionManager;
+ private HttpClientConnectionManager connectionManager;
private HttpClient httpClient;
// Current host name
@@ -118,47 +116,29 @@ public class JiraSession {
int connectionTimeout = 60000;
javax.net.ssl.SSLSocketFactory httpsSocketFactory =
KeystoreManagerFactory.getTrustingSecureSocketFactory();
- SSLSocketFactory myFactory = new SSLSocketFactory(new
InterruptibleSocketFactory(httpsSocketFactory,connectionTimeout),
- new AllowAllHostnameVerifier());
- Scheme myHttpsProtocol = new Scheme("https", 443, myFactory);
-
- PoolingClientConnectionManager localConnectionManager = new
PoolingClientConnectionManager();
- localConnectionManager.setMaxTotal(1);
- connectionManager = localConnectionManager;
- // Set up protocol registry
- connectionManager.getSchemeRegistry().register(myHttpsProtocol);
-
- BasicHttpParams params = new BasicHttpParams();
- params.setBooleanParameter(CoreProtocolPNames.USE_EXPECT_CONTINUE,true);
- params.setIntParameter(CoreProtocolPNames.WAIT_FOR_CONTINUE,socketTimeout);
- params.setBooleanParameter(CoreConnectionPNames.TCP_NODELAY,true);
-
params.setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK,true);
-
params.setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT,connectionTimeout);
- params.setIntParameter(CoreConnectionPNames.SO_TIMEOUT,socketTimeout);
- params.setBooleanParameter(ClientPNames.ALLOW_CIRCULAR_REDIRECTS,true);
- DefaultHttpClient localHttpClient = new
DefaultHttpClient(connectionManager,params);
- // No retries
- localHttpClient.setHttpRequestRetryHandler(new HttpRequestRetryHandler()
- {
- public boolean retryRequest(
- IOException exception,
- int executionCount,
- HttpContext context)
- {
- return false;
- }
-
- });
- localHttpClient.setRedirectStrategy(new DefaultRedirectStrategy());
-
+ SSLConnectionSocketFactory myFactory = new SSLConnectionSocketFactory(new
InterruptibleSocketFactory(httpsSocketFactory,connectionTimeout),
+ SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+
+ connectionManager = new PoolingHttpClientConnectionManager();
+
+ CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+
// If authentication needed, set that
if (clientId != null)
{
- localHttpClient.getCredentialsProvider().setCredentials(
+ credentialsProvider.setCredentials(
AuthScope.ANY,
new UsernamePasswordCredentials(clientId,clientSecret));
}
+ RequestConfig.Builder requestBuilder = RequestConfig.custom()
+ .setCircularRedirectsAllowed(true)
+ .setSocketTimeout(socketTimeout)
+ .setStaleConnectionCheckEnabled(true)
+ .setExpectContinueEnabled(true)
+ .setConnectTimeout(connectionTimeout)
+ .setConnectionRequestTimeout(socketTimeout);
+
// If there's a proxy, set that too.
if (proxyHost != null && proxyHost.length() > 0)
{
@@ -186,17 +166,30 @@ public class JiraSession {
if (proxyDomain == null)
proxyDomain = "";
- localHttpClient.getCredentialsProvider().setCredentials(
+ credentialsProvider.setCredentials(
new AuthScope(proxyHost, proxyPortInt),
new NTCredentials(proxyUsername, proxyPassword, currentHost,
proxyDomain));
}
HttpHost proxy = new HttpHost(proxyHost, proxyPortInt);
-
- localHttpClient.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY,
proxy);
+ requestBuilder.setProxy(proxy);
}
- httpClient = localHttpClient;
+ httpClient = HttpClients.custom()
+ .setConnectionManager(connectionManager)
+ .setMaxConnTotal(1)
+ .disableAutomaticRetries()
+ .setDefaultRequestConfig(requestBuilder.build())
+ .setDefaultSocketConfig(SocketConfig.custom()
+ .setTcpNoDelay(true)
+ .setSoTimeout(socketTimeout)
+ .build())
+ .setDefaultCredentialsProvider(credentialsProvider)
+ .setSSLSocketFactory(myFactory)
+ .setRequestExecutor(new HttpRequestExecutor(socketTimeout))
+ .setRedirectStrategy(new DefaultRedirectStrategy())
+ .build();
+
}
/**
