SCANNERAPI-182 Timeout property is in seconds

Author: henryju

api/src/main/java/org/sonarsource/scanner/api/internal/OkHttpClientFactory.java

@@ -28,6 +28,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 import java.security.cert.CertificateException;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 import javax.net.ssl.KeyManager;
@@ -48,7 +49,7 @@ public class OkHttpClientFactory {
 
   static final String READ_TIMEOUT_SEC_PROPERTY = "sonar.ws.timeout";
   static final int CONNECT_TIMEOUT_MILLISECONDS = 5_000;
-  static final int DEFAULT_READ_TIMEOUT_MILLISECONDS = 500_000;
+  static final int DEFAULT_READ_TIMEOUT_SEC = (int) Duration.ofMinutes(5).getSeconds();
   static final String NONE = "NONE";
   static final String P11KEYSTORE = "PKCS11";
   private static final String PROXY_AUTHORIZATION = "Proxy-Authorization";
@@ -60,13 +61,13 @@ private OkHttpClientFactory() {
   static OkHttpClient create(Logger logger) {
     OkHttpClient.Builder okHttpClientBuilder = new OkHttpClient.Builder();
 
-    int readTimeout = DEFAULT_READ_TIMEOUT_MILLISECONDS;
+    int readTimeoutSec = DEFAULT_READ_TIMEOUT_SEC;
     if (!System.getProperty(READ_TIMEOUT_SEC_PROPERTY, "").isEmpty()) {
-      readTimeout = Integer.parseInt(System.getProperty(READ_TIMEOUT_SEC_PROPERTY));
+      readTimeoutSec = Integer.parseInt(System.getProperty(READ_TIMEOUT_SEC_PROPERTY));
     }
 
     okHttpClientBuilder.connectTimeout(CONNECT_TIMEOUT_MILLISECONDS, TimeUnit.MILLISECONDS);
-    okHttpClientBuilder.readTimeout(readTimeout, TimeUnit.MILLISECONDS);
+    okHttpClientBuilder.readTimeout(readTimeoutSec, TimeUnit.SECONDS);
 
     ConnectionSpec tls = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
       .allEnabledTlsVersions()

api/src/test/java/org/sonarsource/scanner/api/internal/OkHttpClientFactoryTest.java

@@ -40,7 +40,6 @@
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
-
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
@@ -88,13 +87,13 @@ public void support_tls_versions_of_java8() {
 
   @Test
   public void support_custom_timeouts() {
-    int readTimeout = 2000;
-    System.setProperty(SONAR_WS_TIMEOUT, String.valueOf(readTimeout));
+    int readTimeoutSec = 2000;
+    System.setProperty(SONAR_WS_TIMEOUT, String.valueOf(readTimeoutSec));
 
     Logger logger = mock(Logger.class);
     OkHttpClient underTest = OkHttpClientFactory.create(logger);
 
-    assertThat(underTest.readTimeoutMillis()).isEqualTo(readTimeout);
+    assertThat(underTest.readTimeoutMillis()).isEqualTo(readTimeoutSec * 1000);
   }
 
   @Test