From 1cc246e197af8c7d0871fdd6ef38be50760d8610 Mon Sep 17 00:00:00 2001 From: skyflow-bharti Date: Sat, 20 Sep 2025 02:12:03 +0530 Subject: [PATCH 1/3] SK-2302 fixed detokenize token redaction --- v3/src/main/java/com/skyflow/utils/Utils.java | 2 +- .../com/skyflow/vault/data/DetokenizeResponseObject.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/v3/src/main/java/com/skyflow/utils/Utils.java b/v3/src/main/java/com/skyflow/utils/Utils.java index ec5fd6d8..cb9f4800 100644 --- a/v3/src/main/java/com/skyflow/utils/Utils.java +++ b/v3/src/main/java/com/skyflow/utils/Utils.java @@ -55,7 +55,7 @@ public static List createDetokenizeBatches(DetokenizeRequest // Create a sublist for the current batch List batchTokens = tokens.subList(i, Math.min(i + batchSize, tokens.size())); List tokenGroupRedactions = null; - if (request.getTokenGroupRedactions().isPresent() && !request.getTokenGroupRedactions().get().isEmpty() && i < request.getTokenGroupRedactions().get().size()) { + if (request.getTokenGroupRedactions().isPresent() && !request.getTokenGroupRedactions().get().isEmpty()){ tokenGroupRedactions = request.getTokenGroupRedactions().get(); } // Build a new DetokenizeRequest for the current batch diff --git a/v3/src/main/java/com/skyflow/vault/data/DetokenizeResponseObject.java b/v3/src/main/java/com/skyflow/vault/data/DetokenizeResponseObject.java index f45e2724..0e1c57f6 100644 --- a/v3/src/main/java/com/skyflow/vault/data/DetokenizeResponseObject.java +++ b/v3/src/main/java/com/skyflow/vault/data/DetokenizeResponseObject.java @@ -6,6 +6,9 @@ import java.util.Map; public class DetokenizeResponseObject { + @Expose(serialize = true) + private int index; + @Expose(serialize = true) private String token; @Expose(serialize = true) @@ -15,9 +18,6 @@ public class DetokenizeResponseObject { @Expose(serialize = true) private String error; - @Expose(serialize = true) - private int index; - @Expose(serialize = true) private Map metadata; From 4401e48fd84f38124504d9620215cf72163b5ffb Mon Sep 17 00:00:00 2001 From: skyflow-bharti Date: Mon, 22 Sep 2025 05:11:13 +0000 Subject: [PATCH 2/3] [AUTOMATED] Private Release 2.0.0-dev-3a80c07 --- v3/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/pom.xml b/v3/pom.xml index a93975a4..ca44c47b 100644 --- a/v3/pom.xml +++ b/v3/pom.xml @@ -11,7 +11,7 @@ com.skyflow skyflow-java - 2.0.0-dev.b40c279 + 2.0.0-dev.3a80c07 jar ${project.groupId}:${project.artifactId} Skyflow V3 SDK for the Java programming language From 24cb613a9b4402cd60a1cfd1e12f8968acd7cc7f Mon Sep 17 00:00:00 2001 From: skyflow-bharti Date: Mon, 22 Sep 2025 14:33:59 +0530 Subject: [PATCH 3/3] SK-2302 changed Update enum to Upsert --- v3/src/main/java/com/skyflow/VaultClient.java | 10 +++++----- .../skyflow/enums/{UpdateType.java => UpsertType.java} | 4 ++-- .../main/java/com/skyflow/vault/data/InsertRecord.java | 8 ++++---- .../java/com/skyflow/vault/data/InsertRequest.java | 9 ++++----- v3/src/test/java/com/skyflow/VaultClientTests.java | 6 +++--- 5 files changed, 18 insertions(+), 19 deletions(-) rename v3/src/main/java/com/skyflow/enums/{UpdateType.java => UpsertType.java} (80%) diff --git a/v3/src/main/java/com/skyflow/VaultClient.java b/v3/src/main/java/com/skyflow/VaultClient.java index 559a7d3a..05371e78 100644 --- a/v3/src/main/java/com/skyflow/VaultClient.java +++ b/v3/src/main/java/com/skyflow/VaultClient.java @@ -5,7 +5,7 @@ import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.enums.UpdateType; +import com.skyflow.enums.UpsertType; import com.skyflow.errors.ErrorCode; import com.skyflow.errors.ErrorMessage; import com.skyflow.errors.SkyflowException; @@ -145,9 +145,9 @@ protected InsertRequest getBulkInsertRequestBody(com.skyflow.vault.data.InsertRe if (record.getUpsert() != null && !record.getUpsert().isEmpty()){ if (record.getUpsertType() != null) { EnumUpdateType updateType = null; - if (record.getUpsertType() == UpdateType.REPLACE) { + if (record.getUpsertType() == UpsertType.REPLACE) { updateType = EnumUpdateType.REPLACE; - } else if (record.getUpsertType() == UpdateType.UPDATE) { + } else if (record.getUpsertType() == UpsertType.UPDATE) { updateType = EnumUpdateType.UPDATE; } Upsert upsert = Upsert.builder().uniqueColumns(record.getUpsert()).updateType(updateType).build(); @@ -171,9 +171,9 @@ protected InsertRequest getBulkInsertRequestBody(com.skyflow.vault.data.InsertRe if (request.getUpsert() != null && !request.getUpsert().isEmpty()) { if (request.getUpsertType() != null) { EnumUpdateType updateType = null; - if (request.getUpsertType() == UpdateType.REPLACE) { + if (request.getUpsertType() == UpsertType.REPLACE) { updateType = EnumUpdateType.REPLACE; - } else if (request.getUpsertType() == UpdateType.UPDATE) { + } else if (request.getUpsertType() == UpsertType.UPDATE) { updateType = EnumUpdateType.UPDATE; } Upsert upsert = Upsert.builder().uniqueColumns(request.getUpsert()).updateType(updateType).build(); diff --git a/v3/src/main/java/com/skyflow/enums/UpdateType.java b/v3/src/main/java/com/skyflow/enums/UpsertType.java similarity index 80% rename from v3/src/main/java/com/skyflow/enums/UpdateType.java rename to v3/src/main/java/com/skyflow/enums/UpsertType.java index 45641c13..fa2350d2 100644 --- a/v3/src/main/java/com/skyflow/enums/UpdateType.java +++ b/v3/src/main/java/com/skyflow/enums/UpsertType.java @@ -1,13 +1,13 @@ package com.skyflow.enums; -public enum UpdateType { +public enum UpsertType { UPDATE("UPDATE"), REPLACE("REPLACE"); private final String value; - UpdateType(String value) { + UpsertType(String value) { this.value = value; } diff --git a/v3/src/main/java/com/skyflow/vault/data/InsertRecord.java b/v3/src/main/java/com/skyflow/vault/data/InsertRecord.java index 4373d920..3cfddfaf 100644 --- a/v3/src/main/java/com/skyflow/vault/data/InsertRecord.java +++ b/v3/src/main/java/com/skyflow/vault/data/InsertRecord.java @@ -1,6 +1,6 @@ package com.skyflow.vault.data; -import com.skyflow.enums.UpdateType; +import com.skyflow.enums.UpsertType; import java.util.List; import java.util.Map; @@ -25,7 +25,7 @@ public List getUpsert() { return this.builder.upsert; } - public UpdateType getUpsertType() { + public UpsertType getUpsertType() { return this.builder.upsertType; } @@ -34,7 +34,7 @@ public static final class InsertRecordBuilder { private String table; private Map data; private List upsert; - private UpdateType upsertType; + private UpsertType upsertType; public InsertRecordBuilder table(String table) { this.table = table; @@ -51,7 +51,7 @@ public InsertRecordBuilder upsert(List upsert) { return this; } - public InsertRecordBuilder upsertType(UpdateType upsertType) { + public InsertRecordBuilder upsertType(UpsertType upsertType) { this.upsertType = upsertType; return this; } diff --git a/v3/src/main/java/com/skyflow/vault/data/InsertRequest.java b/v3/src/main/java/com/skyflow/vault/data/InsertRequest.java index 590a2077..e47c6d24 100644 --- a/v3/src/main/java/com/skyflow/vault/data/InsertRequest.java +++ b/v3/src/main/java/com/skyflow/vault/data/InsertRequest.java @@ -1,9 +1,8 @@ package com.skyflow.vault.data; -import com.skyflow.enums.UpdateType; +import com.skyflow.enums.UpsertType; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; public class InsertRequest extends BaseInsertRequest { @@ -23,7 +22,7 @@ public List getUpsert() { return this.builder.upsert; } - public UpdateType getUpsertType() { + public UpsertType getUpsertType() { return this.builder.upsertType; } @@ -34,7 +33,7 @@ public ArrayList getRecords(){ public static final class InsertRequestBuilder extends BaseInsertRequestBuilder { private List upsert; - private UpdateType upsertType; + private UpsertType upsertType; private ArrayList records; @@ -53,7 +52,7 @@ public InsertRequestBuilder upsert(List upsert) { return this; } - public InsertRequestBuilder upsertType(UpdateType upsertType) { + public InsertRequestBuilder upsertType(UpsertType upsertType) { this.upsertType = upsertType; return this; } diff --git a/v3/src/test/java/com/skyflow/VaultClientTests.java b/v3/src/test/java/com/skyflow/VaultClientTests.java index a6686fdc..e38b889d 100644 --- a/v3/src/test/java/com/skyflow/VaultClientTests.java +++ b/v3/src/test/java/com/skyflow/VaultClientTests.java @@ -3,7 +3,7 @@ import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; import com.skyflow.enums.Env; -import com.skyflow.enums.UpdateType; +import com.skyflow.enums.UpsertType; import com.skyflow.errors.ErrorCode; import com.skyflow.errors.SkyflowException; import com.skyflow.generated.rest.resources.recordservice.RecordserviceClient; @@ -217,7 +217,7 @@ public void testUpsertAtRequestLevel() { com.skyflow.vault.data.InsertRequest.builder() .records(records) .upsert(upsertColumns) - .upsertType(UpdateType.REPLACE) + .upsertType(UpsertType.REPLACE) .build(); InsertRequest result = vaultClient.getBulkInsertRequestBody(request, vaultConfig); @@ -231,7 +231,7 @@ public void testUpsertAtRecordLevel() { Map data = new HashMap<>(); data.put("key", "value"); List upsertColumns = Arrays.asList("col2"); - InsertRecord record = InsertRecord.builder().data(data).upsert(upsertColumns).upsertType(UpdateType.UPDATE).build(); + InsertRecord record = InsertRecord.builder().data(data).upsert(upsertColumns).upsertType(UpsertType.UPDATE).build(); System.out.println("record upsert: " + record.getUpsertType()); ArrayList records = new ArrayList<>(); records.add(record);