Skip to content

Commit e9d055a

Browse files
skyflow-bhartiskyflow-bharti
authored
Merge pull request #242 from skyflowapi/SK-2302-multi-table-insert-support-in-v3-sdk
SK-2302 multi table insert support in v3 sdk
2 parents 72916bd + 4ecc162 commit e9d055a

77 files changed

Lines changed: 2396 additions & 705 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎common/src/main/java/com/skyflow/errors/ErrorMessage.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ public enum ErrorMessage {
1010
ConnectionIdAlreadyInConfigList("%s0 Validation error. ConnectionId is present in an existing config. Specify a connectionId in config."),
1111
ConnectionIdNotInConfigList("%s0 Validation error. ConnectionId is missing from the config. Specify the connectionIds from configs."),
1212
EmptyCredentials("%s0 Validation error. Invalid credentials. Credentials must not be empty."),
13-
13+
TableSpecifiedInRequestAndRecordObject("%s0 Validation error. Table name cannot be specified at both the request and record levels. Please specify the table name in only one place."),
14+
UpsertTableRequestAtRecordLevel("%s0 Validation error. Table name should be present at each record level when upsert is present at record level."),
15+
UpsertTableRequestAtRequestLevel("%s0 Validation error. Upsert should be present at each record level when table name is present at record level."),
16+
TableNotSpecifiedInRequestAndRecordObject("%s0 Validation error. Table name is missing. Table name should be specified at one place either at the request level or record level. Please specify the table name at one place."),
1417
// Vault config
1518
InvalidVaultId("%s0 Initialization failed. Invalid vault ID. Specify a valid vault ID."),
1619
EmptyVaultId("%s0 Initialization failed. Invalid vault ID. Vault ID must not be empty."),
@@ -60,6 +63,10 @@ public enum ErrorMessage {
6063
TableKeyError("%s0 Validation error. 'table' key is missing from the payload. Specify a 'table' key."),
6164
EmptyTable("%s0 Validation error. 'table' can't be empty. Specify a table."),
6265
ValuesKeyError("%s0 Validation error. 'values' key is missing from the payload. Specify a 'values' key."),
66+
EmptyRecords("%s0 Validation error. 'records' can't be empty. Specify records."),
67+
EmptyKeyInRecords("%s0 Validation error. Invalid key in data in records. Specify a valid key."),
68+
EmptyValueInRecords("%s0 Validation error. Invalid value in records. Specify a valid value."),
69+
RecordsKeyError("%s0 Validation error. 'records' key is missing from the payload. Specify a 'records' key."),
6370
EmptyValues("%s0 Validation error. 'values' can't be empty. Specify values."),
6471
EmptyKeyInValues("%s0 Validation error. Invalid key in values. Specify a valid key."),
6572
EmptyValueInValues("%s0 Validation error. Invalid value in values. Specify a valid value."),
@@ -164,6 +171,7 @@ public enum ErrorMessage {
164171
NullRedactionInTokenGroup("%s0 Validation error. Redaction in TokenGroupRedactions is null or empty. Specify a valid redaction."),
165172

166173
NullTokenGroupNameInTokenGroup("%s0 Validation error. TokenGroupName in TokenGroupRedactions is null or empty. Specify a valid tokenGroupName."),
174+
InvalidRecord("%s0 Validation error. InsertRecord object in the list is invalid. Specify a valid InsertRecord object."),
167175
;
168176
;
169177
private final String message;

‎common/src/main/java/com/skyflow/logs/ErrorLogs.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ public enum ErrorLogs {
5151
EMPTY_TABLE_NAME("Invalid %s1 request. Table name can not be empty."),
5252
VALUES_IS_REQUIRED("Invalid %s1 request. Values are required."),
5353
EMPTY_VALUES("Invalid %s1 request. Values can not be empty."),
54+
RECORDS_IS_REQUIRED("Invalid %s1 request. Records are required."),
55+
EMPTY_RECORDS("Invalid %s1 request. Records can not be empty."),
56+
INVALID_RECORD("Invalid %s1 request. Invalid record. Specify a valid record."),
5457
RECORD_SIZE_EXCEED("Maximum number of records exceeded. The limit is 10000."),
5558
TOKENS_SIZE_EXCEED("Maximum number of tokens exceeded. The limit is 10000."),
5659
EMPTY_OR_NULL_VALUE_IN_VALUES("Invalid %s1 request. Value can not be null or empty in values for key \"%s2\"."),
@@ -143,8 +146,11 @@ public enum ErrorLogs {
143146

144147
UNEXPECTED_ERROR_DURING_BATCH_PROCESSING("Unexpected error occurred during batch processing. Error: %s1"),
145148

146-
PROCESSING_ERROR_RESPONSE("Processing error response.");
147-
149+
PROCESSING_ERROR_RESPONSE("Processing error response."),
150+
TABLE_SPECIFIED_AT_BOTH_PLACE("Invalid %s1 request. Table name cannot be specified at both the request and record levels. Please specify the table name at only one place."),
151+
TABLE_NOT_SPECIFIED_AT_BOTH_PLACE("Invalid %s1 request. Table name is missing. Table name should be specified at one place either at the request level or record level. Please specify the table name at one place."),
152+
UPSERT_TABLE_REQUEST_AT_RECORD_LEVEL("Invalid %s1 request. Table name should be present at each record level when upsert is present at record level."),
153+
UPSERT_TABLE_REQUEST_AT_REQUEST_LEVEL("Invalid %s1 request. Upsert should be present at each record level when table name is present at record level.");
148154
private final String log;
149155

150156
ErrorLogs(String log) {

‎common/src/main/java/com/skyflow/vault/data/BaseInsertRequest.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,9 @@ public String getTable() {
1414
return this.builder.table;
1515
}
1616

17-
public ArrayList<HashMap<String, Object>> getValues() {
18-
return this.builder.values;
19-
}
20-
2117
static class BaseInsertRequestBuilder {
2218
protected String table;
23-
protected ArrayList<HashMap<String, Object>> values;
2419
protected String upsert;
25-
2620
protected BaseInsertRequestBuilder() {
2721
}
2822

@@ -31,11 +25,6 @@ public BaseInsertRequestBuilder table(String table) {
3125
return this;
3226
}
3327

34-
public BaseInsertRequestBuilder values(ArrayList<HashMap<String, Object>> values) {
35-
this.values = values;
36-
return this;
37-
}
38-
3928
}
4029
}
4130

‎v2/src/main/java/com/skyflow/vault/data/InsertRequest.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ public String getUpsert() {
3434
public Boolean getReturnTokens() {
3535
return this.builder.returnTokens;
3636
}
37-
37+
public ArrayList<HashMap<String, Object>> getValues() {
38+
return this.builder.values;
39+
}
40+
3841
public ArrayList<HashMap<String, Object>> getTokens() {
3942
return this.builder.tokens;
4043
}
@@ -43,6 +46,7 @@ public static final class InsertRequestBuilder extends BaseInsertRequestBuilder
4346
private Boolean homogeneous;
4447
private Boolean continueOnError;
4548
private TokenMode tokenMode;
49+
private ArrayList<HashMap<String, Object>> values;
4650

4751
private ArrayList<HashMap<String, Object>> tokens;
4852
private Boolean returnTokens;
@@ -60,9 +64,8 @@ public InsertRequestBuilder table(String table) {
6064
return this;
6165
}
6266

63-
@Override
6467
public InsertRequestBuilder values(ArrayList<HashMap<String, Object>> values) {
65-
super.values(values);
68+
this.values = values;
6669
return this;
6770
}
6871

‎v3/src/main/java/com/skyflow/VaultClient.java‎

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.skyflow;
22

3+
import java.util.ArrayList;
4+
import java.util.List;
5+
36
import com.skyflow.config.Credentials;
47
import com.skyflow.config.VaultConfig;
58
import com.skyflow.enums.UpdateType;
@@ -20,15 +23,13 @@
2023
import com.skyflow.utils.logger.LogUtil;
2124
import com.skyflow.utils.validations.Validations;
2225
import com.skyflow.vault.data.DetokenizeRequest;
26+
import com.skyflow.vault.data.InsertRecord;
27+
2328
import io.github.cdimascio.dotenv.Dotenv;
2429
import io.github.cdimascio.dotenv.DotenvException;
2530
import okhttp3.OkHttpClient;
2631
import okhttp3.Request;
2732

28-
import java.util.ArrayList;
29-
import java.util.HashMap;
30-
import java.util.List;
31-
3233

3334
public class VaultClient {
3435
private final VaultConfig vaultConfig;
@@ -132,17 +133,41 @@ protected void updateExecutorInHTTP() {
132133
apiClientBuilder.httpClient(httpClient);
133134
}
134135

135-
protected InsertRequest getBulkInsertRequestBody(com.skyflow.vault.data.InsertRequest request, VaultConfig config) throws SkyflowException {
136-
List<HashMap<String, Object>> values = request.getValues();
136+
protected InsertRequest getBulkInsertRequestBody(com.skyflow.vault.data.InsertRequest request, VaultConfig config) {
137+
ArrayList<InsertRecord> records = request.getRecords();
137138
List<InsertRecordData> insertRecordDataList = new ArrayList<>();
138-
for (HashMap<String, Object> value : values) {
139-
InsertRecordData data = InsertRecordData.builder().data(value).build();
140-
insertRecordDataList.add(data);
139+
for (InsertRecord record : records) {
140+
InsertRecordData.Builder data = InsertRecordData.builder();
141+
data.data(record.getData());
142+
if (record.getTable() != null && !record.getTable().isEmpty()){
143+
data.tableName(record.getTable());
144+
}
145+
if (record.getUpsert() != null && !record.getUpsert().isEmpty()){
146+
if (record.getUpsertType() != null) {
147+
EnumUpdateType updateType = null;
148+
if (record.getUpsertType() == UpdateType.REPLACE) {
149+
updateType = EnumUpdateType.REPLACE;
150+
} else if (record.getUpsertType() == UpdateType.UPDATE) {
151+
updateType = EnumUpdateType.UPDATE;
152+
}
153+
Upsert upsert = Upsert.builder().uniqueColumns(record.getUpsert()).updateType(updateType).build();
154+
data.upsert(upsert);
155+
} else {
156+
Upsert upsert = Upsert.builder().uniqueColumns(record.getUpsert()).build();
157+
data.upsert(upsert);
158+
}
159+
}
160+
insertRecordDataList.add(data.build());
141161
}
162+
142163
InsertRequest.Builder builder = InsertRequest.builder()
143164
.vaultId(config.getVaultId())
144-
.records(insertRecordDataList)
145-
.tableName(request.getTable());
165+
.records(insertRecordDataList);
166+
167+
if (request.getTable() != null && !request.getTable().isEmpty()){
168+
builder.tableName(request.getTable());
169+
}
170+
146171
if (request.getUpsert() != null && !request.getUpsert().isEmpty()) {
147172
if (request.getUpsertType() != null) {
148173
EnumUpdateType updateType = null;

‎v3/src/main/java/com/skyflow/enums/UpdateType.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.skyflow.enums;
22

3-
import com.fasterxml.jackson.annotation.JsonValue;
4-
53
public enum UpdateType {
64
UPDATE("UPDATE"),
75

‎v3/src/main/java/com/skyflow/generated/rest/ApiClient.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,27 @@
55

66
import com.skyflow.generated.rest.core.ClientOptions;
77
import com.skyflow.generated.rest.core.Suppliers;
8+
import com.skyflow.generated.rest.resources.records.RecordsClient;
89
import com.skyflow.generated.rest.resources.recordservice.RecordserviceClient;
9-
1010
import java.util.function.Supplier;
1111

1212
public class ApiClient {
1313
protected final ClientOptions clientOptions;
1414

15+
protected final Supplier<RecordsClient> recordsClient;
16+
1517
protected final Supplier<RecordserviceClient> recordserviceClient;
1618

1719
public ApiClient(ClientOptions clientOptions) {
1820
this.clientOptions = clientOptions;
21+
this.recordsClient = Suppliers.memoize(() -> new RecordsClient(clientOptions));
1922
this.recordserviceClient = Suppliers.memoize(() -> new RecordserviceClient(clientOptions));
2023
}
2124

25+
public RecordsClient records() {
26+
return this.recordsClient.get();
27+
}
28+
2229
public RecordserviceClient recordservice() {
2330
return this.recordserviceClient.get();
2431
}

‎v3/src/main/java/com/skyflow/generated/rest/AsyncApiClient.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,27 @@
55

66
import com.skyflow.generated.rest.core.ClientOptions;
77
import com.skyflow.generated.rest.core.Suppliers;
8+
import com.skyflow.generated.rest.resources.records.AsyncRecordsClient;
89
import com.skyflow.generated.rest.resources.recordservice.AsyncRecordserviceClient;
9-
1010
import java.util.function.Supplier;
1111

1212
public class AsyncApiClient {
1313
protected final ClientOptions clientOptions;
1414

15+
protected final Supplier<AsyncRecordsClient> recordsClient;
16+
1517
protected final Supplier<AsyncRecordserviceClient> recordserviceClient;
1618

1719
public AsyncApiClient(ClientOptions clientOptions) {
1820
this.clientOptions = clientOptions;
21+
this.recordsClient = Suppliers.memoize(() -> new AsyncRecordsClient(clientOptions));
1922
this.recordserviceClient = Suppliers.memoize(() -> new AsyncRecordserviceClient(clientOptions));
2023
}
2124

25+
public AsyncRecordsClient records() {
26+
return this.recordsClient.get();
27+
}
28+
2229
public AsyncRecordserviceClient recordservice() {
2330
return this.recordserviceClient.get();
2431
}

‎v3/src/main/java/com/skyflow/generated/rest/core/ApiClientApiException.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
*/
44
package com.skyflow.generated.rest.core;
55

6-
import okhttp3.Response;
7-
86
import java.util.ArrayList;
97
import java.util.HashMap;
108
import java.util.List;
119
import java.util.Map;
10+
import okhttp3.Response;
1211

1312
/**
1413
* This exception type will be thrown for any non-2XX API responses.
@@ -66,7 +65,7 @@ public Map<String, List<String>> headers() {
6665
return this.headers;
6766
}
6867

69-
@Override
68+
@java.lang.Override
7069
public String toString() {
7170
return "ApiClientApiException{" + "message: " + getMessage() + ", statusCode: " + statusCode + ", body: " + body
7271
+ "}";

‎v3/src/main/java/com/skyflow/generated/rest/core/ApiClientHttpResponse.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
*/
44
package com.skyflow.generated.rest.core;
55

6-
import okhttp3.Response;
7-
86
import java.util.ArrayList;
97
import java.util.HashMap;
108
import java.util.List;
119
import java.util.Map;
10+
import okhttp3.Response;
1211

1312
public final class ApiClientHttpResponse<T> {
1413

0 commit comments

Comments
 (0)