SONAR-10059 Increase timeout to download plugins

diff --git a/sonar-core/src/main/java/org/sonar/core/util/DefaultHttpDownloader.java b/sonar-core/src/main/java/org/sonar/core/util/DefaultHttpDownloader.java
index 35c150acd669a351c48fa39f7dffac5336c26519..51ff9cbb0950ab732c49c71c614649ae5aa95bc5 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/util/DefaultHttpDownloader.java
+++ b/sonar-core/src/main/java/org/sonar/core/util/DefaultHttpDownloader.java
@@ -222,8 +222,8 @@ public class DefaultHttpDownloader extends HttpDownloader {
 
     public HttpInputSupplier newInputSupplier(URI uri, String requestMethod, String login, String password, @Nullable Integer connectTimeoutMillis,
       @Nullable Integer readTimeoutMillis) {
-      int read = readTimeoutMillis != null ? readTimeoutMillis : TIMEOUT_MILLISECONDS;
-      int connect = connectTimeoutMillis != null ? connectTimeoutMillis : TIMEOUT_MILLISECONDS;
+      int read = readTimeoutMillis != null ? readTimeoutMillis : DEFAULT_READ_TIMEOUT_IN_MILLISECONDS;
+      int connect = connectTimeoutMillis != null ? connectTimeoutMillis : DEFAULT_CONNECT_TIMEOUT_IN_MILLISECONDS;
       return new HttpInputSupplier(uri, requestMethod, userAgent, login, password, connect, read);
     }
 

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/HttpDownloader.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/HttpDownloader.java
index 60a8a4a0635801405722a75244fc60b9d9652c0d..8f7e127d22a8d8e4b368b7b09a7ffbad26b4a0d0 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/HttpDownloader.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/HttpDownloader.java
@@ -33,8 +33,27 @@ import java.net.URI;
 @ScannerSide
 @ServerSide
 public abstract class HttpDownloader extends UriReader.SchemeProcessor {
+
+  /**
+   * Catch-all default timeout, replaced by
+   *   {@link #DEFAULT_READ_TIMEOUT_IN_MILLISECONDS}
+   *   {@link #DEFAULT_CONNECT_TIMEOUT_IN_MILLISECONDS}
+   *
+   * @deprecated since 7.0
+   */
+  @Deprecated
   public static final int TIMEOUT_MILLISECONDS = 20 * 1000;
 
+  /**
+   * @since 7.0
+   */
+  public static final int DEFAULT_READ_TIMEOUT_IN_MILLISECONDS = 60 * 1000;
+
+  /**
+   * @since 7.0
+   */
+  public static final int DEFAULT_CONNECT_TIMEOUT_IN_MILLISECONDS = 20 * 1000;
+
   public abstract String downloadPlainText(URI uri, String encoding);
 
   public abstract byte[] download(URI uri);