[WAGON-628] Default connect timeout not set when no HttpMethodConfigu…

…ration is available Set first request config values then have every HTTP method separately apply its config. They can safely overwrite timeouts even with -1 (indefinite). There is also no need to explicitly set PUT default config because it is always set before config is applied. This closes #84
apache · Jun 18, 2022 · 17529c6 · 17529c6
1 parent d7f3367
commit 17529c6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 34 deletions.
diff --git a/...http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java b/...http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
@@ -950,21 +950,19 @@ protected CloseableHttpResponse execute( HttpUriRequest httpMethod )
             requestConfigBuilder.setProxy( proxy );
         }
 
-        HttpMethodConfiguration config =
-            httpConfiguration == null ? null : httpConfiguration.getMethodConfiguration( httpMethod );
+        requestConfigBuilder.setConnectTimeout( getTimeout() );
+        requestConfigBuilder.setSocketTimeout( getReadTimeout() );
+        if ( httpMethod instanceof HttpPut )
+        {
+            requestConfigBuilder.setExpectContinueEnabled( true );
+        }
 
+        HttpMethodConfiguration config =
+                httpConfiguration == null ? null : httpConfiguration.getMethodConfiguration( httpMethod );
         if ( config != null )
         {
             ConfigurationUtils.copyConfig( config, requestConfigBuilder );
         }
-        else
-        {
-            requestConfigBuilder.setSocketTimeout( getReadTimeout() );
-            if ( httpMethod instanceof HttpPut )
-            {
-                requestConfigBuilder.setExpectContinueEnabled( true );
-            }
-        }
 
         HttpClientContext localContext = HttpClientContext.create();
         localContext.setCredentialsProvider( credentialsProvider );

diff --git a/...agon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/ConfigurationUtils.java b/...agon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/ConfigurationUtils.java
@@ -61,14 +61,9 @@ public class ConfigurationUtils
 
     public static void copyConfig( HttpMethodConfiguration config, RequestConfig.Builder builder )
     {
-        if ( config.getConnectionTimeout() > 0 )
-        {
-            builder.setConnectTimeout( config.getConnectionTimeout() );
-        }
-        if ( config.getReadTimeout() > 0 )
-        {
-            builder.setSocketTimeout( config.getReadTimeout() );
-        }
+        builder.setConnectTimeout( config.getConnectionTimeout() );
+        builder.setSocketTimeout( config.getReadTimeout() );
+
         Properties params = config.getParams();
         if ( params != null )
         {

diff --git a/...wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HttpConfiguration.java b/...wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HttpConfiguration.java
@@ -19,9 +19,6 @@
  * under the License.
  */
 
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpHead;
-import org.apache.http.client.methods.HttpPut;
 import org.apache.http.client.methods.HttpUriRequest;
 
 /**
@@ -30,9 +27,6 @@
 public class HttpConfiguration
 {
 
-    private static final HttpMethodConfiguration DEFAULT_PUT =
-        new HttpMethodConfiguration().addParam( "http.protocol.expect-continue", "%b,true" );
-
     private HttpMethodConfiguration all;
 
     private HttpMethodConfiguration get;
@@ -87,20 +81,17 @@ public HttpConfiguration setHead( HttpMethodConfiguration head )
 
     public HttpMethodConfiguration getMethodConfiguration( HttpUriRequest method )
     {
-        if ( method instanceof HttpGet )
+        switch ( method.getMethod() )
         {
+        case "GET":
             return ConfigurationUtils.merge( all, get );
-        }
-        else if ( method instanceof HttpPut )
-        {
-            return ConfigurationUtils.merge( DEFAULT_PUT, all, put );
-        }
-        else if ( method instanceof HttpHead )
-        {
+        case "PUT":
+            return ConfigurationUtils.merge( all, put );
+        case "HEAD":
             return ConfigurationUtils.merge( all, head );
+        default:
+            return all;
         }
-
-        return all;
     }
 
 }