Skip to content

Commit 2584322

Browse files
saileshwar-skyflowsaileshwar-skyflow
committed
SK-2071: resolve comments
1 parent 06f1872 commit 2584322

File tree

11 files changed

+116
-125
lines changed

11 files changed

+116
-125
lines changed

‎src/main/java/com/skyflow/enums/DeidentifyFileStatus.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package com.skyflow.enums;
2+
3+
public enum DeidentifyFileStatus {
4+
IN_PROGRESS("IN_PROGRESS"),
5+
SUCCESS("SUCCESS");
6+
7+
private final String value;
8+
9+
DeidentifyFileStatus(String value) {
10+
this.value = value;
11+
}
12+
13+
public String value() {
14+
return value;
15+
}
16+
}

‎src/main/java/com/skyflow/utils/Constants.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,5 @@ public final class Constants {
2525
public static final String SDK_AUTH_HEADER_KEY = "x-skyflow-authorization";
2626
public static final String SDK_METRICS_HEADER_KEY = "sky-metadata";
2727
public static final String REQUEST_ID_HEADER_KEY = "x-request-id";
28-
public static final String DEIDENTIFY_FILE_IN_PROGRESS_STATUS = "IN_PROGRESS";
29-
public static final String DEIDENTIFY_FILE_SUCCESS_STATUS = "SUCCESS";
3028
public static final String PROCESSED_FILE_NAME_PREFIX = "processed-";
3129
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.skyflow.VaultClient;
55
import com.skyflow.config.Credentials;
66
import com.skyflow.config.VaultConfig;
7+
import com.skyflow.enums.DeidentifyFileStatus;
78
import com.skyflow.errors.ErrorCode;
89
import com.skyflow.errors.ErrorMessage;
910
import com.skyflow.errors.SkyflowException;
@@ -124,7 +125,7 @@ public DeidentifyFileResponse deidentifyFile(DeidentifyFileRequest request) thro
124125
throw new SkyflowException(ErrorCode.SERVER_ERROR.getCode(), ErrorMessage.PollingForResultsFailed.getMessage());
125126
}
126127

127-
if (Constants.DEIDENTIFY_FILE_SUCCESS_STATUS.equalsIgnoreCase(response.getStatus())) {
128+
if (DeidentifyFileStatus.SUCCESS.value().equalsIgnoreCase(response.getStatus())) {
128129
String base64File = response.getFileBase64();
129130
if (base64File != null) {
130131
byte[] decodedBytes = Base64.getDecoder().decode(base64File);
@@ -177,9 +178,9 @@ private DeidentifyFileResponse pollForResults(String runId, Integer maxWaitTime)
177178

178179
DeidentifyStatusResponseStatus status = response.getStatus();
179180

180-
if (Constants.DEIDENTIFY_FILE_IN_PROGRESS_STATUS.equalsIgnoreCase(String.valueOf(status))) {
181+
if (DeidentifyFileStatus.IN_PROGRESS.value().equalsIgnoreCase(String.valueOf(status))) {
181182
if (currentWaitTime >= maxWaitTime) {
182-
return new DeidentifyFileResponse(runId, Constants.DEIDENTIFY_FILE_IN_PROGRESS_STATUS);
183+
return new DeidentifyFileResponse(runId, DeidentifyFileStatus.IN_PROGRESS.value());
183184
}
184185

185186
int nextWaitTime = currentWaitTime * 2;

‎src/main/java/com/skyflow/vault/detect/TextIndex.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import com.google.gson.GsonBuilder;
66

77
public class TextIndex {
8-
private final int start;
9-
private final int end;
8+
private final Integer start;
9+
private final Integer end;
1010

11-
public TextIndex(int start, int end) {
11+
public TextIndex(Integer start, Integer end) {
1212
this.start = start;
1313
this.end = end;
1414
}

‎src/test/java/com/skyflow/VaultClientTests.java‎

Lines changed: 15 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,14 @@
4141

4242
public class VaultClientTests {
4343
private static final String INVALID_EXCEPTION_THROWN = "Should not have thrown any exception";
44-
private static final String EXCEPTION_NOT_THROWN = "Should have thrown an exception";
4544
private static VaultClient vaultClient;
4645
private static String vaultID = null;
4746
private static String clusterID = null;
4847
private static String token = null;
4948
private static String table = null;
5049
private static String value = null;
5150
private static String columnGroup = null;
52-
private static String apiKey = null;
51+
private static String apiKey = "sky-ab123-abcd1234cdef1234abcd4321cdef4321";
5352
private static ArrayList<DetokenizeData> detokenizeData = null;
5453
private static ArrayList<HashMap<String, Object>> insertValues = null;
5554
private static ArrayList<HashMap<String, Object>> insertTokens = null;
@@ -58,7 +57,7 @@ public class VaultClientTests {
5857
private static VaultConfig vaultConfig;
5958

6059
@BeforeClass
61-
public static void setup() {
60+
public static void setup() throws SkyflowException {
6261
vaultID = "vault123";
6362
clusterID = "cluster123";
6463
token = "test_token";
@@ -72,80 +71,56 @@ public static void setup() {
7271
valueMap = new HashMap<>();
7372
tokenMap = new HashMap<>();
7473

75-
Credentials credentials = new Credentials();
76-
credentials.setApiKey(apiKey);
77-
7874
vaultConfig = new VaultConfig();
7975
vaultConfig.setVaultId(vaultID);
8076
vaultConfig.setClusterId(clusterID);
8177
vaultConfig.setEnv(Env.PROD);
78+
79+
Credentials credentials = new Credentials();
80+
credentials.setApiKey("sky-ab123-abcd1234cdef1234abcd4321cdef4321");
81+
vaultConfig.setCredentials(credentials);
8282
vaultClient = new VaultClient(vaultConfig, credentials);
83+
vaultClient.setBearerToken();
8384
}
8485

8586
@Test
8687
public void testVaultClientGetRecordsAPI() {
8788
try {
88-
Credentials credentials = new Credentials();
89-
credentials.setApiKey("sky-ab123-abcd1234cdef1234abcd4321cdef4321");
90-
vaultConfig.setCredentials(credentials);
91-
vaultClient = new VaultClient(vaultConfig, credentials);
92-
vaultClient.setBearerToken();
93-
9489
RecordsClient recordsClient = vaultClient.getRecordsApi();
95-
Assert.assertNotNull("RecordsClient should not be null", recordsClient);
90+
Assert.assertNotNull(recordsClient);
9691
} catch (Exception e) {
97-
9892
e.printStackTrace();
99-
Assert.fail("Should not have thrown any exception: " + e.getMessage());
93+
Assert.fail(INVALID_EXCEPTION_THROWN + e.getMessage());
10094
}
10195
}
10296

10397
@Test
10498
public void testVaultClientDetectAPI() {
10599
try {
106-
Credentials credentials = new Credentials();
107-
credentials.setApiKey("sky-ab123-abcd1234cdef1234abcd4321cdef4321");
108-
vaultConfig.setCredentials(credentials);
109-
vaultClient = new VaultClient(vaultConfig, credentials);
110-
vaultClient.setBearerToken();
111-
112100
FilesClient filesClient = vaultClient.getDetectFileAPi();
113-
Assert.assertNotNull("FilesClient should not be null", filesClient);
101+
Assert.assertNotNull(filesClient);
114102
} catch (Exception e) {
115-
116103
e.printStackTrace();
117-
Assert.fail("Should not have thrown any exception: " + e.getMessage());
104+
Assert.fail(INVALID_EXCEPTION_THROWN + e.getMessage());
118105
}
119106
}
120107

121108
@Test
122109
public void testVaultClientDetectTextAPI() {
123110
try {
124-
Credentials credentials = new Credentials();
125-
credentials.setApiKey("sky-ab123-abcd1234cdef1234abcd4321cdef4321");
126-
vaultConfig.setCredentials(credentials);
127-
vaultClient = new VaultClient(vaultConfig, credentials);
128-
vaultClient.setBearerToken();
129-
130111
StringsClient stringsClient = vaultClient.getDetectTextApi();
131-
Assert.assertNotNull("StringsClient should not be null", stringsClient);
112+
Assert.assertNotNull(stringsClient);
132113
} catch (Exception e) {
133-
134114
e.printStackTrace();
135-
Assert.fail("Should not have thrown any exception: " + e.getMessage());
115+
Assert.fail(INVALID_EXCEPTION_THROWN + e.getMessage());
136116
}
137117
}
138118

139119
@Test
140120
public void testVaultClientGetTokensAPI() {
141121
try {
142-
Credentials credentials = new Credentials();
143-
credentials.setApiKey("sky-ab123-abcd1234cdef1234abcd4321cdef4321");
144-
vaultConfig.setCredentials(credentials);
145-
vaultClient = new VaultClient(vaultConfig, credentials);
146-
vaultClient.setBearerToken();
147122
TokensClient tokensClient = vaultClient.getTokensApi();
148-
Assert.assertNotNull("TokensClient should not be null", tokensClient);
123+
Assert.assertNotNull(tokensClient);
149124
} catch (Exception e) {
150125
Assert.fail(INVALID_EXCEPTION_THROWN);
151126
}
@@ -154,14 +129,8 @@ public void testVaultClientGetTokensAPI() {
154129
@Test
155130
public void testVaultClientGetQueryAPI() {
156131
try {
157-
Credentials credentials = new Credentials();
158-
credentials.setApiKey("sky-ab123-abcd1234cdef1234abcd4321cdef4321");
159-
vaultConfig.setCredentials(credentials);
160-
161-
vaultClient = new VaultClient(vaultConfig, credentials);
162-
vaultClient.setBearerToken();
163132
QueryClient queryClient = vaultClient.getQueryApi();
164-
Assert.assertNotNull("QueryClient should not be null", queryClient);
133+
Assert.assertNotNull(queryClient);
165134
} catch (Exception e) {
166135
Assert.fail(INVALID_EXCEPTION_THROWN);
167136
}

‎src/test/java/com/skyflow/vault/controller/VaultControllerTests.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,21 @@ public void testInvalidRequestInDetokenizeMethod() {
8181
}
8282
}
8383

84-
// @Test
85-
// public void testInvalidRequestInGetMethod() {
86-
// try {
87-
// GetRequest request = GetRequest.builder().build();
88-
// skyflowClient = Skyflow.builder().setLogLevel(LogLevel.DEBUG).addVaultConfig(vaultConfig).build();
89-
// skyflowClient.vault().get(request);
90-
// Assert.fail(EXCEPTION_NOT_THROWN);
91-
// } catch (SkyflowException e) {
92-
// Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
93-
// Assert.assertEquals(
94-
// Utils.parameterizedString(ErrorMessage.TableKeyError.getMessage(), Constants.SDK_PREFIX),
95-
// e.getMessage()
96-
// );
97-
// }
98-
// }
84+
@Test
85+
public void testInvalidRequestInGetMethod() {
86+
try {
87+
GetRequest request = GetRequest.builder().build();
88+
skyflowClient = Skyflow.builder().setLogLevel(LogLevel.DEBUG).addVaultConfig(vaultConfig).build();
89+
skyflowClient.vault().get(request);
90+
Assert.fail(EXCEPTION_NOT_THROWN);
91+
} catch (SkyflowException e) {
92+
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
93+
Assert.assertEquals(
94+
Utils.parameterizedString(ErrorMessage.TableKeyError.getMessage(), Constants.SDK_PREFIX),
95+
e.getMessage()
96+
);
97+
}
98+
}
9999

100100
@Test
101101
public void testInvalidRequestInUpdateMethod() {

‎src/test/java/com/skyflow/vault/data/DeleteTests.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -158,16 +158,16 @@ public void testEmptyTableInDeleteRequestValidations() {
158158
}
159159
}
160160

161-
// @Test
162-
// public void testDeleteResponse() {
163-
// try {
164-
// ids.add(skyflowID);
165-
// DeleteResponse response = new DeleteResponse(ids);
166-
// String responseString = "{\"deletedIds\":[\"" + skyflowID + "\"],\"errors\":[]}";
167-
// Assert.assertEquals(1, response.getDeletedIds().size());
168-
// Assert.assertEquals(responseString, response.toString());
169-
// } catch (Exception e) {
170-
// Assert.fail(INVALID_EXCEPTION_THROWN);
171-
// }
172-
// }
161+
@Test
162+
public void testDeleteResponse() {
163+
try {
164+
ids.add(skyflowID);
165+
DeleteResponse response = new DeleteResponse(ids);
166+
String responseString = "{\"deletedIds\":[\"" + skyflowID + "\"],\"errors\":null}";
167+
Assert.assertEquals(1, response.getDeletedIds().size());
168+
Assert.assertEquals(responseString, response.toString());
169+
} catch (Exception e) {
170+
Assert.fail(INVALID_EXCEPTION_THROWN);
171+
}
172+
}
173173
}

‎src/test/java/com/skyflow/vault/data/QueryTests.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,9 @@ public void testQueryResponse() {
9797
String responseString = "{\"fields\":" +
9898
"[{\"card_number\":\"test_card_number\",\"name\":\"test_name\",\"tokenizedData\":{}}," +
9999
"{\"card_number\":\"test_card_number\",\"name\":\"test_name\",\"tokenizedData\":{}}]," +
100-
"\"errors\":[]}";
100+
"\"errors\":null}";
101101
Assert.assertEquals(2, response.getFields().size());
102+
Assert.assertEquals(responseString, response.toString());
102103
} catch (Exception e) {
103104
Assert.fail(INVALID_EXCEPTION_THROWN);
104105
}

‎src/test/java/com/skyflow/vault/data/UpdateTests.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,9 +448,10 @@ public void testUpdateResponse() {
448448
UpdateResponse response = new UpdateResponse(skyflowID, tokenMap);
449449
String responseString = "{\"updatedField\":{\"skyflowId\":\"" + skyflowID + "\","
450450
+ "\"test_column_1\":\"test_token_1\",\"test_column_2\":\"test_token_2\"}" +
451-
",\"errors\":[]}";
451+
",\"errors\":null}";
452452
Assert.assertEquals(skyflowID, response.getSkyflowId());
453453
Assert.assertEquals(2, response.getTokens().size());
454+
Assert.assertEquals(responseString, response.toString());
454455
} catch (Exception e) {
455456
Assert.fail(INVALID_EXCEPTION_THROWN);
456457
}

‎src/test/java/com/skyflow/vault/tokens/DetokenizeTests.java‎

Lines changed: 45 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.skyflow.errors.ErrorCode;
55
import com.skyflow.errors.ErrorMessage;
66
import com.skyflow.errors.SkyflowException;
7+
import com.skyflow.generated.rest.types.DetokenizeRecordResponseValueType;
78
import com.skyflow.generated.rest.types.V1DetokenizeRecordResponse;
89
import com.skyflow.utils.Constants;
910
import com.skyflow.utils.Utils;
@@ -143,45 +144,48 @@ public void testRedactionAndContinueOnErrorInDetokenizeRequestValidations() {
143144
}
144145
}
145146

146-
// @Test
147-
// public void testDetokenizeResponse() {
148-
// try {
149-
// V1DetokenizeRecordResponse record1 = new V1DetokenizeRecordResponse();
150-
// record1.setToken("1234-5678-9012-3456");
151-
// record1.setValue("4111111111111111");
152-
// record1.setValueType(DetokenizeRecordResponseValueType.STRING);
153-
// DetokenizeRecordResponse field = new DetokenizeRecordResponse(record1);
154-
//
155-
// V1DetokenizeRecordResponse record2 = new V1DetokenizeRecordResponse();
156-
// record2.setToken("3456-7890-1234-5678");
157-
// record2.setValue("");
158-
// record2.setError("Invalid token");
159-
// DetokenizeRecordResponse error = new DetokenizeRecordResponse(record2, requestId);
160-
//
161-
// ArrayList<DetokenizeRecordResponse> fields = new ArrayList<>();
162-
// fields.add(field);
163-
// fields.add(field);
164-
//
165-
// ArrayList<DetokenizeRecordResponse> errors = new ArrayList<>();
166-
// errors.add(error);
167-
// errors.add(error);
168-
//
169-
// DetokenizeResponse response = new DetokenizeResponse(fields, errors);
170-
// String responseString = "{\"detokenizedFields\":[{" +
171-
// "\"token\":\"1234-5678-9012-3456\",\"value\":\"4111111111111111\",\"type\":\"STRING\"}," +
172-
// "{\"token\":\"1234-5678-9012-3456\",\"value\":\"4111111111111111\",\"type\":\"STRING\"}]," +
173-
// "\"errors\":[{\"token\":\"3456-7890-1234-5678\",\"error\":\"Invalid token\",\"requestId\":\"" + requestId + "\"}," +
174-
// "{\"token\":\"3456-7890-1234-5678\",\"error\":\"Invalid token\",\"requestId\":\"" + requestId + "\"}]}";
175-
// Assert.assertEquals(2, response.getDetokenizedFields().size());
176-
// Assert.assertEquals(2, response.getErrors().size());
177-
// Assert.assertEquals("1234-5678-9012-3456", response.getDetokenizedFields().get(0).getToken());
178-
// Assert.assertEquals("4111111111111111", response.getDetokenizedFields().get(0).getValue());
179-
// Assert.assertEquals("STRING", response.getDetokenizedFields().get(0).getType());
180-
// Assert.assertEquals("Invalid token", response.getErrors().get(0).getError());
181-
// Assert.assertEquals(requestId, response.getErrors().get(0).getRequestId());
182-
// Assert.assertEquals(responseString, response.toString());
183-
// } catch (Exception e) {
184-
// Assert.fail(INVALID_EXCEPTION_THROWN);
185-
// }
186-
// }
147+
@Test
148+
public void testDetokenizeResponse() {
149+
try {
150+
V1DetokenizeRecordResponse record1 = V1DetokenizeRecordResponse.builder()
151+
.token("1234-5678-9012-3456")
152+
.value("4111111111111111")
153+
.valueType(DetokenizeRecordResponseValueType.STRING)
154+
.build();
155+
DetokenizeRecordResponse field = new DetokenizeRecordResponse(record1);
156+
157+
V1DetokenizeRecordResponse record2 = V1DetokenizeRecordResponse.builder()
158+
.token("3456-7890-1234-5678")
159+
.value("")
160+
.error("Invalid token")
161+
.build();
162+
163+
DetokenizeRecordResponse error = new DetokenizeRecordResponse(record2, requestId);
164+
165+
ArrayList<DetokenizeRecordResponse> fields = new ArrayList<>();
166+
fields.add(field);
167+
fields.add(field);
168+
169+
ArrayList<DetokenizeRecordResponse> errors = new ArrayList<>();
170+
errors.add(error);
171+
errors.add(error);
172+
173+
DetokenizeResponse response = new DetokenizeResponse(fields, errors);
174+
String responseString = "{\"detokenizedFields\":[{" +
175+
"\"token\":\"1234-5678-9012-3456\",\"value\":\"4111111111111111\",\"type\":\"STRING\"}," +
176+
"{\"token\":\"1234-5678-9012-3456\",\"value\":\"4111111111111111\",\"type\":\"STRING\"}]," +
177+
"\"errors\":[{\"token\":\"3456-7890-1234-5678\",\"error\":\"Invalid token\",\"requestId\":\"" + requestId + "\"}," +
178+
"{\"token\":\"3456-7890-1234-5678\",\"error\":\"Invalid token\",\"requestId\":\"" + requestId + "\"}]}";
179+
Assert.assertEquals(2, response.getDetokenizedFields().size());
180+
Assert.assertEquals(2, response.getErrors().size());
181+
Assert.assertEquals("1234-5678-9012-3456", response.getDetokenizedFields().get(0).getToken());
182+
Assert.assertEquals("4111111111111111", response.getDetokenizedFields().get(0).getValue());
183+
Assert.assertEquals("STRING", response.getDetokenizedFields().get(0).getType());
184+
Assert.assertEquals("Invalid token", response.getErrors().get(0).getError());
185+
Assert.assertEquals(requestId, response.getErrors().get(0).getRequestId());
186+
Assert.assertEquals(responseString, response.toString());
187+
} catch (Exception e) {
188+
Assert.fail(INVALID_EXCEPTION_THROWN);
189+
}
190+
}
187191
}

0 commit comments

Comments
 (0)