From 012d58c92beef833b0e193cb328d7db6d572c208 Mon Sep 17 00:00:00 2001 From: skyflow-vivek Date: Thu, 13 Feb 2025 14:30:59 +0530 Subject: [PATCH 1/2] SK-1875 Add separate redaction types for tokens in Detokenize --- src/main/java/com/skyflow/VaultClient.java | 8 ++- .../utils/validations/Validations.java | 11 ++-- .../skyflow/vault/tokens/DetokenizeData.java | 26 +++++++++ .../vault/tokens/DetokenizeRequest.java | 32 +++++------ .../java/com/skyflow/VaultClientTests.java | 15 +++-- .../skyflow/vault/tokens/DetokenizeTests.java | 57 +++++++++++-------- 6 files changed, 95 insertions(+), 54 deletions(-) create mode 100644 src/main/java/com/skyflow/vault/tokens/DetokenizeData.java diff --git a/src/main/java/com/skyflow/VaultClient.java b/src/main/java/com/skyflow/VaultClient.java index f3e29fb2..eb1cc3fa 100644 --- a/src/main/java/com/skyflow/VaultClient.java +++ b/src/main/java/com/skyflow/VaultClient.java @@ -20,6 +20,7 @@ import com.skyflow.vault.data.InsertRequest; import com.skyflow.vault.data.UpdateRequest; import com.skyflow.vault.tokens.ColumnValue; +import com.skyflow.vault.tokens.DetokenizeData; import com.skyflow.vault.tokens.DetokenizeRequest; import com.skyflow.vault.tokens.TokenizeRequest; import io.github.cdimascio.dotenv.Dotenv; @@ -85,10 +86,11 @@ protected void updateVaultConfig() throws SkyflowException { protected V1DetokenizePayload getDetokenizePayload(DetokenizeRequest request) { V1DetokenizePayload payload = new V1DetokenizePayload(); payload.setContinueOnError(request.getContinueOnError()); - for (String token : request.getTokens()) { + payload.setDownloadURL(request.getDownloadURL()); + for (DetokenizeData detokenizeDataRecord : request.getDetokenizeData()) { V1DetokenizeRecordRequest recordRequest = new V1DetokenizeRecordRequest(); - recordRequest.setToken(token); - recordRequest.setRedaction(request.getRedactionType().getRedaction()); + recordRequest.setToken(detokenizeDataRecord.getToken()); + recordRequest.setRedaction(detokenizeDataRecord.getRedactionType().getRedaction()); payload.addDetokenizationParametersItem(recordRequest); } return payload; diff --git a/src/main/java/com/skyflow/utils/validations/Validations.java b/src/main/java/com/skyflow/utils/validations/Validations.java index 2876c15d..8b7b6fef 100644 --- a/src/main/java/com/skyflow/utils/validations/Validations.java +++ b/src/main/java/com/skyflow/utils/validations/Validations.java @@ -18,6 +18,7 @@ import com.skyflow.vault.connection.InvokeConnectionRequest; import com.skyflow.vault.data.*; import com.skyflow.vault.tokens.ColumnValue; +import com.skyflow.vault.tokens.DetokenizeData; import com.skyflow.vault.tokens.DetokenizeRequest; import com.skyflow.vault.tokens.TokenizeRequest; @@ -212,20 +213,20 @@ public static void validateCredentials(Credentials credentials) throws SkyflowEx } public static void validateDetokenizeRequest(DetokenizeRequest detokenizeRequest) throws SkyflowException { - ArrayList tokens = detokenizeRequest.getTokens(); - if (tokens == null) { + ArrayList detokenizeData = detokenizeRequest.getDetokenizeData(); + if (detokenizeData == null) { LogUtil.printErrorLog(Utils.parameterizedString( ErrorLogs.TOKENS_REQUIRED.getLog(), InterfaceName.DETOKENIZE.getName() )); throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidDataTokens.getMessage()); - } else if (tokens.isEmpty()) { + } else if (detokenizeData.isEmpty()) { LogUtil.printErrorLog(Utils.parameterizedString( ErrorLogs.EMPTY_TOKENS.getLog(), InterfaceName.DETOKENIZE.getName() )); throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyDataTokens.getMessage()); } else { - for (int index = 0; index < tokens.size(); index++) { - String token = tokens.get(index); + for (int index = 0; index < detokenizeData.size(); index++) { + String token = detokenizeData.get(index).getToken(); if (token == null || token.trim().isEmpty()) { LogUtil.printErrorLog(Utils.parameterizedString( ErrorLogs.EMPTY_OR_NULL_TOKEN_IN_TOKENS.getLog(), diff --git a/src/main/java/com/skyflow/vault/tokens/DetokenizeData.java b/src/main/java/com/skyflow/vault/tokens/DetokenizeData.java new file mode 100644 index 00000000..33bba2b9 --- /dev/null +++ b/src/main/java/com/skyflow/vault/tokens/DetokenizeData.java @@ -0,0 +1,26 @@ +package com.skyflow.vault.tokens; + +import com.skyflow.enums.RedactionType; + +public class DetokenizeData { + private final String token; + private final RedactionType redactionType; + + public DetokenizeData(String token) { + this.token = token; + this.redactionType = RedactionType.PLAIN_TEXT; + } + + public DetokenizeData(String token, RedactionType redactionType) { + this.token = token; + this.redactionType = redactionType == null ? RedactionType.PLAIN_TEXT : redactionType; + } + + public String getToken() { + return this.token; + } + + public RedactionType getRedactionType() { + return this.redactionType; + } +} diff --git a/src/main/java/com/skyflow/vault/tokens/DetokenizeRequest.java b/src/main/java/com/skyflow/vault/tokens/DetokenizeRequest.java index d5b8f072..186a18d2 100644 --- a/src/main/java/com/skyflow/vault/tokens/DetokenizeRequest.java +++ b/src/main/java/com/skyflow/vault/tokens/DetokenizeRequest.java @@ -1,7 +1,5 @@ package com.skyflow.vault.tokens; -import com.skyflow.enums.RedactionType; - import java.util.ArrayList; public class DetokenizeRequest { @@ -15,40 +13,40 @@ public static DetokenizeRequestBuilder builder() { return new DetokenizeRequestBuilder(); } - public ArrayList getTokens() { - return this.builder.tokens; - } - - public RedactionType getRedactionType() { - return this.builder.redactionType; + public ArrayList getDetokenizeData() { + return this.builder.detokenizeData; } public Boolean getContinueOnError() { return this.builder.continueOnError; } + public Boolean getDownloadURL() { + return this.builder.downloadURL; + } + public static final class DetokenizeRequestBuilder { - private ArrayList tokens; - private RedactionType redactionType; + private ArrayList detokenizeData; private Boolean continueOnError; + private Boolean downloadURL; private DetokenizeRequestBuilder() { - this.redactionType = RedactionType.PLAIN_TEXT; this.continueOnError = false; + this.downloadURL = false; } - public DetokenizeRequestBuilder tokens(ArrayList tokens) { - this.tokens = tokens; + public DetokenizeRequestBuilder detokenizeData(ArrayList detokenizeData) { + this.detokenizeData = detokenizeData; return this; } - public DetokenizeRequestBuilder redactionType(RedactionType redactionType) { - this.redactionType = redactionType == null ? RedactionType.PLAIN_TEXT : redactionType; + public DetokenizeRequestBuilder continueOnError(Boolean continueOnError) { + this.continueOnError = continueOnError != null && continueOnError; return this; } - public DetokenizeRequestBuilder continueOnError(Boolean continueOnError) { - this.continueOnError = continueOnError != null && continueOnError; + public DetokenizeRequestBuilder downloadURL(Boolean downloadURL) { + this.downloadURL = downloadURL; return this; } diff --git a/src/test/java/com/skyflow/VaultClientTests.java b/src/test/java/com/skyflow/VaultClientTests.java index 8a02caaf..0cd99614 100644 --- a/src/test/java/com/skyflow/VaultClientTests.java +++ b/src/test/java/com/skyflow/VaultClientTests.java @@ -9,6 +9,7 @@ import com.skyflow.vault.data.InsertRequest; import com.skyflow.vault.data.UpdateRequest; import com.skyflow.vault.tokens.ColumnValue; +import com.skyflow.vault.tokens.DetokenizeData; import com.skyflow.vault.tokens.DetokenizeRequest; import com.skyflow.vault.tokens.TokenizeRequest; import io.github.cdimascio.dotenv.Dotenv; @@ -31,7 +32,7 @@ public class VaultClientTests { private static String value = null; private static String columnGroup = null; private static String apiKey = null; - private static ArrayList tokens = null; + private static ArrayList detokenizeData = null; private static ArrayList> insertValues = null; private static ArrayList> insertTokens = null; private static HashMap valueMap = null; @@ -43,7 +44,7 @@ public static void setup() { vaultID = "vault123"; clusterID = "cluster123"; token = "test_token"; - tokens = new ArrayList<>(); + detokenizeData = new ArrayList<>(); table = "test_table"; value = "test_value"; columnGroup = "test_column_group"; @@ -115,11 +116,15 @@ public void testVaultClientGetVaultConfig() { @Test public void testGetDetokenizePayload() { try { - tokens.add(token); - tokens.add(token); - DetokenizeRequest detokenizeRequest = DetokenizeRequest.builder().tokens(tokens).build(); + DetokenizeData detokenizeDataRecord1 = new DetokenizeData(token); + DetokenizeData detokenizeDataRecord2 = new DetokenizeData(token); + detokenizeData.add(detokenizeDataRecord1); + detokenizeData.add(detokenizeDataRecord2); + DetokenizeRequest detokenizeRequest = DetokenizeRequest.builder() + .detokenizeData(detokenizeData).downloadURL(true).build(); V1DetokenizePayload payload = vaultClient.getDetokenizePayload(detokenizeRequest); Assert.assertFalse(payload.getContinueOnError()); + Assert.assertTrue(payload.getDownloadURL()); Assert.assertEquals(2, payload.getDetokenizationParameters().size()); } catch (Exception e) { Assert.fail(INVALID_EXCEPTION_THROWN); diff --git a/src/test/java/com/skyflow/vault/tokens/DetokenizeTests.java b/src/test/java/com/skyflow/vault/tokens/DetokenizeTests.java index 3577f7db..722a6c59 100644 --- a/src/test/java/com/skyflow/vault/tokens/DetokenizeTests.java +++ b/src/test/java/com/skyflow/vault/tokens/DetokenizeTests.java @@ -19,30 +19,33 @@ public class DetokenizeTests { private static final String INVALID_EXCEPTION_THROWN = "Should not have thrown any exception"; private static final String EXCEPTION_NOT_THROWN = "Should have thrown an exception"; - private static String token = null; - private static ArrayList tokens = null; + private static ArrayList detokenizeData = null; + private static DetokenizeData maskedRedactionRecord = null; + private static DetokenizeData plainRedactionRecord = null; @BeforeClass public static void setup() throws SkyflowException, NoSuchMethodException { - tokens = new ArrayList<>(); - token = "test_token_1"; + detokenizeData = new ArrayList<>(); + maskedRedactionRecord = new DetokenizeData("test_token_1", RedactionType.MASKED); + plainRedactionRecord = new DetokenizeData("test_token_2"); } @Before public void setupTest() { - tokens.clear(); + detokenizeData.clear(); } @Test public void testValidInputInDetokenizeRequestValidations() { try { - tokens.add(token); - DetokenizeRequest request = DetokenizeRequest.builder(). - tokens(tokens).redactionType(RedactionType.MASKED).continueOnError(false).build(); + detokenizeData.add(maskedRedactionRecord); + DetokenizeRequest request = DetokenizeRequest.builder() + .detokenizeData(detokenizeData).continueOnError(false).downloadURL(true).build(); Validations.validateDetokenizeRequest(request); - Assert.assertEquals(1, tokens.size()); - Assert.assertEquals(RedactionType.MASKED.toString(), request.getRedactionType().toString()); + Assert.assertEquals(1, request.getDetokenizeData().size()); + Assert.assertEquals(RedactionType.MASKED.toString(), request.getDetokenizeData().get(0).getRedactionType().toString()); Assert.assertFalse(request.getContinueOnError()); + Assert.assertTrue(request.getDownloadURL()); } catch (SkyflowException e) { Assert.fail(INVALID_EXCEPTION_THROWN); } @@ -60,14 +63,14 @@ public void testNoTokensInDetokenizeRequestValidations() { Utils.parameterizedString(ErrorMessage.InvalidDataTokens.getMessage(), Constants.SDK_PREFIX), e.getMessage() ); - Assert.assertEquals(RedactionType.PLAIN_TEXT, request.getRedactionType()); Assert.assertFalse(request.getContinueOnError()); + Assert.assertFalse(request.getDownloadURL()); } } @Test public void testEmptyTokensInDetokenizeRequestValidations() { - DetokenizeRequest request = DetokenizeRequest.builder().tokens(tokens).build(); + DetokenizeRequest request = DetokenizeRequest.builder().detokenizeData(detokenizeData).build(); try { Validations.validateDetokenizeRequest(request); Assert.fail(EXCEPTION_NOT_THROWN); @@ -77,16 +80,18 @@ public void testEmptyTokensInDetokenizeRequestValidations() { Utils.parameterizedString(ErrorMessage.EmptyDataTokens.getMessage(), Constants.SDK_PREFIX), e.getMessage() ); - Assert.assertEquals(RedactionType.PLAIN_TEXT, request.getRedactionType()); Assert.assertFalse(request.getContinueOnError()); + Assert.assertFalse(request.getDownloadURL()); } } @Test public void testEmptyTokenInTokensInDetokenizeRequestValidations() { - tokens.add(token); - tokens.add(""); - DetokenizeRequest request = DetokenizeRequest.builder().tokens(tokens).build(); + DetokenizeData detokenizeDataRecord = new DetokenizeData(""); + detokenizeData.add(maskedRedactionRecord); + detokenizeData.add(detokenizeDataRecord); + + DetokenizeRequest request = DetokenizeRequest.builder().detokenizeData(detokenizeData).build(); try { Validations.validateDetokenizeRequest(request); Assert.fail(EXCEPTION_NOT_THROWN); @@ -96,16 +101,18 @@ public void testEmptyTokenInTokensInDetokenizeRequestValidations() { Utils.parameterizedString(ErrorMessage.EmptyTokenInDataTokens.getMessage(), Constants.SDK_PREFIX), e.getMessage() ); - Assert.assertEquals(RedactionType.PLAIN_TEXT, request.getRedactionType()); Assert.assertFalse(request.getContinueOnError()); + Assert.assertFalse(request.getDownloadURL()); } } @Test public void testNullTokenInTokensInDetokenizeRequestValidations() { - tokens.add(token); - tokens.add(null); - DetokenizeRequest request = DetokenizeRequest.builder().tokens(tokens).build(); + DetokenizeData detokenizeDataRecord = new DetokenizeData(null); + detokenizeData.add(maskedRedactionRecord); + detokenizeData.add(detokenizeDataRecord); + + DetokenizeRequest request = DetokenizeRequest.builder().detokenizeData(detokenizeData).build(); try { Validations.validateDetokenizeRequest(request); Assert.fail(EXCEPTION_NOT_THROWN); @@ -115,20 +122,22 @@ public void testNullTokenInTokensInDetokenizeRequestValidations() { Utils.parameterizedString(ErrorMessage.EmptyTokenInDataTokens.getMessage(), Constants.SDK_PREFIX), e.getMessage() ); - Assert.assertEquals(RedactionType.PLAIN_TEXT, request.getRedactionType()); Assert.assertFalse(request.getContinueOnError()); + Assert.assertFalse(request.getDownloadURL()); } } @Test public void testRedactionAndContinueOnErrorInDetokenizeRequestValidations() { - tokens.add(token); + detokenizeData.add(plainRedactionRecord); + DetokenizeRequest request = DetokenizeRequest.builder(). - tokens(tokens).redactionType(null).continueOnError(null).build(); + detokenizeData(detokenizeData).continueOnError(null).build(); try { Validations.validateDetokenizeRequest(request); - Assert.assertEquals(RedactionType.PLAIN_TEXT, request.getRedactionType()); + Assert.assertEquals(RedactionType.PLAIN_TEXT, request.getDetokenizeData().get(0).getRedactionType()); Assert.assertFalse(request.getContinueOnError()); + Assert.assertFalse(request.getDownloadURL()); } catch (SkyflowException e) { Assert.fail(INVALID_EXCEPTION_THROWN); } From fe43c66cf784521092079d00ed3fe803ac61c729 Mon Sep 17 00:00:00 2001 From: skyflow-vivek Date: Thu, 13 Feb 2025 16:58:42 +0530 Subject: [PATCH 2/2] SK-1875 Add separate redaction types for tokens in Detokenize - Update error messages and logs according to changes - Update detokenize sample to work with new changes --- .../com/example/vault/DetokenizeExample.java | 27 +++++++++++-------- .../java/com/skyflow/errors/ErrorMessage.java | 6 ++--- src/main/java/com/skyflow/logs/ErrorLogs.java | 5 ++-- .../utils/validations/Validations.java | 12 ++++----- .../controller/VaultControllerTests.java | 2 +- .../skyflow/vault/tokens/DetokenizeTests.java | 12 ++++----- 6 files changed, 35 insertions(+), 29 deletions(-) diff --git a/samples/src/main/java/com/example/vault/DetokenizeExample.java b/samples/src/main/java/com/example/vault/DetokenizeExample.java index f25d2be0..78f102a3 100644 --- a/samples/src/main/java/com/example/vault/DetokenizeExample.java +++ b/samples/src/main/java/com/example/vault/DetokenizeExample.java @@ -7,6 +7,7 @@ import com.skyflow.enums.LogLevel; import com.skyflow.enums.RedactionType; import com.skyflow.errors.SkyflowException; +import com.skyflow.vault.tokens.DetokenizeData; import com.skyflow.vault.tokens.DetokenizeRequest; import com.skyflow.vault.tokens.DetokenizeResponse; @@ -52,13 +53,15 @@ public static void main(String[] args) throws SkyflowException { // Example 1: Detokenize tokens from the first vault try { - ArrayList tokens1 = new ArrayList<>(); - tokens1.add(""); // Replace with the first token to detokenize - tokens1.add(""); // Replace with the second token to detokenize + ArrayList detokenizeData1 = new ArrayList<>(); + DetokenizeData detokenizeDataRecord1 = new DetokenizeData("", RedactionType.MASKED); // Replace with a token to detokenize with MASKED redaction + DetokenizeData detokenizeDataRecord2 = new DetokenizeData(""); // Replace with another token to detokenize with PLAIN_TEXT redaction + detokenizeData1.add(detokenizeDataRecord1); + detokenizeData1.add(detokenizeDataRecord2); DetokenizeRequest detokenizeRequest1 = DetokenizeRequest.builder() - .tokens(tokens1) // Specify the tokens to detokenize - .continueOnError(true) // Continue processing even if an error occurs for some tokens + .detokenizeData(detokenizeData1) // Specify the tokens to detokenize with specified redaction types + .continueOnError(true) // Continue processing even if an error occurs for some tokens .build(); DetokenizeResponse detokenizeResponse1 = skyflowClient.vault().detokenize(detokenizeRequest1); // Perform detokenization @@ -70,14 +73,16 @@ public static void main(String[] args) throws SkyflowException { // Example 2: Detokenize tokens from the second vault try { - ArrayList tokens2 = new ArrayList<>(); - tokens2.add(""); // Replace with the first token to detokenize - tokens2.add(""); // Replace with the second token to detokenize + ArrayList detokenizeData2 = new ArrayList<>(); + DetokenizeData detokenizeDataRecord3 = new DetokenizeData("", RedactionType.DEFAULT); // Replace with a token to detokenize + DetokenizeData detokenizeDataRecord4 = new DetokenizeData(""); // Replace with another token to detokenize + detokenizeData2.add(detokenizeDataRecord3); + detokenizeData2.add(detokenizeDataRecord4); DetokenizeRequest detokenizeRequest2 = DetokenizeRequest.builder() - .tokens(tokens2) // Specify the tokens to detokenize - .continueOnError(false) // Stop processing on the first error - .redactionType(RedactionType.DEFAULT) // Use the default redaction type for detokenization + .detokenizeData(detokenizeData2) // Specify the tokens to detokenize with specified redaction types + .continueOnError(false) // Stop processing on the first error + .downloadURL(true) // Specify whether to return URLs for file data type .build(); DetokenizeResponse detokenizeResponse2 = skyflowClient.vault("").detokenize(detokenizeRequest2); // Perform detokenization diff --git a/src/main/java/com/skyflow/errors/ErrorMessage.java b/src/main/java/com/skyflow/errors/ErrorMessage.java index d6af06aa..da992da2 100644 --- a/src/main/java/com/skyflow/errors/ErrorMessage.java +++ b/src/main/java/com/skyflow/errors/ErrorMessage.java @@ -73,9 +73,9 @@ public enum ErrorMessage { BatchInsertFailure("%s0 Insert operation failed."), // detokenize - InvalidDataTokens("%s0 Validation error. Invalid data tokens. Specify valid data tokens."), - EmptyDataTokens("%s0 Validation error. Invalid data tokens. Specify at least one data token."), - EmptyTokenInDataTokens("%s0 Validation error. Invalid data tokens. Specify a valid data token."), + InvalidDetokenizeData("%s0 Validation error. Invalid detokenize data. Specify valid detokenize data."), + EmptyDetokenizeData("%s0 Validation error. Invalid data tokens. Specify at least one data token."), + EmptyTokenInDetokenizeData("%s0 Validation error. Invalid data tokens. Specify a valid data token."), // get interface IdsKeyError("%s0 Validation error. 'ids' key is missing from the payload. Specify an 'ids' key."), diff --git a/src/main/java/com/skyflow/logs/ErrorLogs.java b/src/main/java/com/skyflow/logs/ErrorLogs.java index 64e40c82..ad588aa0 100644 --- a/src/main/java/com/skyflow/logs/ErrorLogs.java +++ b/src/main/java/com/skyflow/logs/ErrorLogs.java @@ -61,8 +61,9 @@ public enum ErrorLogs { INSUFFICIENT_TOKENS_PASSED_FOR_TOKEN_MODE_ENABLE_STRICT("Invalid %s1 request. For tokenMode as ENABLE_STRICT, tokens should be passed for all fields."), MISMATCH_OF_FIELDS_AND_TOKENS("Invalid %s1 request. Keys for values and tokens are not matching."), INSERT_RECORDS_REJECTED("Insert request resulted in failure."), - TOKENS_REQUIRED("Invalid %s1 request. Tokens are required."), - EMPTY_OR_NULL_TOKEN_IN_TOKENS("Invalid %s1 request. Token can not be null or empty in tokens at index %s2."), + DETOKENIZE_DATA_REQUIRED("Invalid %s1 request. Detokenize data is required."), + EMPTY_DETOKENIZE_DATA("Invalid %s1 request. Detokenize data can not be empty."), + EMPTY_OR_NULL_TOKEN_IN_DETOKENIZE_DATA("Invalid %s1 request. Token can not be null or empty in detokenize data at index %s2."), REDACTION_IS_REQUIRED("Invalid %s1 request. Redaction is required."), DETOKENIZE_REQUEST_REJECTED("Detokenize request resulted in failure."), IDS_IS_REQUIRED("Invalid %s1 request. Ids are required."), diff --git a/src/main/java/com/skyflow/utils/validations/Validations.java b/src/main/java/com/skyflow/utils/validations/Validations.java index 8b7b6fef..5e192349 100644 --- a/src/main/java/com/skyflow/utils/validations/Validations.java +++ b/src/main/java/com/skyflow/utils/validations/Validations.java @@ -216,23 +216,23 @@ public static void validateDetokenizeRequest(DetokenizeRequest detokenizeRequest ArrayList detokenizeData = detokenizeRequest.getDetokenizeData(); if (detokenizeData == null) { LogUtil.printErrorLog(Utils.parameterizedString( - ErrorLogs.TOKENS_REQUIRED.getLog(), InterfaceName.DETOKENIZE.getName() + ErrorLogs.DETOKENIZE_DATA_REQUIRED.getLog(), InterfaceName.DETOKENIZE.getName() )); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidDataTokens.getMessage()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidDetokenizeData.getMessage()); } else if (detokenizeData.isEmpty()) { LogUtil.printErrorLog(Utils.parameterizedString( - ErrorLogs.EMPTY_TOKENS.getLog(), InterfaceName.DETOKENIZE.getName() + ErrorLogs.EMPTY_DETOKENIZE_DATA.getLog(), InterfaceName.DETOKENIZE.getName() )); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyDataTokens.getMessage()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyDetokenizeData.getMessage()); } else { for (int index = 0; index < detokenizeData.size(); index++) { String token = detokenizeData.get(index).getToken(); if (token == null || token.trim().isEmpty()) { LogUtil.printErrorLog(Utils.parameterizedString( - ErrorLogs.EMPTY_OR_NULL_TOKEN_IN_TOKENS.getLog(), + ErrorLogs.EMPTY_OR_NULL_TOKEN_IN_DETOKENIZE_DATA.getLog(), InterfaceName.DETOKENIZE.getName(), Integer.toString(index) )); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyTokenInDataTokens.getMessage()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyTokenInDetokenizeData.getMessage()); } } } diff --git a/src/test/java/com/skyflow/vault/controller/VaultControllerTests.java b/src/test/java/com/skyflow/vault/controller/VaultControllerTests.java index 66621003..6084e9c3 100644 --- a/src/test/java/com/skyflow/vault/controller/VaultControllerTests.java +++ b/src/test/java/com/skyflow/vault/controller/VaultControllerTests.java @@ -71,7 +71,7 @@ public void testInvalidRequestInDetokenizeMethod() { } catch (SkyflowException e) { Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode()); Assert.assertEquals( - Utils.parameterizedString(ErrorMessage.InvalidDataTokens.getMessage(), Constants.SDK_PREFIX), + Utils.parameterizedString(ErrorMessage.InvalidDetokenizeData.getMessage(), Constants.SDK_PREFIX), e.getMessage() ); } diff --git a/src/test/java/com/skyflow/vault/tokens/DetokenizeTests.java b/src/test/java/com/skyflow/vault/tokens/DetokenizeTests.java index 722a6c59..aea06095 100644 --- a/src/test/java/com/skyflow/vault/tokens/DetokenizeTests.java +++ b/src/test/java/com/skyflow/vault/tokens/DetokenizeTests.java @@ -60,7 +60,7 @@ public void testNoTokensInDetokenizeRequestValidations() { } catch (SkyflowException e) { Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode()); Assert.assertEquals( - Utils.parameterizedString(ErrorMessage.InvalidDataTokens.getMessage(), Constants.SDK_PREFIX), + Utils.parameterizedString(ErrorMessage.InvalidDetokenizeData.getMessage(), Constants.SDK_PREFIX), e.getMessage() ); Assert.assertFalse(request.getContinueOnError()); @@ -77,7 +77,7 @@ public void testEmptyTokensInDetokenizeRequestValidations() { } catch (SkyflowException e) { Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode()); Assert.assertEquals( - Utils.parameterizedString(ErrorMessage.EmptyDataTokens.getMessage(), Constants.SDK_PREFIX), + Utils.parameterizedString(ErrorMessage.EmptyDetokenizeData.getMessage(), Constants.SDK_PREFIX), e.getMessage() ); Assert.assertFalse(request.getContinueOnError()); @@ -86,7 +86,7 @@ public void testEmptyTokensInDetokenizeRequestValidations() { } @Test - public void testEmptyTokenInTokensInDetokenizeRequestValidations() { + public void testEmptyTokenInDetokenizeRequestValidations() { DetokenizeData detokenizeDataRecord = new DetokenizeData(""); detokenizeData.add(maskedRedactionRecord); detokenizeData.add(detokenizeDataRecord); @@ -98,7 +98,7 @@ public void testEmptyTokenInTokensInDetokenizeRequestValidations() { } catch (SkyflowException e) { Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode()); Assert.assertEquals( - Utils.parameterizedString(ErrorMessage.EmptyTokenInDataTokens.getMessage(), Constants.SDK_PREFIX), + Utils.parameterizedString(ErrorMessage.EmptyTokenInDetokenizeData.getMessage(), Constants.SDK_PREFIX), e.getMessage() ); Assert.assertFalse(request.getContinueOnError()); @@ -107,7 +107,7 @@ public void testEmptyTokenInTokensInDetokenizeRequestValidations() { } @Test - public void testNullTokenInTokensInDetokenizeRequestValidations() { + public void testNullTokenInDetokenizeRequestValidations() { DetokenizeData detokenizeDataRecord = new DetokenizeData(null); detokenizeData.add(maskedRedactionRecord); detokenizeData.add(detokenizeDataRecord); @@ -119,7 +119,7 @@ public void testNullTokenInTokensInDetokenizeRequestValidations() { } catch (SkyflowException e) { Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode()); Assert.assertEquals( - Utils.parameterizedString(ErrorMessage.EmptyTokenInDataTokens.getMessage(), Constants.SDK_PREFIX), + Utils.parameterizedString(ErrorMessage.EmptyTokenInDetokenizeData.getMessage(), Constants.SDK_PREFIX), e.getMessage() ); Assert.assertFalse(request.getContinueOnError());