Fix quality flaws

Author: henryju

lib/src/main/java/org/sonarsource/scanner/lib/internal/http/OkHttpClientFactory.java

@@ -37,7 +37,6 @@
 import okhttp3.OkHttpClient;
 import org.sonarsource.scanner.lib.ScannerProperties;
 import org.sonarsource.scanner.lib.internal.SonarUserHome;
-import org.sonarsource.scanner.lib.internal.cache.Logger;
 import org.sonarsource.scanner.lib.internal.http.ssl.CertificateStore;
 import org.sonarsource.scanner.lib.internal.http.ssl.SslConfig;
 
@@ -74,7 +73,7 @@ private OkHttpClientFactory() {
     COOKIE_JAR = new JavaNetCookieJar(COOKIE_MANAGER);
   }
 
-  static OkHttpClient create(Logger logger, Map<String, String> bootstrapProperties, SonarUserHome sonarUserHome) {
+  static OkHttpClient create(Map<String, String> bootstrapProperties, SonarUserHome sonarUserHome) {
 
     String oldSocketTimeout = defaultIfBlank(bootstrapProperties.get(READ_TIMEOUT_SEC_PROPERTY), valueOf(DEFAULT_READ_TIMEOUT_SEC));
     String socketTimeout = defaultIfBlank(bootstrapProperties.get(SONAR_SCANNER_SOCKET_TIMEOUT), oldSocketTimeout);

lib/src/main/java/org/sonarsource/scanner/lib/internal/http/ServerConnection.java

@@ -55,7 +55,7 @@ public class ServerConnection {
     this.logger = logger;
     this.baseUrlWithoutTrailingSlash = removeTrailingSlash(baseUrl);
     this.userAgent = userAgent;
-    this.httpClient = OkHttpClientFactory.create(logger, bootstrapProperties, sonarUserHome);
+    this.httpClient = OkHttpClientFactory.create(bootstrapProperties, sonarUserHome);
   }
 
   private static String removeTrailingSlash(String url) {

lib/src/test/java/org/sonarsource/scanner/lib/internal/http/OkHttpClientFactoryTest.java

@@ -43,7 +43,6 @@
 import org.junit.jupiter.api.io.TempDir;
 import org.junitpioneer.jupiter.RestoreSystemProperties;
 import org.sonarsource.scanner.lib.internal.SonarUserHome;
-import org.sonarsource.scanner.lib.internal.cache.Logger;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
@@ -60,14 +59,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertThrows;
-import static org.mockito.Mockito.mock;
 
 class OkHttpClientFactoryTest {
 
   private static final String SONAR_WS_TIMEOUT = "sonar.ws.timeout";
   private static final String COOKIE = "BIGipServerpool_sonarqube.example.com_8443=123456789.12345.0000";
 
-  private final Logger logger = mock(Logger.class);
   private final Map<String, String> bootstrapProperties = new HashMap<>();
 
   @TempDir
@@ -84,15 +81,15 @@ void prepareMocks() {
   void support_custom_timeouts() {
     int readTimeoutSec = 2000;
 
-    OkHttpClient underTest = OkHttpClientFactory.create(logger, Map.of(SONAR_WS_TIMEOUT, String.valueOf(readTimeoutSec)), sonarUserHome);
+    OkHttpClient underTest = OkHttpClientFactory.create(Map.of(SONAR_WS_TIMEOUT, String.valueOf(readTimeoutSec)), sonarUserHome);
 
     assertThat(underTest.readTimeoutMillis()).isEqualTo(readTimeoutSec * 1000);
   }
 
   @Test
   void support_custom_timeouts_throws_exception_on_non_number() {
     var props = Map.of(SONAR_WS_TIMEOUT, "fail");
-    assertThatThrownBy(() -> OkHttpClientFactory.create(logger, props, sonarUserHome))
+    assertThatThrownBy(() -> OkHttpClientFactory.create(props, sonarUserHome))
       .isInstanceOf(IllegalArgumentException.class)
       .hasMessage("sonar.scanner.socketTimeout is not a valid integer: fail");
   }
@@ -185,7 +182,7 @@ void it_should_throw_if_invalid_proxy_port() {
       bootstrapProperties.put("sonar.scanner.proxyHost", "localhost");
       bootstrapProperties.put("sonar.scanner.proxyPort", "not_a_number");
 
-      assertThrows(IllegalArgumentException.class, () -> OkHttpClientFactory.create(logger, bootstrapProperties, sonarUserHome));
+      assertThrows(IllegalArgumentException.class, () -> OkHttpClientFactory.create(bootstrapProperties, sonarUserHome));
     }
 
     @Nested
@@ -398,7 +395,7 @@ void it_should_support_jvm_system_properties() throws IOException {
   }
 
   private Response call(String url) throws IOException {
-    return OkHttpClientFactory.create(logger, bootstrapProperties, sonarUserHome).newCall(
+    return OkHttpClientFactory.create(bootstrapProperties, sonarUserHome).newCall(
       new Request.Builder()
         .url(url)
         .get()

lib/src/test/java/org/sonarsource/scanner/lib/internal/http/ServerConnectionTest.java

@@ -57,7 +57,7 @@ class ServerConnectionTest {
 
   @Test
   void download_success() throws Exception {
-    ServerConnection connection = create(false, false);
+    ServerConnection connection = create();
     answer(HELLO_WORLD);
 
     String response = connection.downloadString("/batch/index.txt");
@@ -67,7 +67,7 @@ void download_success() throws Exception {
 
   @Test
   void downloadString_fails_on_url_validation() {
-    ServerConnection connection = create(false, false);
+    ServerConnection connection = create();
     answer(HELLO_WORLD);
 
     assertThatThrownBy(() -> connection.downloadString("should_fail"))
@@ -80,15 +80,15 @@ void test_downloadFile(@TempDir Path tmpFolder) throws Exception {
     var toFile = tmpFolder.resolve("index.txt");
     answer(HELLO_WORLD);
 
-    ServerConnection underTest = create(false, false);
+    ServerConnection underTest = create();
     underTest.downloadFile("/batch/index.txt", toFile);
 
     assertThat(new String(Files.readAllBytes(toFile), StandardCharsets.UTF_8)).isEqualTo(HELLO_WORLD);
   }
 
   @Test
   void downloadFile_fails_on_url_validation() {
-    ServerConnection connection = create(false, false);
+    ServerConnection connection = create();
     answer(HELLO_WORLD);
 
     assertThatThrownBy(() -> connection.downloadFile("should_fail", Paths.get("test-path")))
@@ -97,11 +97,11 @@ void downloadFile_fails_on_url_validation() {
   }
 
   @Test
-  void should_throw_ISE_if_response_not_successful(@TempDir Path tmpFolder) throws Exception {
+  void should_throw_ISE_if_response_not_successful(@TempDir Path tmpFolder) {
     var toFile = tmpFolder.resolve("index.txt");
     answer(HELLO_WORLD, 400);
 
-    ServerConnection underTest = create(false, false);
+    ServerConnection underTest = create();
     assertThatThrownBy(() -> underTest.downloadFile("/batch/index.txt", toFile))
       .isInstanceOf(IllegalStateException.class)
       .hasMessage(format("Status returned by url [http://%s:%d/batch/index.txt] is not valid: [400]", "localhost", sonarqube.getPort()));
@@ -129,7 +129,7 @@ void should_support_server_url_with_trailing_slash() throws Exception {
     assertThat(content).isEqualTo(HELLO_WORLD);
   }
 
-  private ServerConnection create(boolean enableCache, boolean preferCache) {
+  private ServerConnection create() {
     return new ServerConnection(sonarqube.baseUrl(), "user-agent", null, logger, Map.of(), new SonarUserHome(sonarUserHome));
   }