The deprecated DefaultHttpClient in SubsystemClient, CRMFPopClient, and OCSPProcessor has been replaced with HttpClientBuilder.
https://fedorahosted.org/pki/ticket/2531 Pushed to master under trivial/one-liner rule. -- Endi S. Dewata
>From db58e6071f6bb57de006e6499c0a0c6a8c8e67bf Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" <edew...@redhat.com> Date: Thu, 3 Nov 2016 02:38:00 +0100 Subject: [PATCH] Replaced deprecated DefaultHttpClient. The deprecated DefaultHttpClient in SubsystemClient, CRMFPopClient, and OCSPProcessor has been replaced with HttpClientBuilder. https://fedorahosted.org/pki/ticket/2531 --- .../com/netscape/certsrv/client/SubsystemClient.java | 6 +++--- .../src/com/netscape/cmstools/CRMFPopClient.java | 10 +++++----- .../src/com/netscape/cmsutil/ocsp/OCSPProcessor.java | 18 +++++++----------- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/base/common/src/com/netscape/certsrv/client/SubsystemClient.java b/base/common/src/com/netscape/certsrv/client/SubsystemClient.java index 3d44bce416a6f9da7b9397be0adfbea2c54d01e7..cbc17ac3fb2bcdcefc52676a9e00a33a00a0c636 100644 --- a/base/common/src/com/netscape/certsrv/client/SubsystemClient.java +++ b/base/common/src/com/netscape/certsrv/client/SubsystemClient.java @@ -22,7 +22,8 @@ import java.net.URISyntaxException; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; import com.netscape.certsrv.account.AccountClient; @@ -63,9 +64,8 @@ public class SubsystemClient extends Client { null, null); - DefaultHttpClient client = new DefaultHttpClient(); HttpGet method = new HttpGet(subsystemURI); - try { + try (CloseableHttpClient client = HttpClientBuilder.create().build()) { HttpResponse response = client.execute(method); int code = response.getStatusLine().getStatusCode(); diff --git a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java index 450f950a9a0f8ef6ff6c9bb40e1cd26ba88b70ef..6044b7aacb29f9ab25b80a6e8f8ed580c1e4cc51 100644 --- a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java +++ b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java @@ -29,8 +29,6 @@ import java.security.KeyPair; import java.security.MessageDigest; import java.security.PublicKey; -import netscape.security.x509.X500Name; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.Option; @@ -40,7 +38,8 @@ import org.apache.commons.io.FileUtils; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; import org.mozilla.jss.CryptoManager; import org.mozilla.jss.asn1.ASN1Util; @@ -85,6 +84,8 @@ import com.netscape.cmsutil.util.Cert; import com.netscape.cmsutil.util.HMACDigest; import com.netscape.cmsutil.util.Utils; +import netscape.security.x509.X500Name; + /** * A command-line utility used to generate a Certificate Request Message * Format (CRMF) request with proof of possesion (POP). @@ -742,9 +743,8 @@ public class CRMFPopClient { if (verbose) System.out.println("Opening " + url); - DefaultHttpClient client = new DefaultHttpClient(); HttpGet method = new HttpGet(url); - try { + try (CloseableHttpClient client = HttpClientBuilder.create().build()) { HttpResponse response = client.execute(method); if (response.getStatusLine().getStatusCode() != 200) { diff --git a/base/util/src/com/netscape/cmsutil/ocsp/OCSPProcessor.java b/base/util/src/com/netscape/cmsutil/ocsp/OCSPProcessor.java index 1b85be8b2c92a46393c485bc52c9c9ca3cc41a3e..1c4917ce94eff03102b1391961438bccb1ba6ec4 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/OCSPProcessor.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/OCSPProcessor.java @@ -23,17 +23,13 @@ import java.io.InputStream; import java.math.BigInteger; import java.security.MessageDigest; -import netscape.security.x509.X500Name; -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509Key; - import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.ByteArrayEntity; import org.apache.http.entity.ContentType; -import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; import org.mozilla.jss.CryptoManager; import org.mozilla.jss.asn1.INTEGER; @@ -46,6 +42,10 @@ import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; import com.netscape.cmsutil.util.Utils; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509Key; + /** * This class implements an OCSP utility. * @@ -126,9 +126,8 @@ public class OCSPProcessor { if (verbose) System.out.println("URL: " + url); - HttpClient httpClient = new DefaultHttpClient(); + try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) { - try { ByteArrayOutputStream os = new ByteArrayOutputStream(); request.encode(os); byte[] requestData = os.toByteArray(); @@ -162,9 +161,6 @@ public class OCSPProcessor { } finally { EntityUtils.consume(responseEntity); } - - } finally { - httpClient.getConnectionManager().shutdown(); } } } -- 2.5.5
_______________________________________________ Pki-devel mailing list Pki-devel@redhat.com https://www.redhat.com/mailman/listinfo/pki-devel
