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
2 changes: 1 addition & 1 deletion v3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</parent>

<artifactId>skyflow-java</artifactId>
<version>2.0.0-dev.a742b35</version>
<version>2.0.0-dev.3a80c07</version>
<packaging>jar</packaging>
<name>${project.groupId}:${project.artifactId}</name>
<description>Skyflow V3 SDK for the Java programming language</description>
Expand Down
10 changes: 5 additions & 5 deletions v3/src/main/java/com/skyflow/VaultClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand All @@ -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();
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}

Expand Down
3 changes: 1 addition & 2 deletions v3/src/main/java/com/skyflow/utils/Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ public static List<DetokenizeRequest> createDetokenizeBatches(DetokenizeRequest
// Create a sublist for the current batch
List<String> batchTokens = tokens.subList(i, Math.min(i + batchSize, tokens.size()));
List<TokenGroupRedactions> tokenGroupRedactions = null;
if (request.getTokenGroupRedactions().isPresent() && !request.getTokenGroupRedactions().get().isEmpty()
) {
if (request.getTokenGroupRedactions().isPresent() && !request.getTokenGroupRedactions().get().isEmpty()){
tokenGroupRedactions = request.getTokenGroupRedactions().get();
}
// Build a new DetokenizeRequest for the current batch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -15,9 +18,6 @@ public class DetokenizeResponseObject {
@Expose(serialize = true)
private String error;

@Expose(serialize = true)
private int index;

@Expose(serialize = true)
private Map<String, Object> metadata;

Expand Down
8 changes: 4 additions & 4 deletions v3/src/main/java/com/skyflow/vault/data/InsertRecord.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -25,7 +25,7 @@ public List<String> getUpsert() {
return this.builder.upsert;
}

public UpdateType getUpsertType() {
public UpsertType getUpsertType() {
return this.builder.upsertType;
}

Expand All @@ -34,7 +34,7 @@ public static final class InsertRecordBuilder {
private String table;
private Map<String, Object> data;
private List<String> upsert;
private UpdateType upsertType;
private UpsertType upsertType;

public InsertRecordBuilder table(String table) {
this.table = table;
Expand All @@ -51,7 +51,7 @@ public InsertRecordBuilder upsert(List<String> upsert) {
return this;
}

public InsertRecordBuilder upsertType(UpdateType upsertType) {
public InsertRecordBuilder upsertType(UpsertType upsertType) {
this.upsertType = upsertType;
return this;
}
Expand Down
9 changes: 4 additions & 5 deletions v3/src/main/java/com/skyflow/vault/data/InsertRequest.java
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -23,7 +22,7 @@ public List<String> getUpsert() {
return this.builder.upsert;
}

public UpdateType getUpsertType() {
public UpsertType getUpsertType() {
return this.builder.upsertType;
}

Expand All @@ -34,7 +33,7 @@ public ArrayList<InsertRecord> getRecords(){
public static final class InsertRequestBuilder extends BaseInsertRequestBuilder {
private List<String> upsert;

private UpdateType upsertType;
private UpsertType upsertType;

private ArrayList<InsertRecord> records;

Expand All @@ -53,7 +52,7 @@ public InsertRequestBuilder upsert(List<String> upsert) {
return this;
}

public InsertRequestBuilder upsertType(UpdateType upsertType) {
public InsertRequestBuilder upsertType(UpsertType upsertType) {
this.upsertType = upsertType;
return this;
}
Expand Down
6 changes: 3 additions & 3 deletions v3/src/test/java/com/skyflow/VaultClientTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -231,7 +231,7 @@ public void testUpsertAtRecordLevel() {
Map<String, Object> data = new HashMap<>();
data.put("key", "value");
List<String> 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<InsertRecord> records = new ArrayList<>();
records.add(record);
Expand Down
Loading