Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public static void validateDetokenizeRequest(DetokenizeRequest request) throws S
));
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.DetokenizeRequestNull.getMessage());
}
ArrayList<String> tokens = request.getTokens();
List<String> tokens = request.getTokens();
if (tokens == null || tokens.isEmpty()) {
LogUtil.printErrorLog(Utils.parameterizedString(
ErrorLogs.EMPTY_DETOKENIZE_DATA.getLog(), InterfaceName.DETOKENIZE.getName()
Expand All @@ -96,7 +96,7 @@ public static void validateDetokenizeRequest(DetokenizeRequest request) throws S
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyTokenInDetokenizeData.getMessage());
}
}
ArrayList<TokenGroupRedactions> groupRedactions = request.getTokenGroupRedactions();
List<TokenGroupRedactions> groupRedactions = request.getTokenGroupRedactions();
if (groupRedactions != null && !groupRedactions.isEmpty()) {
for (TokenGroupRedactions group : groupRedactions) {
if (group == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ private com.skyflow.vault.data.InsertResponse processSync(

private DetokenizeResponse processDetokenizeSync(
com.skyflow.generated.rest.resources.recordservice.requests.DetokenizeRequest detokenizeRequest,
ArrayList<String> originalTokens
List<String> originalTokens
) throws ExecutionException, InterruptedException, SkyflowException {
LogUtil.printInfoLog(InfoLogs.PROCESSING_BATCHES.getLog());
List<ErrorRecord> errorTokens = Collections.synchronizedList(new ArrayList<>());
Expand Down
13 changes: 7 additions & 6 deletions v3/src/main/java/com/skyflow/vault/data/DetokenizeRequest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.skyflow.vault.data;

import java.util.ArrayList;
import java.util.List;

public class DetokenizeRequest {
private final DetokenizeRequestBuilder builder;
Expand All @@ -11,23 +12,23 @@ private DetokenizeRequest(DetokenizeRequestBuilder builder){
public static DetokenizeRequestBuilder builder(){
return new DetokenizeRequestBuilder();
}
public ArrayList<String> getTokens(){
public List<String> getTokens(){
return this.builder.tokens;
}
public ArrayList<TokenGroupRedactions> getTokenGroupRedactions(){
public List<TokenGroupRedactions> getTokenGroupRedactions(){
return this.builder.tokenGroupRedactions;
}

public static final class DetokenizeRequestBuilder{
private ArrayList<String> tokens;
private List<String> tokens;

private ArrayList<TokenGroupRedactions> tokenGroupRedactions;
private List<TokenGroupRedactions> tokenGroupRedactions;

public DetokenizeRequestBuilder tokens(ArrayList<String> tokens){
public DetokenizeRequestBuilder tokens(List<String> tokens){
this.tokens = tokens;
return this;
}
public DetokenizeRequestBuilder tokenGroupRedactions(ArrayList<TokenGroupRedactions> tokenGroupRedactions){
public DetokenizeRequestBuilder tokenGroupRedactions(List<TokenGroupRedactions> tokenGroupRedactions){
this.tokenGroupRedactions = tokenGroupRedactions;
return this;
}
Expand Down
15 changes: 13 additions & 2 deletions v3/src/main/java/com/skyflow/vault/data/DetokenizeResponse.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;

public class DetokenizeResponse {
@Expose(serialize = true)
Expand All @@ -18,8 +19,7 @@ public class DetokenizeResponse {
private List<ErrorRecord> errors;

private List<String> originalPayload;
private ArrayList<HashMap<String, Object>> recordsToRetry;

private List<String> recordsToRetry;

public DetokenizeResponse(List<DetokenizeResponseObject> success, List<ErrorRecord> errors) {
this.success = success;
Expand All @@ -34,6 +34,17 @@ public DetokenizeResponse(List<DetokenizeResponseObject> success, List<ErrorReco
this.summary = new DetokenizeSummary(this.originalPayload.size(), this.success.size(), this.errors.size());
}

public List<String> getTokensToRetry() {
if (recordsToRetry == null) {
recordsToRetry = new ArrayList<>();
recordsToRetry = errors.stream()
.filter(error -> (error.getCode() >= 500 && error.getCode() <= 599) && error.getCode() != 529)
.map(errorRecord -> originalPayload.get(errorRecord.getIndex()))
.collect(Collectors.toList());
}
return recordsToRetry;
}

public List<DetokenizeResponseObject> getSuccess() {
return success;
}
Expand Down
Loading