From 7ea503b017b05a6c109de27051400d26a6d8e749 Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Tue, 23 Nov 2021 15:59:18 +0800 Subject: [PATCH] Fix #25255. (#25595) --- .../keyvault/jca/implementation/utils/HttpUtil.java | 2 ++ .../jca/implementation/utils/HttpUtilTest.java | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/implementation/utils/HttpUtil.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/implementation/utils/HttpUtil.java index 2972c7b3e876b..68e475014f7a2 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/implementation/utils/HttpUtil.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/implementation/utils/HttpUtil.java @@ -10,6 +10,7 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.config.RegistryBuilder; import org.apache.http.conn.socket.ConnectionSocketFactory; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; @@ -129,6 +130,7 @@ private static CloseableHttpClient buildClient() { PoolingHttpClientConnectionManager manager = new PoolingHttpClientConnectionManager( RegistryBuilder.create() + .register("http", PlainConnectionSocketFactory.getSocketFactory()) .register("https", sslConnectionSocketFactory) .build()); return HttpClients.custom().setConnectionManager(manager).build(); diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/implementation/utils/HttpUtilTest.java b/sdk/keyvault/azure-security-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/implementation/utils/HttpUtilTest.java index 0c0e4c3fa7328..2a329c53b961b 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/implementation/utils/HttpUtilTest.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/implementation/utils/HttpUtilTest.java @@ -20,10 +20,19 @@ public void getUserAgentPrefixTest() { @Test @Disabled("Disable this because it will cause pipeline failure: https://dev.azure.com/azure-sdk/internal/_build/results?buildId=1196171&view=logs&j=4a83f3be-c53d-53dd-7954-86872056fb11&t=54174aae-5a55-579d-08e2-94fb446f7b77&l=29") - public void testCustomizedHttpsClient() { + public void testHttpUtilGet() { String url = "https://mvnrepository.com/"; String result = HttpUtil.get(url, null); assertNotNull(result); assertFalse(result.isEmpty()); } + + @Test + @Disabled("This is only used to test in localhost manually") + public void testHttpUtilGet1() { + String url = "http://localhost:8000/"; + String result = HttpUtil.get(url, null); + assertNotNull(result); + assertFalse(result.isEmpty()); + } }