Merge branch 'master' into bm/mc-4457

Author: bruno-martins-mx

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "4.4.0"
+  ".": "4.4.1"
 }

CHANGELOG.md

@@ -5,6 +5,13 @@
 
 * making Annotations.fieldsAnAnnotations respect inheritance ([3b266dd](https://github.com/mxenabled/path-core/commit/3b266ddcb227766a32f16e88e7b9b2022737de53))
 
+## [4.4.1](https://github.com/mxenabled/path-core/compare/v4.4.0...v4.4.1) (2025-01-22)
+
+
+### Bug Fixes
+
+* handle external timeout error with status code 531 ([aeba873](https://github.com/mxenabled/path-core/commit/aeba873636199969dbb42f2dde84b285bca54dc5))
+
 ## [4.4.0](https://github.com/mxenabled/path-core/compare/v4.3.0...v4.4.0) (2025-01-14)
 
 

README.md

@@ -23,7 +23,7 @@ _Gradle_
 <!-- x-release-please-start-version -->
 ```groovy
 dependencies {
-  api platform("com.mx.path-core:platform:4.4.0")
+  api platform("com.mx.path-core:platform:4.4.1")
 
   implementation "com.mx.path-core:common"
   implementation "com.mx.path-core:context"
@@ -45,16 +45,16 @@ _Gradle_
 <!-- x-release-please-start-version -->
 ```groovy
 dependencies {
-  implementation "com.mx.path-core:common:4.4.0"
-  implementation "com.mx.path-core:context:4.4.0"
-  implementation "com.mx.path-core:gateway:4.4.0"
-  implementation "com.mx.path-core:http:4.4.0"
-  implementation "com.mx.path-core:messaging:4.4.0"
-  implementation "com.mx.path-core:utilities:4.4.0"
+  implementation "com.mx.path-core:common:4.4.1"
+  implementation "com.mx.path-core:context:4.4.1"
+  implementation "com.mx.path-core:gateway:4.4.1"
+  implementation "com.mx.path-core:http:4.4.1"
+  implementation "com.mx.path-core:messaging:4.4.1"
+  implementation "com.mx.path-core:utilities:4.4.1"
 
-  annotationProcessor "com.mx.path-core:gateway-generator:4.4.0"
+  annotationProcessor "com.mx.path-core:gateway-generator:4.4.1"
 
-  testImplementation "com.mx.path-core:testing:4.4.0"
+  testImplementation "com.mx.path-core:testing:4.4.1"
 }
 ```
 <!-- x-release-please-end -->

build.gradle

@@ -7,7 +7,7 @@ plugins {
   id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
 }
 
-version "4.4.0" // x-release-please-version
+version "4.4.1" // x-release-please-version
 
 def platformProject = "platform"
 def publishedProjects = [

http/src/main/java/com/mx/path/connect/http/HttpClientFilter.java

@@ -44,7 +44,6 @@
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.RequestBuilder;
 import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.conn.HttpHostConnectException;
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.entity.ByteArrayEntity;
@@ -68,7 +67,6 @@ public class HttpClientFilter extends RequestFilterBase {
    * instead of converting it to a String.
    */
   private static final List<String> RAW_BODY_CONTENT_TYPE_HINTS = Arrays.asList("image", "pdf", "msword");
-  private static final int HTTP_STATUS_EXTERNAL_TIMEOUT = 531;
 
   private static GsonBuilder gsonBuilder = new GsonBuilder();
   private static final Gson GSON = gsonBuilder
@@ -161,15 +159,12 @@ public final void execute(Request request, Response response) {
           } finally {
             response.finish();
           }
-        } catch (ConnectTimeoutException e) {
-          httpResponse.setStatus(HttpStatus.valueOf(HTTP_STATUS_EXTERNAL_TIMEOUT));
-          throw new ConnectException("Connection timeout: " + e.getMessage(), e);
+        } catch (ConnectException e) {
+          throw new HttpClientConnectException("Connection Exception", e);
         } catch (SocketTimeoutException e) {
-          httpResponse.setStatus(HttpStatus.valueOf(HTTP_STATUS_EXTERNAL_TIMEOUT));
-          throw new ConnectException("Read timeout: " + e.getMessage(), e);
+          throw new HttpClientConnectException("Read Timeout Exception", e);
         } catch (NoHttpResponseException e) {
-          httpResponse.setStatus(HttpStatus.valueOf(HTTP_STATUS_EXTERNAL_TIMEOUT));
-          throw new ConnectException("Target server failed to respond: " + e.getMessage(), e);
+          throw new HttpClientConnectException("Target server failed to response", e);
         } catch (SSLHandshakeException e) {
           throw new HttpClientConnectException("SSL handshake failed", e);
         } catch (SSLException e) {

http/src/test/groovy/com/mx/path/api/connect/http/HttpClientFilterTest.groovy

@@ -8,6 +8,7 @@ import com.mx.path.connect.http.HttpClientFilter
 import com.mx.path.connect.http.HttpRequest
 import com.mx.path.connect.http.HttpResponse
 import com.mx.path.core.common.collection.MultiValueMap
+import com.mx.path.core.common.connect.ConnectException
 import com.mx.path.core.common.connect.Request
 import com.mx.path.core.common.connect.RequestFilter
 
@@ -111,4 +112,22 @@ class HttpClientFilterTest extends Specification {
     false                   || makeContentTypeHeaders("application/xml")
     false                   || makeContentTypeHeaders()
   }
+
+  def "test connect exception handling in execute method"() {
+    given: "A mock HttpRequest and Response"
+    def mockRequest = Mock(HttpRequest)
+    def mockResponse = Mock(HttpResponse)
+
+    // Create the real executor object (HttpClientFilter)
+    HttpClientFilter executor = Mock(HttpClientFilter)
+
+    executor.execute(mockRequest, mockResponse) >> { throw new ConnectException("Connection Exception") }
+
+    when: "Execute method is called"
+    executor.execute(mockRequest, mockResponse)
+
+    then: "ConnectException is thrown"
+    thrown(ConnectException)
+  }
+
 }