SK-1978 address the review comments

Author: raushan-skyflow

src/main/java/com/skyflow/Skyflow.java

@@ -1,7 +1,5 @@
 package com.skyflow;
 
-import java.util.LinkedHashMap;
-
 import com.skyflow.config.ConnectionConfig;
 import com.skyflow.config.Credentials;
 import com.skyflow.config.VaultConfig;
@@ -19,6 +17,8 @@
 import com.skyflow.vault.controller.DetectController;
 import com.skyflow.vault.controller.VaultController;
 
+import java.util.LinkedHashMap;
+
 public final class Skyflow {
     private final SkyflowClientBuilder builder;
 
@@ -102,17 +102,43 @@ public VaultController vault(String vaultId) throws SkyflowException {
         return controller;
     }
 
-    public ConnectionController connection() {
-        String connectionId = (String) this.builder.connectionsMap.keySet().toArray()[0];
+
+    public ConnectionController connection() throws SkyflowException {
+        Object[] array = this.builder.connectionsMap.keySet().toArray();
+        if (array.length < 1) {
+            LogUtil.printErrorLog(ErrorLogs.CONNECTION_CONFIG_DOES_NOT_EXIST.getLog());
+            throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.ConnectionIdNotInConfigList.getMessage());
+        }
+        String connectionId = (String) array[0];
         return this.connection(connectionId);
     }
 
-    public ConnectionController connection(String connectionId) {
-        return this.builder.connectionsMap.get(connectionId);
+    public ConnectionController connection(String connectionId) throws SkyflowException {
+        ConnectionController controller = this.builder.connectionsMap.get(connectionId);
+        if (controller == null) {
+            LogUtil.printErrorLog(ErrorLogs.CONNECTION_CONFIG_DOES_NOT_EXIST.getLog());
+            throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.ConnectionIdNotInConfigList.getMessage());
+        }
+        return controller;
+    }
+
+    public DetectController detect() throws SkyflowException {
+        Object[] array = this.builder.detectClientsMap.keySet().toArray();
+        if (array.length < 1) {
+            LogUtil.printErrorLog(ErrorLogs.VAULT_CONFIG_DOES_NOT_EXIST.getLog());
+            throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.VaultIdNotInConfigList.getMessage());
+        }
+        String detectId = (String) array[0];
+        return this.detect(detectId);
     }
 
-    public DetectController detect(String vaultId) {
-        return this.builder.detectClientsMap.get(vaultId);
+    public DetectController detect(String vaultId) throws SkyflowException {
+        DetectController controller = this.builder.detectClientsMap.get(vaultId);
+        if (controller == null) {
+            LogUtil.printErrorLog(ErrorLogs.VAULT_CONFIG_DOES_NOT_EXIST.getLog());
+            throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.VaultIdNotInConfigList.getMessage());
+        }
+        return controller;
     }
 
     public static final class SkyflowClientBuilder {
@@ -236,6 +262,9 @@ public SkyflowClientBuilder addSkyflowCredentials(Credentials credentials) throw
             for (VaultController vault : this.vaultClientsMap.values()) {
                 vault.setCommonCredentials(this.skyflowCredentials);
             }
+            for (DetectController detect : this.detectClientsMap.values()) {
+                detect.setCommonCredentials(this.skyflowCredentials);
+            }
             for (ConnectionController connection : this.connectionsMap.values()) {
                 connection.setCommonCredentials(this.skyflowCredentials);
             }

src/main/java/com/skyflow/logs/InfoLogs.java

@@ -76,10 +76,14 @@ public enum InfoLogs {
     INVOKE_CONNECTION_REQUEST_RESOLVED("Invoke connection request resolved."),
 
     // detect
+    VALIDATE_DEIDENTIFY_TEXT_REQUEST("Validating deidentify text request."),
+    DEIDENTIFY_TEXT_SUCCESS("Text data de-identified."),
     DEIDENTIFY_TEXT_TRIGGERED("DeIdentify text method triggered."),
     DEIDENTIFY_TEXT_REQUEST_RESOLVED("DeIdentify text request resolved."),
+    VALIDATE_REIDENTIFY_TEXT_REQUEST("Validating reidentify text request."),
     REIDENTIFY_TEXT_TRIGGERED("ReIdentify text method triggered."),
     REIDENTIFY_TEXT_REQUEST_RESOLVED("ReIdentify text request resolved."),
+    REIDENTIFY_TEXT_SUCCESS("Text data re-identified."),
     ;
 
 

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

@@ -31,6 +31,7 @@ public DeidentifyTextResponse deidentifyText(DeidentifyTextRequest deidentifyTex
         DeidentifyTextResponse deidentifyTextResponse = null;
         try {
             // Validate the request
+            LogUtil.printInfoLog(InfoLogs.VALIDATE_DEIDENTIFY_TEXT_REQUEST.getLog());
             Validations.validateDeidentifyTextRequest(deidentifyTextRequest);
             setBearerToken();
 
@@ -48,8 +49,10 @@ public DeidentifyTextResponse deidentifyText(DeidentifyTextRequest deidentifyTex
             LogUtil.printErrorLog(ErrorLogs.DEIDENTIFY_TEXT_REQUEST_REJECTED.getLog());
             throw new SkyflowException(ex.statusCode(), ex, ex.headers(), ex.body().toString());
         } catch (Exception e) {
+            LogUtil.printErrorLog(ErrorLogs.DEIDENTIFY_TEXT_REQUEST_REJECTED.getLog());
             throw new SkyflowException(e.getMessage(), e);
         }
+        LogUtil.printInfoLog(InfoLogs.DEIDENTIFY_TEXT_SUCCESS.getLog());
         return deidentifyTextResponse;
     }
 
@@ -58,6 +61,7 @@ public ReidentifyTextResponse reidentifyText(ReidentifyTextRequest reidentifyTex
         ReidentifyTextResponse reidentifyTextResponse = null;
         try {
             // Validate the request
+            LogUtil.printInfoLog(InfoLogs.VALIDATE_REIDENTIFY_TEXT_REQUEST.getLog());
             Validations.validateReidentifyTextRequest(reidentifyTextRequest);
             setBearerToken();
             // Parse the request to ReidentifyTextRequest
@@ -74,8 +78,10 @@ public ReidentifyTextResponse reidentifyText(ReidentifyTextRequest reidentifyTex
             LogUtil.printErrorLog(ErrorLogs.REIDENTIFY_TEXT_REQUEST_REJECTED.getLog());
             throw new SkyflowException(ex.statusCode(), ex, ex.headers(), ex.body().toString());
         } catch (Exception e) {
+            LogUtil.printErrorLog(ErrorLogs.REIDENTIFY_TEXT_REQUEST_REJECTED.getLog());
             throw new SkyflowException(e.getMessage(), e);
         }
+        LogUtil.printInfoLog(InfoLogs.REIDENTIFY_TEXT_SUCCESS.getLog());
         return reidentifyTextResponse;
     }
 }

src/main/java/com/skyflow/vault/detect/DeIdentifyRequest.java

@@ -2,6 +2,7 @@
 
 
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 
 import java.util.List;
 
@@ -36,7 +37,7 @@ public int getCharCount() {
 
     @Override
     public String toString() {
-        Gson gson = new Gson();
+        Gson gson = new GsonBuilder().serializeNulls().create();
         return gson.toJson(this);
     }
 

src/main/java/com/skyflow/vault/detect/DeIdentifyResponse.java

@@ -1,6 +1,9 @@
 package com.skyflow.vault.detect;
 
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
 public class ReidentifyTextResponse {
     private final String processedText;
 
@@ -14,8 +17,7 @@ public String getProcessedText() {
 
     @Override
     public String toString() {
-        return "ReidentifyTextResponse{" +
-                "processedText='" + processedText + '\'' +
-                '}';
+        Gson gson = new GsonBuilder().serializeNulls().create();
+        return gson.toJson(this);
     }
 }

src/main/java/com/skyflow/vault/detect/DeidentifyTextResponse.java

@@ -1,6 +1,9 @@
 package com.skyflow.vault.detect;
 
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
 public class TextIndex {
     private final int start;
     private final int end;
@@ -20,9 +23,7 @@ public int getEnd() {
 
     @Override
     public String toString() {
-        return "TextIndex{" +
-                "start=" + start +
-                ", end=" + end +
-                '}';
+        Gson gson = new GsonBuilder().serializeNulls().create();
+        return gson.toJson(this);
     }
 }