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 .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: actions/checkout@v1
- uses: actions/setup-java@v1
with:
java-version: "1.8"
java-version: "11"

- name: create-json
id: create-json
Expand Down
22 changes: 22 additions & 0 deletions src/main/java/com/skyflow/VaultClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.skyflow.generated.rest.resources.records.requests.RecordServiceBatchOperationBody;
import com.skyflow.generated.rest.resources.records.requests.RecordServiceInsertRecordBody;
import com.skyflow.generated.rest.resources.records.requests.RecordServiceUpdateRecordBody;
import com.skyflow.generated.rest.resources.records.requests.UploadFileV2Request;
import com.skyflow.generated.rest.resources.strings.StringsClient;
import com.skyflow.generated.rest.resources.strings.requests.DeidentifyStringRequest;
import com.skyflow.generated.rest.resources.strings.requests.ReidentifyStringRequest;
Expand All @@ -32,6 +33,7 @@
import com.skyflow.utils.Utils;
import com.skyflow.utils.logger.LogUtil;
import com.skyflow.utils.validations.Validations;
import com.skyflow.vault.data.FileUploadRequest;
import com.skyflow.vault.data.InsertRequest;
import com.skyflow.vault.data.UpdateRequest;
import com.skyflow.vault.detect.*;
Expand All @@ -44,6 +46,10 @@
import io.github.cdimascio.dotenv.Dotenv;
import io.github.cdimascio.dotenv.DotenvException;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.*;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -209,6 +215,22 @@ protected V1TokenizePayload getTokenizePayload(TokenizeRequest request) {
return payloadBuilder.build();
}

protected File getFileForFileUpload(FileUploadRequest fileUploadRequest) throws IOException {
if (fileUploadRequest.getFilePath() != null) {
return new File(fileUploadRequest.getFilePath());
}
else if (fileUploadRequest.getBase64() != null) {
byte[] decodedBytes = Base64.getDecoder().decode(fileUploadRequest.getBase64());
File file = new File(fileUploadRequest.getFileName());
Files.write(file.toPath(), decodedBytes);
return file;
}
else if (fileUploadRequest.getFileObject() != null) {
return fileUploadRequest.getFileObject();
}
return null;
}

protected void setBearerToken() throws SkyflowException {
prioritiseCredentials();
Validations.validateCredentials(this.finalCredentials);
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/skyflow/errors/ErrorMessage.java
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,13 @@ public enum ErrorMessage {
InvalidRequestBody("%s0 Validation error. Invalid request body. Specify the request body as an object."),
EmptyRequestBody("%s0 Validation error. Request body can't be empty. Specify a valid request body."),

// File upload
ColumnNameKeyErrorFileUpload("%s0 Validation error. columnName is missing from the payload. Specify a columnName key."),
MissingFileSourceInUploadFileRequest("%s0 Validation error. Provide exactly one of filePath, base64, or fileObject."),
FileNameMustBeProvidedWithFileObject("%s0 Validation error. fileName must be provided when using fileObject."),
InvalidFileObject("%s0 Validation error. Invalid file object in file upload request. Specify a valid file object."),
InvalidBase64("%s0 Validation error. Invalid base64 string in file upload request. Specify a valid base64 string."),

// detect
InvalidTextInDeIdentify("%s0 Validation error. The text field is required and must be a non-empty string. Specify a valid text."),
InvalidTextInReIdentify("%s0 Validation error. The text field is required and must be a non-empty string. Specify a valid text."),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public Map<String, List<String>> headers() {
return this.headers;
}

@Override
@java.lang.Override
public String toString() {
return "ApiClientApiException{" + "message: " + getMessage() + ", statusCode: " + statusCode + ", body: " + body
+ "}";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ private ClientOptions(
{
put("X-Fern-Language", "JAVA");
put("X-Fern-SDK-Name", "com.skyflow.fern:api-sdk");
put("X-Fern-SDK-Version", "0.0.305");
put("X-Fern-SDK-Version", "0.0.322");
}
});
this.headerSuppliers = headerSuppliers;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public BadRequestError(Object body, Response rawResponse) {
/**
* @return the body
*/
@Override
@java.lang.Override
public Object body() {
return this.body;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public InternalServerError(ErrorResponse body, Response rawResponse) {
/**
* @return the body
*/
@Override
@java.lang.Override
public ErrorResponse body() {
return this.body;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public NotFoundError(Object body, Response rawResponse) {
/**
* @return the body
*/
@Override
@java.lang.Override
public Object body() {
return this.body;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public UnauthorizedError(Object body, Response rawResponse) {
/**
* @return the body
*/
@Override
@java.lang.Override
public Object body() {
return this.body;
}
Expand Down
Loading
Loading