From a2076acb721b9a17fb8bd39ac3d35a04cbc2a65b Mon Sep 17 00:00:00 2001 From: NikolayAvramov Date: Mon, 15 Sep 2025 23:42:56 +0300 Subject: [PATCH 1/2] fixed on data module --- bellatrix.core/pom.xml | 1 - .../data/http/httpContext/HttpContext.java | 12 +++++++----- .../data/http/infrastructure/HttpRepository.java | 9 ++++++++- .../infrastructure/internal/HttpStatusCode.java | 13 ++++++++++++- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/bellatrix.core/pom.xml b/bellatrix.core/pom.xml index 1ca1a6c8..b0a3b362 100644 --- a/bellatrix.core/pom.xml +++ b/bellatrix.core/pom.xml @@ -21,7 +21,6 @@ bellatrix.core - 1.0 4.27.0 diff --git a/bellatrix.data/src/main/java/solutions/bellatrix/data/http/httpContext/HttpContext.java b/bellatrix.data/src/main/java/solutions/bellatrix/data/http/httpContext/HttpContext.java index e885902b..568b65bb 100644 --- a/bellatrix.data/src/main/java/solutions/bellatrix/data/http/httpContext/HttpContext.java +++ b/bellatrix.data/src/main/java/solutions/bellatrix/data/http/httpContext/HttpContext.java @@ -11,6 +11,7 @@ import solutions.bellatrix.data.http.infrastructure.HTTPMethod; import solutions.bellatrix.data.http.infrastructure.HttpHeader; import solutions.bellatrix.data.http.infrastructure.QueryParameter; +import solutions.bellatrix.core.utilities.SecretsResolver; import java.util.*; import java.util.function.Consumer; @@ -77,9 +78,8 @@ public RequestSpecification requestSpecification() { specBuilder.setBody(requestBody); } - if (!queryParameters.isEmpty()) { - specBuilder.addQueryParams(getRequestQueryParameters()); - } + // Always add query parameters (including authentication parameters) + specBuilder.addQueryParams(getRequestQueryParameters()); specBuilder.addHeaders(getRequestHeaders()); @@ -136,7 +136,8 @@ private Map getRequestQueryParameters() { if (insertionOrder.equals("start")) { for (var key : option.keySet()) { if (!key.equals("type") && !key.equals("insertionOrder")) { - queryParams.put(key, option.get(key).toString()); + String value = SecretsResolver.getSecret(option.get(key).toString()); + queryParams.put(key, value); } } for (QueryParameter queryParameter : queryParameters) { @@ -148,7 +149,8 @@ private Map getRequestQueryParameters() { } for (var key : option.keySet()) { if (!key.equals("type") && !key.equals("insertionOrder")) { - queryParams.put(key, option.get(key).toString()); + String value = SecretsResolver.getSecret(option.get(key).toString()); + queryParams.put(key, value); } } diff --git a/bellatrix.data/src/main/java/solutions/bellatrix/data/http/infrastructure/HttpRepository.java b/bellatrix.data/src/main/java/solutions/bellatrix/data/http/infrastructure/HttpRepository.java index 9a98c489..a8048aaa 100644 --- a/bellatrix.data/src/main/java/solutions/bellatrix/data/http/infrastructure/HttpRepository.java +++ b/bellatrix.data/src/main/java/solutions/bellatrix/data/http/infrastructure/HttpRepository.java @@ -99,7 +99,14 @@ public void delete(THttpEntity entity) { DELETING_ENTITY.broadcast(new EntityDeletedEventArgs(entity)); - sendRequest(requestContext); + // For delete operations, we don't need to parse the response as JSON + // Just send the request and check the status code + Response response = sendRequest(requestContext); + + // Check if the delete was successful (200-299 status codes) + if (response.getStatusCode() < 200 || response.getStatusCode() >= 300) { + throw new RuntimeException("Delete operation failed with status code: " + response.getStatusCode()); + } ENTITY_DELETED.broadcast(new EntityDeletedEventArgs(entity)); } diff --git a/bellatrix.data/src/main/java/solutions/bellatrix/data/http/infrastructure/internal/HttpStatusCode.java b/bellatrix.data/src/main/java/solutions/bellatrix/data/http/infrastructure/internal/HttpStatusCode.java index 503939fa..498045e2 100644 --- a/bellatrix.data/src/main/java/solutions/bellatrix/data/http/infrastructure/internal/HttpStatusCode.java +++ b/bellatrix.data/src/main/java/solutions/bellatrix/data/http/infrastructure/internal/HttpStatusCode.java @@ -50,6 +50,17 @@ public static HttpStatusCode parse(int statusCode) { } } - throw new IllegalArgumentException("Not found"); + // If the status code is not found in the enum, return a generic status code + // based on the status code range + if (statusCode >= 200 && statusCode < 300) { + return OK; // Return OK for any 2xx success code + } else if (statusCode >= 400 && statusCode < 500) { + return BAD_REQUEST; // Return BAD_REQUEST for any 4xx client error + } else if (statusCode >= 500 && statusCode < 600) { + return INTERNAL_SERVER_ERROR; // Return INTERNAL_SERVER_ERROR for any 5xx server error + } else { + // For other status codes (1xx, 3xx, etc.), return OK as default + return OK; + } } } \ No newline at end of file From 5e078e7eb6dd1dd7d1fa5a4f11575ad01526dbf3 Mon Sep 17 00:00:00 2001 From: NikolayAvramov Date: Mon, 15 Sep 2025 23:44:19 +0300 Subject: [PATCH 2/2] revert change --- bellatrix.core/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/bellatrix.core/pom.xml b/bellatrix.core/pom.xml index b0a3b362..1ca1a6c8 100644 --- a/bellatrix.core/pom.xml +++ b/bellatrix.core/pom.xml @@ -21,6 +21,7 @@ bellatrix.core + 1.0 4.27.0