From 10d4f7930293f2c3f0b4dfd1a38d66bd2bd6aa3c Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 26 Oct 2020 16:55:22 +0100 Subject: [PATCH] Fix SonarQube issues --- .../scm/net/ahc/DefaultAdvancedHttpClient.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/net/ahc/DefaultAdvancedHttpClient.java b/scm-webapp/src/main/java/sonia/scm/net/ahc/DefaultAdvancedHttpClient.java index 62db41ad38..be3c8bee64 100644 --- a/scm-webapp/src/main/java/sonia/scm/net/ahc/DefaultAdvancedHttpClient.java +++ b/scm-webapp/src/main/java/sonia/scm/net/ahc/DefaultAdvancedHttpClient.java @@ -307,7 +307,7 @@ public class DefaultAdvancedHttpClient extends AdvancedHttpClient { TrustManager[] trustAllCerts = new TrustManager[] { new TrustAllTrustManager() }; - SSLContext sc = SSLContext.getInstance("SSL"); + SSLContext sc = SSLContext.getInstance("TLS"); sc.init(null, trustAllCerts, new java.security.SecureRandom()); connection.setSSLSocketFactory(sc.getSocketFactory()); @@ -337,7 +337,7 @@ public class DefaultAdvancedHttpClient extends AdvancedHttpClient if (isProxyEnabled(request)) { - connection = openProxyConnection(request, url); + connection = openProxyConnection(url); appendProxyAuthentication(connection); } else @@ -347,7 +347,9 @@ public class DefaultAdvancedHttpClient extends AdvancedHttpClient logger.trace("ignore proxy settings"); } - logger.debug("fetch {}", url.toExternalForm()); + if (logger.isDebugEnabled()) { + logger.debug("fetch {}", url.toExternalForm()); + } connection = createConnection(url); } @@ -355,8 +357,7 @@ public class DefaultAdvancedHttpClient extends AdvancedHttpClient return connection; } - private HttpURLConnection openProxyConnection(BaseHttpRequest request, - URL url) + private HttpURLConnection openProxyConnection(URL url) throws IOException { if (logger.isDebugEnabled()) @@ -392,5 +393,5 @@ public class DefaultAdvancedHttpClient extends AdvancedHttpClient private final Provider sslContextProvider; /** tracer used for request tracing */ - private Tracer tracer; + private final Tracer tracer; }