From e5004b81ef5a3072d3b1edf612aba832ad482d1c Mon Sep 17 00:00:00 2001 From: neetya26 Date: Fri, 29 Nov 2024 20:16:33 +0530 Subject: [PATCH 1/6] W-17333982: fix for HTTP:TIMEOUT error --- .../redirect/HttpRedirectExceededTimeoutTestCase.java | 4 ++-- .../java/org/mule/extension/http/api/error/HttpError.java | 4 ++-- .../mule/extension/http/internal/request/HttpRequester.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/functional-tests/http/src/test/java/org/mule/test/http/functional/requester/redirect/HttpRedirectExceededTimeoutTestCase.java b/functional-tests/http/src/test/java/org/mule/test/http/functional/requester/redirect/HttpRedirectExceededTimeoutTestCase.java index 541b70f30..556a87699 100644 --- a/functional-tests/http/src/test/java/org/mule/test/http/functional/requester/redirect/HttpRedirectExceededTimeoutTestCase.java +++ b/functional-tests/http/src/test/java/org/mule/test/http/functional/requester/redirect/HttpRedirectExceededTimeoutTestCase.java @@ -6,7 +6,7 @@ */ package org.mule.test.http.functional.requester.redirect; -import static org.mule.extension.http.api.error.HttpError.TIMEOUT; +import static org.mule.extension.http.api.error.HttpError.REQUEST_TIMEOUT; import static org.mule.extension.http.internal.listener.HttpListener.HTTP_NAMESPACE; import static org.hamcrest.CoreMatchers.isA; @@ -36,7 +36,7 @@ public HttpRedirectExceededTimeoutTestCase() { @Test public void testRedirectTimeout() throws Exception { expectedError.expectCause(isA(HttpRequestFailedException.class)); - expectedError.expectErrorType(HTTP_NAMESPACE.toUpperCase(), TIMEOUT.getType()); + expectedError.expectErrorType(HTTP_NAMESPACE.toUpperCase(), REQUEST_TIMEOUT.getType()); expectedException.reportMissingExceptionWithMessage("Timeout exception must be triggered"); runFlow("requestFlow"); } diff --git a/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java b/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java index 12e533b4a..4f6907cda 100644 --- a/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java +++ b/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java @@ -31,7 +31,7 @@ public enum HttpError implements ErrorTypeDefinition { PARSING, - TIMEOUT, + REQUEST_TIMEOUT, SECURITY(MuleErrors.SECURITY), @@ -86,7 +86,7 @@ public enum HttpError implements ErrorTypeDefinition { final Set errors = new HashSet<>(); errors.add(PARSING); - errors.add(TIMEOUT); + errors.add(REQUEST_TIMEOUT); errors.add(SECURITY); errors.add(CLIENT_SECURITY); errors.add(CONNECTIVITY); diff --git a/mule-http-connector/src/main/java/org/mule/extension/http/internal/request/HttpRequester.java b/mule-http-connector/src/main/java/org/mule/extension/http/internal/request/HttpRequester.java index 1ea5de486..d9bd78f95 100644 --- a/mule-http-connector/src/main/java/org/mule/extension/http/internal/request/HttpRequester.java +++ b/mule-http-connector/src/main/java/org/mule/extension/http/internal/request/HttpRequester.java @@ -14,7 +14,7 @@ import static java.util.Optional.ofNullable; import static org.apache.commons.lang3.StringUtils.containsIgnoreCase; import static org.mule.extension.http.api.error.HttpError.CONNECTIVITY; -import static org.mule.extension.http.api.error.HttpError.TIMEOUT; +import static org.mule.extension.http.api.error.HttpError.REQUEST_TIMEOUT; import static org.mule.extension.http.api.notification.HttpNotificationAction.REQUEST_COMPLETE; import static org.mule.extension.http.api.notification.HttpNotificationAction.REQUEST_START; import static org.mule.extension.http.internal.HttpConnectorConstants.DEFAULT_RETRY_ATTEMPTS; @@ -262,7 +262,7 @@ private void doRequestWithRetry(HttpExtensionClient client, HttpRequesterConfig } logger.error(getErrorMessage(httpRequest)); - HttpError error = exception instanceof TimeoutException ? TIMEOUT : CONNECTIVITY; + HttpError error = exception instanceof TimeoutException ? REQUEST_TIMEOUT : CONNECTIVITY; callback.error(new HttpRequestFailedException(createStaticMessage(httpErrorMessageGenerator .createFrom(httpRequest, getExceptionMessage(exception))), From 5d9e51790466793a9bd5e53e0f5f0a709a0bbd85 Mon Sep 17 00:00:00 2001 From: neetya26 Date: Fri, 29 Nov 2024 20:20:57 +0530 Subject: [PATCH 2/6] added 'TIMEOUT' in HttpError to resolve functional tests failures --- .../redirect/HttpRedirectExceededTimeoutTestCase.java | 4 ++-- .../java/org/mule/extension/http/api/error/HttpError.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/functional-tests/http/src/test/java/org/mule/test/http/functional/requester/redirect/HttpRedirectExceededTimeoutTestCase.java b/functional-tests/http/src/test/java/org/mule/test/http/functional/requester/redirect/HttpRedirectExceededTimeoutTestCase.java index 556a87699..541b70f30 100644 --- a/functional-tests/http/src/test/java/org/mule/test/http/functional/requester/redirect/HttpRedirectExceededTimeoutTestCase.java +++ b/functional-tests/http/src/test/java/org/mule/test/http/functional/requester/redirect/HttpRedirectExceededTimeoutTestCase.java @@ -6,7 +6,7 @@ */ package org.mule.test.http.functional.requester.redirect; -import static org.mule.extension.http.api.error.HttpError.REQUEST_TIMEOUT; +import static org.mule.extension.http.api.error.HttpError.TIMEOUT; import static org.mule.extension.http.internal.listener.HttpListener.HTTP_NAMESPACE; import static org.hamcrest.CoreMatchers.isA; @@ -36,7 +36,7 @@ public HttpRedirectExceededTimeoutTestCase() { @Test public void testRedirectTimeout() throws Exception { expectedError.expectCause(isA(HttpRequestFailedException.class)); - expectedError.expectErrorType(HTTP_NAMESPACE.toUpperCase(), REQUEST_TIMEOUT.getType()); + expectedError.expectErrorType(HTTP_NAMESPACE.toUpperCase(), TIMEOUT.getType()); expectedException.reportMissingExceptionWithMessage("Timeout exception must be triggered"); runFlow("requestFlow"); } diff --git a/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java b/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java index 4f6907cda..0442f511a 100644 --- a/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java +++ b/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java @@ -31,6 +31,8 @@ public enum HttpError implements ErrorTypeDefinition { PARSING, + TIMEOUT, + REQUEST_TIMEOUT, SECURITY(MuleErrors.SECURITY), @@ -87,6 +89,7 @@ public enum HttpError implements ErrorTypeDefinition { errors.add(PARSING); errors.add(REQUEST_TIMEOUT); + errors.add(TIMEOUT); errors.add(SECURITY); errors.add(CLIENT_SECURITY); errors.add(CONNECTIVITY); From a8110dff4098402943a477021f0e1f006f3ddb37 Mon Sep 17 00:00:00 2001 From: neetya26 Date: Mon, 2 Dec 2024 18:27:13 +0530 Subject: [PATCH 3/6] removing REQUEST_TIMEOUT enum --- .../java/org/mule/extension/http/api/error/HttpError.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java b/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java index 0442f511a..e8d245b39 100644 --- a/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java +++ b/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java @@ -33,8 +33,6 @@ public enum HttpError implements ErrorTypeDefinition { TIMEOUT, - REQUEST_TIMEOUT, - SECURITY(MuleErrors.SECURITY), CLIENT_SECURITY(MuleErrors.CLIENT_SECURITY), @@ -88,7 +86,6 @@ public enum HttpError implements ErrorTypeDefinition { final Set errors = new HashSet<>(); errors.add(PARSING); - errors.add(REQUEST_TIMEOUT); errors.add(TIMEOUT); errors.add(SECURITY); errors.add(CLIENT_SECURITY); @@ -155,7 +152,7 @@ public static Optional getErrorByCode(int statusCode) { HttpStatus status = getStatusByCode(statusCode); if (status != null) { error = stream(HttpError.values()) - .filter(httpError -> httpError.name().equals(status.name())) + .filter(httpError -> httpError.name().contains(status.name())) .findFirst() .orElse(null); } From 254cdf9691f8c75a638c4a2c9bef1341a9920dbb Mon Sep 17 00:00:00 2001 From: neetya26 Date: Mon, 2 Dec 2024 18:28:09 +0530 Subject: [PATCH 4/6] removing REQUEST_TIMEOUT enum --- .../main/java/org/mule/extension/http/api/error/HttpError.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java b/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java index e8d245b39..2912668c5 100644 --- a/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java +++ b/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java @@ -152,7 +152,7 @@ public static Optional getErrorByCode(int statusCode) { HttpStatus status = getStatusByCode(statusCode); if (status != null) { error = stream(HttpError.values()) - .filter(httpError -> httpError.name().contains(status.name())) + .filter(httpError -> status.name().contains(httpError.name())) .findFirst() .orElse(null); } From 9d72d5790a228cfdc4555f1bc18a60781b4b3a24 Mon Sep 17 00:00:00 2001 From: neetya26 <158453849+neetya26@users.noreply.github.com> Date: Mon, 2 Dec 2024 18:32:04 +0530 Subject: [PATCH 5/6] removing REQUEST_TIMEOUT enum --- .../mule/extension/http/internal/request/HttpRequester.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mule-http-connector/src/main/java/org/mule/extension/http/internal/request/HttpRequester.java b/mule-http-connector/src/main/java/org/mule/extension/http/internal/request/HttpRequester.java index d9bd78f95..1ea5de486 100644 --- a/mule-http-connector/src/main/java/org/mule/extension/http/internal/request/HttpRequester.java +++ b/mule-http-connector/src/main/java/org/mule/extension/http/internal/request/HttpRequester.java @@ -14,7 +14,7 @@ import static java.util.Optional.ofNullable; import static org.apache.commons.lang3.StringUtils.containsIgnoreCase; import static org.mule.extension.http.api.error.HttpError.CONNECTIVITY; -import static org.mule.extension.http.api.error.HttpError.REQUEST_TIMEOUT; +import static org.mule.extension.http.api.error.HttpError.TIMEOUT; import static org.mule.extension.http.api.notification.HttpNotificationAction.REQUEST_COMPLETE; import static org.mule.extension.http.api.notification.HttpNotificationAction.REQUEST_START; import static org.mule.extension.http.internal.HttpConnectorConstants.DEFAULT_RETRY_ATTEMPTS; @@ -262,7 +262,7 @@ private void doRequestWithRetry(HttpExtensionClient client, HttpRequesterConfig } logger.error(getErrorMessage(httpRequest)); - HttpError error = exception instanceof TimeoutException ? REQUEST_TIMEOUT : CONNECTIVITY; + HttpError error = exception instanceof TimeoutException ? TIMEOUT : CONNECTIVITY; callback.error(new HttpRequestFailedException(createStaticMessage(httpErrorMessageGenerator .createFrom(httpRequest, getExceptionMessage(exception))), From 5a0da2fc14e32f50409b6ba76fc25128a3b8869f Mon Sep 17 00:00:00 2001 From: neetya26 Date: Tue, 3 Dec 2024 10:32:21 +0530 Subject: [PATCH 6/6] adding REQUEST_TIMEOUT enum --- .../java/org/mule/extension/http/api/error/HttpError.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java b/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java index 2912668c5..43410334e 100644 --- a/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java +++ b/mule-http-connector/src/main/java/org/mule/extension/http/api/error/HttpError.java @@ -33,6 +33,8 @@ public enum HttpError implements ErrorTypeDefinition { TIMEOUT, + REQUEST_TIMEOUT, + SECURITY(MuleErrors.SECURITY), CLIENT_SECURITY(MuleErrors.CLIENT_SECURITY), @@ -87,6 +89,7 @@ public enum HttpError implements ErrorTypeDefinition { errors.add(PARSING); errors.add(TIMEOUT); + errors.add(REQUEST_TIMEOUT); errors.add(SECURITY); errors.add(CLIENT_SECURITY); errors.add(CONNECTIVITY); @@ -152,7 +155,7 @@ public static Optional getErrorByCode(int statusCode) { HttpStatus status = getStatusByCode(statusCode); if (status != null) { error = stream(HttpError.values()) - .filter(httpError -> status.name().contains(httpError.name())) + .filter(httpError -> httpError.name().equals(status.name())) .findFirst() .orElse(null); }