aadarsh-st/SK-2521-Refactor request handling in ConnectionController and update request ID format in HttpUtility

Author: aadarsh-st

src/main/java/com/skyflow/utils/HttpUtility.java

@@ -13,6 +13,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.UUID;
 
 public final class HttpUtility {
 
@@ -79,7 +80,7 @@ public static String sendRequest(String method, URL url, JsonObject params, Map<
             if (requestID != null) {
                 HttpUtility.requestID = requestID.split(",")[0];
             } else {
-                HttpUtility.requestID = "Internal-SDK-" + UUID.randomUUID();
+                HttpUtility.requestID = "SDK-Generated-" + UUID.randomUUID();
             }
             Map<String, List<String>> responseHeaders = connection.getHeaderFields();
             Reader streamReader;

src/main/java/com/skyflow/vault/controller/ConnectionController.java

@@ -52,12 +52,12 @@ public InvokeConnectionResponse invoke(InvokeConnectionRequest invokeConnectionR
 
             RequestMethod requestMethod = invokeConnectionRequest.getMethod();
             Object requestBodyObject = invokeConnectionRequest.getRequestBody();
-            String contentType = headers
+            String requestContentType = headers
                     .getOrDefault("content-type", "application/json")
                     .toLowerCase();
-            boolean isJsonRequest = contentType.contains("application/json");
+            boolean isJsonRequest = requestContentType.contains("application/json");
 
-            Object finalPayload;
+            Object processedRequestBody;
 
             try {
                 if (requestBodyObject instanceof String) {
@@ -67,25 +67,25 @@ public InvokeConnectionResponse invoke(InvokeConnectionRequest invokeConnectionR
                                 "__raw_body__",
                                 (String) requestBodyObject
                         );
-                        finalPayload = jsonWrapper;
+                        processedRequestBody = jsonWrapper;
                     } else {
-                        finalPayload = requestBodyObject;
+                        processedRequestBody = requestBodyObject;
                     }
                 } else if (requestBodyObject instanceof JsonObject || requestBodyObject == null) {
-                    finalPayload = requestBodyObject;
+                    processedRequestBody = requestBodyObject;
                 } else {
-                    finalPayload = convertObjectToJson(requestBodyObject);
+                    processedRequestBody = convertObjectToJson(requestBodyObject);
                 }
             } catch (Exception e) {
                 LogUtil.printErrorLog(ErrorLogs.INVALID_REQUEST_HEADERS.getLog());
                 throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidRequestBody.getMessage());
             }
             JsonObject payloadToSend;
-            if (finalPayload instanceof JsonObject || finalPayload == null) {
-                payloadToSend = (JsonObject) finalPayload;
+            if (processedRequestBody instanceof JsonObject || processedRequestBody == null) {
+                payloadToSend = (JsonObject) processedRequestBody;
             } else {
                 payloadToSend = new JsonObject();
-                payloadToSend.addProperty("__raw_body__", finalPayload.toString());
+                payloadToSend.addProperty("__raw_body__", processedRequestBody.toString());
             }
 
             String response = HttpUtility.sendRequest(requestMethod.name(), new URL(filledURL), payloadToSend, headers);