From 63d8c9af80fa0de236e308fa34283526f48ea5f5 Mon Sep 17 00:00:00 2001 From: skyflow-bharti Date: Fri, 8 Aug 2025 14:04:16 +0530 Subject: [PATCH 1/2] SK-2232 skyflow client and common code --- .../config/ConnectionConfig.java | 2 +- .../{v2 => common}/config/Credentials.java | 2 +- .../{v2 => common}/config/VaultConfig.java | 4 +- .../com/skyflow/{v2 => common}/enums/Env.java | 2 +- .../{v2 => common}/enums/LogLevel.java | 2 +- .../{v2 => common}/errors/ErrorCode.java | 2 +- .../{v2 => common}/errors/ErrorMessage.java | 3 +- .../{v2 => common}/errors/HttpStatus.java | 2 +- .../errors/SkyflowException.java | 4 +- .../rest => common/generated}/ApiClient.java | 4 +- .../generated}/ApiClientBuilder.java | 2 +- .../AsyncAuthenticationClient.java | 6 +- .../AsyncRawAuthenticationClient.java | 8 +- .../authentication/AuthenticationClient.java | 6 +- .../RawAuthenticationClient.java | 8 +- .../requests/V1GetAuthTokenRequest.java | 2 +- .../core/ApiClientApiException.java | 4 +- .../types/V1GetAuthTokenResponse.java | 2 +- .../{v2/utils => common}/logger/LogUtil.java | 6 +- .../{v2 => common}/logs/ErrorLogs.java | 2 +- .../skyflow/{v2 => common}/logs/InfoLogs.java | 2 +- .../serviceaccount/util/BearerToken.java | 36 ++-- .../util/SignedDataTokenResponse.java | 2 +- .../serviceaccount/util/SignedDataTokens.java | 20 +- .../common/serviceaccount/util/Token.java | 12 +- .../com/skyflow/common/utils/CommonUtils.java | 110 +++++++++++ .../com/skyflow/common/utils/Constants.java | 19 ++ .../com/skyflow/common/utils/Validations.java | 104 +++++++++++ .../java/com/skyflow/v2/ConnectionClient.java | 14 +- src/main/java/com/skyflow/v2/Skyflow.java | 24 +-- src/main/java/com/skyflow/v2/VaultClient.java | 18 +- .../skyflow/v2/config/ManagementConfig.java | 11 -- .../v2/generated/rest/AsyncApiClient.java | 2 +- .../rest/errors/BadRequestError.java | 2 +- .../rest/errors/InternalServerError.java | 2 +- .../generated/rest/errors/NotFoundError.java | 2 +- .../rest/errors/UnauthorizedError.java | 2 +- .../resources/audit/AsyncRawAuditClient.java | 2 +- .../rest/resources/audit/RawAuditClient.java | 2 +- .../binlookup/AsyncRawBinLookupClient.java | 2 +- .../binlookup/RawBinLookupClient.java | 2 +- .../deprecated/AsyncRawDeprecatedClient.java | 2 +- .../deprecated/RawDeprecatedClient.java | 2 +- .../resources/files/AsyncRawFilesClient.java | 2 +- .../rest/resources/files/RawFilesClient.java | 2 +- .../resources/query/AsyncRawQueryClient.java | 2 +- .../rest/resources/query/RawQueryClient.java | 2 +- .../records/AsyncRawRecordsClient.java | 2 +- .../resources/records/RawRecordsClient.java | 2 +- .../strings/AsyncRawStringsClient.java | 2 +- .../resources/strings/RawStringsClient.java | 2 +- .../tokens/AsyncRawTokensClient.java | 2 +- .../resources/tokens/RawTokensClient.java | 2 +- .../java/com/skyflow/v2/utils/Constants.java | 12 +- .../com/skyflow/v2/utils/HttpUtility.java | 2 +- src/main/java/com/skyflow/v2/utils/Utils.java | 117 +----------- .../v2/utils/validations/Validations.java | 106 +---------- .../v2/vault/controller/AuditController.java | 2 +- .../vault/controller/BinLookupController.java | 2 +- .../controller/ConnectionController.java | 16 +- .../v2/vault/controller/DetectController.java | 18 +- .../v2/vault/controller/VaultController.java | 15 +- .../java/com/skyflow/vaultLH/Skyflow.java | 173 ++++++++++++++++++ .../java/com/skyflow/vaultLH/VaultClient.java | 114 ++++++++++++ .../java/com/skyflow/vaultLH/enums/Enums.java | 4 + .../vaultLH/{ => generated}/ApiClient.java | 8 +- .../{ => generated}/ApiClientBuilder.java | 6 +- .../{ => generated}/AsyncApiClient.java | 8 +- .../AsyncApiClientBuilder.java | 6 +- .../core/ApiClientApiException.java | 2 +- .../core/ApiClientException.java | 2 +- .../core/ApiClientHttpResponse.java | 2 +- .../{ => generated}/core/ClientOptions.java | 2 +- .../core/DateTimeDeserializer.java | 2 +- .../{ => generated}/core/Environment.java | 2 +- .../{ => generated}/core/FileStream.java | 2 +- .../core/InputStreamRequestBody.java | 2 +- .../{ => generated}/core/MediaTypes.java | 2 +- .../{ => generated}/core/Nullable.java | 2 +- .../core/NullableNonemptyFilter.java | 2 +- .../{ => generated}/core/ObjectMappers.java | 2 +- .../core/QueryStringMapper.java | 2 +- .../{ => generated}/core/RequestOptions.java | 2 +- .../core/ResponseBodyInputStream.java | 2 +- .../core/ResponseBodyReader.java | 2 +- .../core/RetryInterceptor.java | 2 +- .../vaultLH/{ => generated}/core/Stream.java | 2 +- .../{ => generated}/core/Suppliers.java | 2 +- .../AsyncRawRecordserviceClient.java | 48 ++--- .../AsyncRecordserviceClient.java | 40 ++-- .../recordservice/RawRecordserviceClient.java | 48 ++--- .../recordservice/RecordserviceClient.java | 40 ++-- .../recordservice/requests/DeleteRequest.java | 4 +- .../requests/DeleteTokenRequest.java | 4 +- .../requests/DetokenizeRequest.java | 6 +- .../requests/ExecuteQueryRequest.java | 4 +- .../recordservice/requests/GetRequest.java | 6 +- .../recordservice/requests/InsertRequest.java | 8 +- .../requests/TokenizeRequest.java | 6 +- .../recordservice/requests/UpdateRequest.java | 8 +- .../types/ColumnRedactions.java | 4 +- .../{ => generated}/types/DeleteResponse.java | 4 +- .../types/DeleteResponseObject.java | 4 +- .../types/DeleteTokenResponse.java | 4 +- .../types/DeleteTokenResponseObject.java | 4 +- .../types/DetokenizeResponse.java | 4 +- .../types/DetokenizeResponseObject.java | 4 +- .../{ => generated}/types/EnumDataType.java | 2 +- .../{ => generated}/types/EnumUpdateType.java | 2 +- .../types/ExecuteQueryRecordResponse.java | 4 +- .../types/ExecuteQueryResponse.java | 4 +- .../{ => generated}/types/GetResponse.java | 4 +- .../types/InsertRecordData.java | 4 +- .../{ => generated}/types/InsertResponse.java | 4 +- .../{ => generated}/types/ProtobufAny.java | 4 +- .../types/RecordResponseObject.java | 4 +- .../{ => generated}/types/RpcStatus.java | 4 +- .../types/TokenGroupRedactions.java | 4 +- .../types/TokenizeRequestObject.java | 4 +- .../types/TokenizeResponse.java | 4 +- .../types/TokenizeResponseObject.java | 4 +- .../types/TokenizeResponseObjectToken.java | 4 +- .../types/UpdateRecordData.java | 4 +- .../{ => generated}/types/UpdateResponse.java | 4 +- .../vaultLH/{ => generated}/types/Upsert.java | 4 +- .../java/com/skyflow/vaultLH/utils/Utils.java | 6 + .../utils/validations/Validations.java | 6 + .../vault/controller/VaultController.java | 15 ++ .../com/skyflow/v2/ConnectionClientTests.java | 4 +- .../java/com/skyflow/v2/SkyflowTests.java | 16 +- .../java/com/skyflow/v2/VaultClientTests.java | 9 +- .../v2/config/ConnectionConfigTests.java | 8 +- .../skyflow/v2/config/CredentialsTests.java | 7 +- .../skyflow/v2/config/VaultConfigTests.java | 10 +- .../v2/errors/SkyflowExceptionTest.java | 1 + .../serviceaccount/util/BearerTokenTests.java | 6 +- .../util/SignedDataTokensTests.java | 6 +- .../v2/serviceaccount/util/TokenTests.java | 2 +- .../skyflow/v2/utils/HttpUtilityTests.java | 2 +- .../java/com/skyflow/v2/utils/UtilsTests.java | 12 +- .../connection/InvokeConnectionTests.java | 6 +- .../controller/ConnectionControllerTests.java | 12 +- .../controller/DetectControllerFileTests.java | 13 +- .../controller/DetectControllerTests.java | 14 +- .../controller/VaultControllerTests.java | 18 +- .../skyflow/v2/vault/data/DeleteTests.java | 12 +- .../com/skyflow/v2/vault/data/GetTests.java | 12 +- .../skyflow/v2/vault/data/InsertTests.java | 12 +- .../com/skyflow/v2/vault/data/QueryTests.java | 12 +- .../skyflow/v2/vault/data/UpdateTests.java | 12 +- .../v2/vault/detect/DeidentifyTextTests.java | 6 +- .../v2/vault/detect/ReidentifyTextTests.java | 6 +- .../v2/vault/tokens/DetokenizeTests.java | 6 +- .../v2/vault/tokens/TokenizeTests.java | 12 +- 154 files changed, 1031 insertions(+), 684 deletions(-) rename src/main/java/com/skyflow/{v2 => common}/config/ConnectionConfig.java (95%) rename src/main/java/com/skyflow/{v2 => common}/config/Credentials.java (97%) rename src/main/java/com/skyflow/{v2 => common}/config/VaultConfig.java (92%) rename src/main/java/com/skyflow/{v2 => common}/enums/Env.java (64%) rename src/main/java/com/skyflow/{v2 => common}/enums/LogLevel.java (69%) rename src/main/java/com/skyflow/{v2 => common}/errors/ErrorCode.java (88%) rename src/main/java/com/skyflow/{v2 => common}/errors/ErrorMessage.java (99%) rename src/main/java/com/skyflow/{v2 => common}/errors/HttpStatus.java (87%) rename src/main/java/com/skyflow/{v2 => common}/errors/SkyflowException.java (98%) rename src/main/java/com/skyflow/{v2/generated/rest => common/generated}/ApiClient.java (96%) rename src/main/java/com/skyflow/{v2/generated/rest => common/generated}/ApiClientBuilder.java (97%) rename src/main/java/com/skyflow/{v2/generated/rest/resources => common/generated}/authentication/AsyncAuthenticationClient.java (89%) rename src/main/java/com/skyflow/{v2/generated/rest/resources => common/generated}/authentication/AsyncRawAuthenticationClient.java (95%) rename src/main/java/com/skyflow/{v2/generated/rest/resources => common/generated}/authentication/AuthenticationClient.java (88%) rename src/main/java/com/skyflow/{v2/generated/rest/resources => common/generated}/authentication/RawAuthenticationClient.java (94%) rename src/main/java/com/skyflow/{v2/generated/rest/resources => common/generated}/authentication/requests/V1GetAuthTokenRequest.java (99%) rename src/main/java/com/skyflow/{vaultLH => common/generated}/core/ApiClientApiException.java (94%) rename src/main/java/com/skyflow/{v2/generated/rest => common/generated}/types/V1GetAuthTokenResponse.java (98%) rename src/main/java/com/skyflow/{v2/utils => common}/logger/LogUtil.java (96%) rename src/main/java/com/skyflow/{v2 => common}/logs/ErrorLogs.java (99%) rename src/main/java/com/skyflow/{v2 => common}/logs/InfoLogs.java (99%) create mode 100644 src/main/java/com/skyflow/common/utils/CommonUtils.java create mode 100644 src/main/java/com/skyflow/common/utils/Constants.java create mode 100644 src/main/java/com/skyflow/common/utils/Validations.java delete mode 100644 src/main/java/com/skyflow/v2/config/ManagementConfig.java create mode 100644 src/main/java/com/skyflow/vaultLH/Skyflow.java create mode 100644 src/main/java/com/skyflow/vaultLH/VaultClient.java create mode 100644 src/main/java/com/skyflow/vaultLH/enums/Enums.java rename src/main/java/com/skyflow/vaultLH/{ => generated}/ApiClient.java (74%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/ApiClientBuilder.java (88%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/AsyncApiClient.java (74%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/AsyncApiClientBuilder.java (89%) rename src/main/java/com/skyflow/{v2/generated/rest => vaultLH/generated}/core/ApiClientApiException.java (97%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/ApiClientException.java (89%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/ApiClientHttpResponse.java (95%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/ClientOptions.java (99%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/DateTimeDeserializer.java (97%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/Environment.java (89%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/FileStream.java (97%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/InputStreamRequestBody.java (98%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/MediaTypes.java (85%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/Nullable.java (98%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/NullableNonemptyFilter.java (90%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/ObjectMappers.java (96%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/QueryStringMapper.java (99%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/RequestOptions.java (98%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/ResponseBodyInputStream.java (97%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/ResponseBodyReader.java (97%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/RetryInterceptor.java (98%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/Stream.java (98%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/core/Suppliers.java (93%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/resources/recordservice/AsyncRawRecordserviceClient.java (94%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/resources/recordservice/AsyncRecordserviceClient.java (79%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/resources/recordservice/RawRecordserviceClient.java (92%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/resources/recordservice/RecordserviceClient.java (74%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/resources/recordservice/requests/DeleteRequest.java (97%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/resources/recordservice/requests/DeleteTokenRequest.java (96%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/resources/recordservice/requests/DetokenizeRequest.java (96%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/resources/recordservice/requests/ExecuteQueryRequest.java (96%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/resources/recordservice/requests/GetRequest.java (97%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/resources/recordservice/requests/InsertRequest.java (95%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/resources/recordservice/requests/TokenizeRequest.java (95%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/resources/recordservice/requests/UpdateRequest.java (95%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/ColumnRedactions.java (97%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/DeleteResponse.java (96%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/DeleteResponseObject.java (97%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/DeleteTokenResponse.java (96%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/DeleteTokenResponseObject.java (97%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/DetokenizeResponse.java (96%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/DetokenizeResponseObject.java (98%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/EnumDataType.java (91%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/EnumUpdateType.java (90%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/ExecuteQueryRecordResponse.java (96%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/ExecuteQueryResponse.java (96%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/GetResponse.java (96%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/InsertRecordData.java (97%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/InsertResponse.java (96%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/ProtobufAny.java (96%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/RecordResponseObject.java (98%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/RpcStatus.java (97%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/TokenGroupRedactions.java (97%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/TokenizeRequestObject.java (97%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/TokenizeResponse.java (96%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/TokenizeResponseObject.java (97%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/TokenizeResponseObjectToken.java (98%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/UpdateRecordData.java (97%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/UpdateResponse.java (96%) rename src/main/java/com/skyflow/vaultLH/{ => generated}/types/Upsert.java (97%) create mode 100644 src/main/java/com/skyflow/vaultLH/utils/Utils.java create mode 100644 src/main/java/com/skyflow/vaultLH/utils/validations/Validations.java create mode 100644 src/main/java/com/skyflow/vaultLH/vault/controller/VaultController.java diff --git a/src/main/java/com/skyflow/v2/config/ConnectionConfig.java b/src/main/java/com/skyflow/common/config/ConnectionConfig.java similarity index 95% rename from src/main/java/com/skyflow/v2/config/ConnectionConfig.java rename to src/main/java/com/skyflow/common/config/ConnectionConfig.java index b9015246..c397a867 100644 --- a/src/main/java/com/skyflow/v2/config/ConnectionConfig.java +++ b/src/main/java/com/skyflow/common/config/ConnectionConfig.java @@ -1,4 +1,4 @@ -package com.skyflow.v2.config; +package com.skyflow.common.config; public class ConnectionConfig { private String connectionId; diff --git a/src/main/java/com/skyflow/v2/config/Credentials.java b/src/main/java/com/skyflow/common/config/Credentials.java similarity index 97% rename from src/main/java/com/skyflow/v2/config/Credentials.java rename to src/main/java/com/skyflow/common/config/Credentials.java index dd0817b7..175efb48 100644 --- a/src/main/java/com/skyflow/v2/config/Credentials.java +++ b/src/main/java/com/skyflow/common/config/Credentials.java @@ -1,4 +1,4 @@ -package com.skyflow.v2.config; +package com.skyflow.common.config; import java.util.ArrayList; diff --git a/src/main/java/com/skyflow/v2/config/VaultConfig.java b/src/main/java/com/skyflow/common/config/VaultConfig.java similarity index 92% rename from src/main/java/com/skyflow/v2/config/VaultConfig.java rename to src/main/java/com/skyflow/common/config/VaultConfig.java index 8adac6b3..341befcd 100644 --- a/src/main/java/com/skyflow/v2/config/VaultConfig.java +++ b/src/main/java/com/skyflow/common/config/VaultConfig.java @@ -1,6 +1,6 @@ -package com.skyflow.v2.config; +package com.skyflow.common.config; -import com.skyflow.v2.enums.Env; +import com.skyflow.common.enums.Env; public class VaultConfig { private String vaultId; diff --git a/src/main/java/com/skyflow/v2/enums/Env.java b/src/main/java/com/skyflow/common/enums/Env.java similarity index 64% rename from src/main/java/com/skyflow/v2/enums/Env.java rename to src/main/java/com/skyflow/common/enums/Env.java index f2b0686e..5ee4b271 100644 --- a/src/main/java/com/skyflow/v2/enums/Env.java +++ b/src/main/java/com/skyflow/common/enums/Env.java @@ -1,4 +1,4 @@ -package com.skyflow.v2.enums; +package com.skyflow.common.enums; public enum Env { DEV, diff --git a/src/main/java/com/skyflow/v2/enums/LogLevel.java b/src/main/java/com/skyflow/common/enums/LogLevel.java similarity index 69% rename from src/main/java/com/skyflow/v2/enums/LogLevel.java rename to src/main/java/com/skyflow/common/enums/LogLevel.java index fd7a8dcd..ff17c291 100644 --- a/src/main/java/com/skyflow/v2/enums/LogLevel.java +++ b/src/main/java/com/skyflow/common/enums/LogLevel.java @@ -1,4 +1,4 @@ -package com.skyflow.v2.enums; +package com.skyflow.common.enums; public enum LogLevel { OFF, diff --git a/src/main/java/com/skyflow/v2/errors/ErrorCode.java b/src/main/java/com/skyflow/common/errors/ErrorCode.java similarity index 88% rename from src/main/java/com/skyflow/v2/errors/ErrorCode.java rename to src/main/java/com/skyflow/common/errors/ErrorCode.java index 421317b9..d99e3ff2 100644 --- a/src/main/java/com/skyflow/v2/errors/ErrorCode.java +++ b/src/main/java/com/skyflow/common/errors/ErrorCode.java @@ -1,4 +1,4 @@ -package com.skyflow.v2.errors; +package com.skyflow.common.errors; public enum ErrorCode { INVALID_INPUT(400), diff --git a/src/main/java/com/skyflow/v2/errors/ErrorMessage.java b/src/main/java/com/skyflow/common/errors/ErrorMessage.java similarity index 99% rename from src/main/java/com/skyflow/v2/errors/ErrorMessage.java rename to src/main/java/com/skyflow/common/errors/ErrorMessage.java index ea25ed78..bdfc821c 100644 --- a/src/main/java/com/skyflow/v2/errors/ErrorMessage.java +++ b/src/main/java/com/skyflow/common/errors/ErrorMessage.java @@ -1,4 +1,4 @@ -package com.skyflow.v2.errors; +package com.skyflow.common.errors; import com.skyflow.v2.utils.Constants; @@ -152,6 +152,7 @@ public enum ErrorMessage { ; private final String message; + ErrorMessage(String message) { this.message = message.replace("%s0", Constants.SDK_PREFIX); } diff --git a/src/main/java/com/skyflow/v2/errors/HttpStatus.java b/src/main/java/com/skyflow/common/errors/HttpStatus.java similarity index 87% rename from src/main/java/com/skyflow/v2/errors/HttpStatus.java rename to src/main/java/com/skyflow/common/errors/HttpStatus.java index a48aab8c..571a93e5 100644 --- a/src/main/java/com/skyflow/v2/errors/HttpStatus.java +++ b/src/main/java/com/skyflow/common/errors/HttpStatus.java @@ -1,4 +1,4 @@ -package com.skyflow.v2.errors; +package com.skyflow.common.errors; public enum HttpStatus { BAD_REQUEST("Bad Request"); diff --git a/src/main/java/com/skyflow/v2/errors/SkyflowException.java b/src/main/java/com/skyflow/common/errors/SkyflowException.java similarity index 98% rename from src/main/java/com/skyflow/v2/errors/SkyflowException.java rename to src/main/java/com/skyflow/common/errors/SkyflowException.java index 079621a5..8f07689b 100644 --- a/src/main/java/com/skyflow/v2/errors/SkyflowException.java +++ b/src/main/java/com/skyflow/common/errors/SkyflowException.java @@ -1,10 +1,10 @@ -package com.skyflow.v2.errors; +package com.skyflow.common.errors; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.skyflow.v2.utils.Constants; +import com.skyflow.common.utils.Constants; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/v2/generated/rest/ApiClient.java b/src/main/java/com/skyflow/common/generated/ApiClient.java similarity index 96% rename from src/main/java/com/skyflow/v2/generated/rest/ApiClient.java rename to src/main/java/com/skyflow/common/generated/ApiClient.java index 70a115e0..a29460c9 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/ApiClient.java +++ b/src/main/java/com/skyflow/common/generated/ApiClient.java @@ -1,12 +1,12 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.v2.generated.rest; +package com.skyflow.common.generated; import com.skyflow.v2.generated.rest.core.ClientOptions; import com.skyflow.v2.generated.rest.core.Suppliers; import com.skyflow.v2.generated.rest.resources.audit.AuditClient; -import com.skyflow.v2.generated.rest.resources.authentication.AuthenticationClient; +import com.skyflow.common.generated.authentication.AuthenticationClient; import com.skyflow.v2.generated.rest.resources.binlookup.BinLookupClient; import com.skyflow.v2.generated.rest.resources.deprecated.DeprecatedClient; import com.skyflow.v2.generated.rest.resources.files.FilesClient; diff --git a/src/main/java/com/skyflow/v2/generated/rest/ApiClientBuilder.java b/src/main/java/com/skyflow/common/generated/ApiClientBuilder.java similarity index 97% rename from src/main/java/com/skyflow/v2/generated/rest/ApiClientBuilder.java rename to src/main/java/com/skyflow/common/generated/ApiClientBuilder.java index 090e9218..f5014690 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/ApiClientBuilder.java +++ b/src/main/java/com/skyflow/common/generated/ApiClientBuilder.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.v2.generated.rest; +package com.skyflow.common.generated; import com.skyflow.v2.generated.rest.core.ClientOptions; import com.skyflow.v2.generated.rest.core.Environment; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/authentication/AsyncAuthenticationClient.java b/src/main/java/com/skyflow/common/generated/authentication/AsyncAuthenticationClient.java similarity index 89% rename from src/main/java/com/skyflow/v2/generated/rest/resources/authentication/AsyncAuthenticationClient.java rename to src/main/java/com/skyflow/common/generated/authentication/AsyncAuthenticationClient.java index 2cd73d79..bd0976e7 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/authentication/AsyncAuthenticationClient.java +++ b/src/main/java/com/skyflow/common/generated/authentication/AsyncAuthenticationClient.java @@ -1,12 +1,12 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.v2.generated.rest.resources.authentication; +package com.skyflow.common.generated.authentication; +import com.skyflow.common.generated.authentication.requests.V1GetAuthTokenRequest; import com.skyflow.v2.generated.rest.core.ClientOptions; import com.skyflow.v2.generated.rest.core.RequestOptions; -import com.skyflow.v2.generated.rest.resources.authentication.requests.V1GetAuthTokenRequest; -import com.skyflow.v2.generated.rest.types.V1GetAuthTokenResponse; +import com.skyflow.common.generated.types.V1GetAuthTokenResponse; import java.util.concurrent.CompletableFuture; public class AsyncAuthenticationClient { diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/authentication/AsyncRawAuthenticationClient.java b/src/main/java/com/skyflow/common/generated/authentication/AsyncRawAuthenticationClient.java similarity index 95% rename from src/main/java/com/skyflow/v2/generated/rest/resources/authentication/AsyncRawAuthenticationClient.java rename to src/main/java/com/skyflow/common/generated/authentication/AsyncRawAuthenticationClient.java index a4254322..5cbb331a 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/authentication/AsyncRawAuthenticationClient.java +++ b/src/main/java/com/skyflow/common/generated/authentication/AsyncRawAuthenticationClient.java @@ -1,10 +1,11 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.v2.generated.rest.resources.authentication; +package com.skyflow.common.generated.authentication; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.authentication.requests.V1GetAuthTokenRequest; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; @@ -14,8 +15,7 @@ import com.skyflow.v2.generated.rest.errors.BadRequestError; import com.skyflow.v2.generated.rest.errors.NotFoundError; import com.skyflow.v2.generated.rest.errors.UnauthorizedError; -import com.skyflow.v2.generated.rest.resources.authentication.requests.V1GetAuthTokenRequest; -import com.skyflow.v2.generated.rest.types.V1GetAuthTokenResponse; +import com.skyflow.common.generated.types.V1GetAuthTokenResponse; import java.io.IOException; import java.util.concurrent.CompletableFuture; import okhttp3.Call; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/authentication/AuthenticationClient.java b/src/main/java/com/skyflow/common/generated/authentication/AuthenticationClient.java similarity index 88% rename from src/main/java/com/skyflow/v2/generated/rest/resources/authentication/AuthenticationClient.java rename to src/main/java/com/skyflow/common/generated/authentication/AuthenticationClient.java index 259707c8..51fa266c 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/authentication/AuthenticationClient.java +++ b/src/main/java/com/skyflow/common/generated/authentication/AuthenticationClient.java @@ -1,12 +1,12 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.v2.generated.rest.resources.authentication; +package com.skyflow.common.generated.authentication; import com.skyflow.v2.generated.rest.core.ClientOptions; import com.skyflow.v2.generated.rest.core.RequestOptions; -import com.skyflow.v2.generated.rest.resources.authentication.requests.V1GetAuthTokenRequest; -import com.skyflow.v2.generated.rest.types.V1GetAuthTokenResponse; +import com.skyflow.common.generated.authentication.requests.V1GetAuthTokenRequest; +import com.skyflow.common.generated.types.V1GetAuthTokenResponse; public class AuthenticationClient { protected final ClientOptions clientOptions; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/authentication/RawAuthenticationClient.java b/src/main/java/com/skyflow/common/generated/authentication/RawAuthenticationClient.java similarity index 94% rename from src/main/java/com/skyflow/v2/generated/rest/resources/authentication/RawAuthenticationClient.java rename to src/main/java/com/skyflow/common/generated/authentication/RawAuthenticationClient.java index 730c4895..003b23ba 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/authentication/RawAuthenticationClient.java +++ b/src/main/java/com/skyflow/common/generated/authentication/RawAuthenticationClient.java @@ -1,10 +1,11 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.v2.generated.rest.resources.authentication; +package com.skyflow.common.generated.authentication; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.authentication.requests.V1GetAuthTokenRequest; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; @@ -14,8 +15,7 @@ import com.skyflow.v2.generated.rest.errors.BadRequestError; import com.skyflow.v2.generated.rest.errors.NotFoundError; import com.skyflow.v2.generated.rest.errors.UnauthorizedError; -import com.skyflow.v2.generated.rest.resources.authentication.requests.V1GetAuthTokenRequest; -import com.skyflow.v2.generated.rest.types.V1GetAuthTokenResponse; +import com.skyflow.common.generated.types.V1GetAuthTokenResponse; import java.io.IOException; import okhttp3.Headers; import okhttp3.HttpUrl; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/authentication/requests/V1GetAuthTokenRequest.java b/src/main/java/com/skyflow/common/generated/authentication/requests/V1GetAuthTokenRequest.java similarity index 99% rename from src/main/java/com/skyflow/v2/generated/rest/resources/authentication/requests/V1GetAuthTokenRequest.java rename to src/main/java/com/skyflow/common/generated/authentication/requests/V1GetAuthTokenRequest.java index 153974ef..790e19e9 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/authentication/requests/V1GetAuthTokenRequest.java +++ b/src/main/java/com/skyflow/common/generated/authentication/requests/V1GetAuthTokenRequest.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.v2.generated.rest.resources.authentication.requests; +package com.skyflow.common.generated.authentication.requests; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; diff --git a/src/main/java/com/skyflow/vaultLH/core/ApiClientApiException.java b/src/main/java/com/skyflow/common/generated/core/ApiClientApiException.java similarity index 94% rename from src/main/java/com/skyflow/vaultLH/core/ApiClientApiException.java rename to src/main/java/com/skyflow/common/generated/core/ApiClientApiException.java index 21873ac5..da0ee718 100644 --- a/src/main/java/com/skyflow/vaultLH/core/ApiClientApiException.java +++ b/src/main/java/com/skyflow/common/generated/core/ApiClientApiException.java @@ -1,12 +1,14 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.common.generated.core; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + +import com.skyflow.v2.generated.rest.core.ApiClientException; import okhttp3.Response; /** diff --git a/src/main/java/com/skyflow/v2/generated/rest/types/V1GetAuthTokenResponse.java b/src/main/java/com/skyflow/common/generated/types/V1GetAuthTokenResponse.java similarity index 98% rename from src/main/java/com/skyflow/v2/generated/rest/types/V1GetAuthTokenResponse.java rename to src/main/java/com/skyflow/common/generated/types/V1GetAuthTokenResponse.java index e5438351..ebb967bc 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/types/V1GetAuthTokenResponse.java +++ b/src/main/java/com/skyflow/common/generated/types/V1GetAuthTokenResponse.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.v2.generated.rest.types; +package com.skyflow.common.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; diff --git a/src/main/java/com/skyflow/v2/utils/logger/LogUtil.java b/src/main/java/com/skyflow/common/logger/LogUtil.java similarity index 96% rename from src/main/java/com/skyflow/v2/utils/logger/LogUtil.java rename to src/main/java/com/skyflow/common/logger/LogUtil.java index a962c40d..321d392f 100644 --- a/src/main/java/com/skyflow/v2/utils/logger/LogUtil.java +++ b/src/main/java/com/skyflow/common/logger/LogUtil.java @@ -1,7 +1,7 @@ -package com.skyflow.v2.utils.logger; +package com.skyflow.common.logger; -import com.skyflow.v2.enums.LogLevel; -import com.skyflow.v2.logs.InfoLogs; +import com.skyflow.common.enums.LogLevel; +import com.skyflow.common.logs.InfoLogs; import com.skyflow.v2.utils.Constants; import java.util.logging.*; diff --git a/src/main/java/com/skyflow/v2/logs/ErrorLogs.java b/src/main/java/com/skyflow/common/logs/ErrorLogs.java similarity index 99% rename from src/main/java/com/skyflow/v2/logs/ErrorLogs.java rename to src/main/java/com/skyflow/common/logs/ErrorLogs.java index 1dcc1261..b0ee077e 100644 --- a/src/main/java/com/skyflow/v2/logs/ErrorLogs.java +++ b/src/main/java/com/skyflow/common/logs/ErrorLogs.java @@ -1,4 +1,4 @@ -package com.skyflow.v2.logs; +package com.skyflow.common.logs; public enum ErrorLogs { // Client initialization diff --git a/src/main/java/com/skyflow/v2/logs/InfoLogs.java b/src/main/java/com/skyflow/common/logs/InfoLogs.java similarity index 99% rename from src/main/java/com/skyflow/v2/logs/InfoLogs.java rename to src/main/java/com/skyflow/common/logs/InfoLogs.java index 1e6e2c72..337db094 100644 --- a/src/main/java/com/skyflow/v2/logs/InfoLogs.java +++ b/src/main/java/com/skyflow/common/logs/InfoLogs.java @@ -1,4 +1,4 @@ -package com.skyflow.v2.logs; +package com.skyflow.common.logs; public enum InfoLogs { // Client initialization diff --git a/src/main/java/com/skyflow/common/serviceaccount/util/BearerToken.java b/src/main/java/com/skyflow/common/serviceaccount/util/BearerToken.java index 7f902801..9ce14a34 100644 --- a/src/main/java/com/skyflow/common/serviceaccount/util/BearerToken.java +++ b/src/main/java/com/skyflow/common/serviceaccount/util/BearerToken.java @@ -1,20 +1,20 @@ package com.skyflow.common.serviceaccount.util; import com.google.gson.*; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; -import com.skyflow.v2.generated.rest.ApiClient; -import com.skyflow.v2.generated.rest.ApiClientBuilder; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; -import com.skyflow.v2.generated.rest.resources.authentication.AuthenticationClient; -import com.skyflow.v2.generated.rest.resources.authentication.requests.V1GetAuthTokenRequest; -import com.skyflow.v2.generated.rest.types.V1GetAuthTokenResponse; -import com.skyflow.v2.logs.ErrorLogs; -import com.skyflow.v2.logs.InfoLogs; -import com.skyflow.v2.utils.Constants; -import com.skyflow.v2.utils.Utils; -import com.skyflow.v2.utils.logger.LogUtil; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; +import com.skyflow.common.generated.ApiClient; +import com.skyflow.common.generated.ApiClientBuilder; +import com.skyflow.common.generated.core.ApiClientApiException; +import com.skyflow.common.generated.authentication.AuthenticationClient; +import com.skyflow.common.generated.authentication.requests.V1GetAuthTokenRequest; +import com.skyflow.common.generated.types.V1GetAuthTokenResponse; +import com.skyflow.common.logs.ErrorLogs; +import com.skyflow.common.logs.InfoLogs; +import com.skyflow.common.utils.Constants; +import com.skyflow.common.utils.CommonUtils; +import com.skyflow.common.logger.LogUtil; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; @@ -62,11 +62,11 @@ private static V1GetAuthTokenResponse generateBearerTokenFromCredentials( return getBearerTokenFromCredentials(serviceAccountCredentials, context, roles); } catch (JsonSyntaxException e) { LogUtil.printErrorLog(ErrorLogs.INVALID_CREDENTIALS_FILE_FORMAT.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), Utils.parameterizedString( + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), CommonUtils.parameterizedString( ErrorMessage.FileInvalidJson.getMessage(), credentialsFile.getPath())); } catch (FileNotFoundException e) { LogUtil.printErrorLog(ErrorLogs.CREDENTIALS_FILE_NOT_FOUND.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), Utils.parameterizedString( + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), CommonUtils.parameterizedString( ErrorMessage.FileNotFound.getMessage(), credentialsFile.getPath())); } } @@ -117,12 +117,12 @@ private static V1GetAuthTokenResponse getBearerTokenFromCredentials( throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.MissingTokenUri.getMessage()); } - PrivateKey pvtKey = Utils.getPrivateKeyFromPem(privateKey.getAsString()); + PrivateKey pvtKey = CommonUtils.getPrivateKeyFromPem(privateKey.getAsString()); String signedUserJWT = getSignedToken( clientID.getAsString(), keyID.getAsString(), tokenURI.getAsString(), pvtKey, context ); - String basePath = Utils.getBaseURL(tokenURI.getAsString()); + String basePath = CommonUtils.getBaseURL(tokenURI.getAsString()); apiClientBuilder.url(basePath); ApiClient apiClient = apiClientBuilder.token("token").build(); AuthenticationClient authenticationApi = apiClient.authentication(); diff --git a/src/main/java/com/skyflow/common/serviceaccount/util/SignedDataTokenResponse.java b/src/main/java/com/skyflow/common/serviceaccount/util/SignedDataTokenResponse.java index ffe9ddf5..dfdd40bd 100644 --- a/src/main/java/com/skyflow/common/serviceaccount/util/SignedDataTokenResponse.java +++ b/src/main/java/com/skyflow/common/serviceaccount/util/SignedDataTokenResponse.java @@ -1,7 +1,7 @@ package com.skyflow.common.serviceaccount.util; import com.google.gson.Gson; -import com.skyflow.v2.utils.Constants; +import com.skyflow.common.utils.Constants; public class SignedDataTokenResponse { private static final String prefix = Constants.SIGNED_DATA_TOKEN_PREFIX; diff --git a/src/main/java/com/skyflow/common/serviceaccount/util/SignedDataTokens.java b/src/main/java/com/skyflow/common/serviceaccount/util/SignedDataTokens.java index ae3169e6..6e6c5297 100644 --- a/src/main/java/com/skyflow/common/serviceaccount/util/SignedDataTokens.java +++ b/src/main/java/com/skyflow/common/serviceaccount/util/SignedDataTokens.java @@ -4,13 +4,13 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.JsonSyntaxException; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; -import com.skyflow.v2.logs.ErrorLogs; -import com.skyflow.v2.logs.InfoLogs; -import com.skyflow.v2.utils.Utils; -import com.skyflow.v2.utils.logger.LogUtil; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; +import com.skyflow.common.logs.ErrorLogs; +import com.skyflow.common.logs.InfoLogs; +import com.skyflow.common.utils.CommonUtils; +import com.skyflow.common.logger.LogUtil; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; @@ -59,11 +59,11 @@ private static List generateSignedTokenFromCredentialsF responseToken = generateSignedTokensFromCredentials(serviceAccountCredentials, dataTokens, timeToLive, context); } catch (JsonSyntaxException e) { LogUtil.printErrorLog(ErrorLogs.INVALID_CREDENTIALS_FILE_FORMAT.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), Utils.parameterizedString( + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), CommonUtils.parameterizedString( ErrorMessage.FileInvalidJson.getMessage(), credentialsFile.getPath())); } catch (FileNotFoundException e) { LogUtil.printErrorLog(ErrorLogs.CREDENTIALS_FILE_NOT_FOUND.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), Utils.parameterizedString( + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), CommonUtils.parameterizedString( ErrorMessage.FileNotFound.getMessage(), credentialsFile.getPath())); } return responseToken; @@ -111,7 +111,7 @@ private static List generateSignedTokensFromCredentials LogUtil.printErrorLog(ErrorLogs.KEY_ID_IS_REQUIRED.getLog()); throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.MissingKeyId.getMessage()); } - PrivateKey pvtKey = Utils.getPrivateKeyFromPem(privateKey.getAsString()); + PrivateKey pvtKey = CommonUtils.getPrivateKeyFromPem(privateKey.getAsString()); signedDataTokens = getSignedToken( clientID.getAsString(), keyID.getAsString(), pvtKey, dataTokens, timeToLive, context); } catch (RuntimeException e) { diff --git a/src/main/java/com/skyflow/common/serviceaccount/util/Token.java b/src/main/java/com/skyflow/common/serviceaccount/util/Token.java index ae17e4c4..adb914f7 100644 --- a/src/main/java/com/skyflow/common/serviceaccount/util/Token.java +++ b/src/main/java/com/skyflow/common/serviceaccount/util/Token.java @@ -3,12 +3,12 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.JsonSyntaxException; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; -import com.skyflow.v2.logs.ErrorLogs; -import com.skyflow.v2.logs.InfoLogs; -import com.skyflow.v2.utils.logger.LogUtil; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; +import com.skyflow.common.logs.ErrorLogs; +import com.skyflow.common.logs.InfoLogs; +import com.skyflow.common.logger.LogUtil; import org.apache.commons.codec.binary.Base64; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/com/skyflow/common/utils/CommonUtils.java b/src/main/java/com/skyflow/common/utils/CommonUtils.java new file mode 100644 index 00000000..88e5b13d --- /dev/null +++ b/src/main/java/com/skyflow/common/utils/CommonUtils.java @@ -0,0 +1,110 @@ +package com.skyflow.common.utils; + +import com.skyflow.common.config.Credentials; +import com.skyflow.common.enums.Env; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; +import com.skyflow.common.logger.LogUtil; +import com.skyflow.common.logs.ErrorLogs; +import com.skyflow.common.serviceaccount.util.BearerToken; +import org.apache.commons.codec.binary.Base64; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.security.KeyFactory; +import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.security.spec.InvalidKeySpecException; +import java.security.spec.PKCS8EncodedKeySpec; + +public class CommonUtils { + public static String getVaultURL(String clusterId, Env env) { + StringBuilder sb = new StringBuilder(Constants.SECURE_PROTOCOL); + sb.append(clusterId); + switch (env) { + case DEV: + sb.append(Constants.DEV_DOMAIN); + break; + case STAGE: + sb.append(Constants.STAGE_DOMAIN); + break; + case SANDBOX: + sb.append(Constants.SANDBOX_DOMAIN); + break; + case PROD: + default: + sb.append(Constants.PROD_DOMAIN); + break; + } + return sb.toString(); + } + public static String generateBearerToken(Credentials credentials) throws SkyflowException { + if (credentials.getPath() != null) { + return BearerToken.builder() + .setCredentials(new File(credentials.getPath())) + .setRoles(credentials.getRoles()) + .setCtx(credentials.getContext()) + .build() + .getBearerToken(); + } else if (credentials.getCredentialsString() != null) { + return BearerToken.builder() + .setCredentials(credentials.getCredentialsString()) + .setRoles(credentials.getRoles()) + .setCtx(credentials.getContext()) + .build() + .getBearerToken(); + } else { + return credentials.getToken(); + } + } + public static PrivateKey getPrivateKeyFromPem(String pemKey) throws SkyflowException { + String PKCS8PrivateHeader = Constants.PKCS8_PRIVATE_HEADER; + String PKCS8PrivateFooter = Constants.PKCS8_PRIVATE_FOOTER; + + String privateKeyContent = pemKey; + PrivateKey privateKey = null; + + if (pemKey.contains(PKCS8PrivateHeader)) { + privateKeyContent = privateKeyContent.replace(PKCS8PrivateHeader, ""); + privateKeyContent = privateKeyContent.replace(PKCS8PrivateFooter, ""); + privateKeyContent = privateKeyContent.replace("\n", ""); + privateKeyContent = privateKeyContent.replace("\r\n", ""); + privateKey = parsePkcs8PrivateKey(Base64.decodeBase64(privateKeyContent)); + } else { + LogUtil.printErrorLog(ErrorLogs.JWT_INVALID_FORMAT.getLog()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.JwtInvalidFormat.getMessage()); + } + return privateKey; + } + public static String getBaseURL(String url) throws MalformedURLException { + URL parsedUrl = new URL(url); + String protocol = parsedUrl.getProtocol(); + String host = parsedUrl.getHost(); + return String.format("%s://%s", protocol, host); + } + + public static String parameterizedString(String base, String... args) { + for (int index = 0; index < args.length; index++) { + base = base.replace("%s" + (index + 1), args[index]); + } + return base; + } + private static PrivateKey parsePkcs8PrivateKey(byte[] pkcs8Bytes) throws SkyflowException { + KeyFactory keyFactory; + PrivateKey privateKey = null; + try { + PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(pkcs8Bytes); + keyFactory = KeyFactory.getInstance("RSA"); + privateKey = keyFactory.generatePrivate(keySpec); + } catch (NoSuchAlgorithmException e) { + LogUtil.printErrorLog(ErrorLogs.INVALID_ALGORITHM.getLog()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidAlgorithm.getMessage()); + } catch (InvalidKeySpecException e) { + LogUtil.printErrorLog(ErrorLogs.INVALID_KEY_SPEC.getLog()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidKeySpec.getMessage()); + } + return privateKey; + } +} diff --git a/src/main/java/com/skyflow/common/utils/Constants.java b/src/main/java/com/skyflow/common/utils/Constants.java new file mode 100644 index 00000000..f21ea517 --- /dev/null +++ b/src/main/java/com/skyflow/common/utils/Constants.java @@ -0,0 +1,19 @@ +package com.skyflow.common.utils; + +public class Constants { + public static final String ERROR_FROM_CLIENT_HEADER_KEY = "error-from-client"; + public static final String REQUEST_ID_HEADER_KEY = "x-request-id"; + public static final String GRANT_TYPE = "urn:ietf:params:oauth:grant-type:jwt-bearer"; + public static final String SECURE_PROTOCOL = "https://"; + public static final String SIGNED_DATA_TOKEN_PREFIX = "signed_token_"; + + public static final String API_KEY_REGEX = "^sky-[a-zA-Z0-9]{5}-[a-fA-F0-9]{32}$"; + public static final String DEV_DOMAIN = ".vault.skyflowapis.dev"; + public static final String STAGE_DOMAIN = ".vault.skyflowapis.tech"; + public static final String SANDBOX_DOMAIN = ".vault.skyflowapis-preview.com"; + public static final String PROD_DOMAIN = ".vault.skyflowapis.com"; + public static final String PKCS8_PRIVATE_HEADER = "-----BEGIN PRIVATE KEY-----"; + public static final String PKCS8_PRIVATE_FOOTER = "-----END PRIVATE KEY-----"; + public static final String ENV_CREDENTIALS_KEY_NAME = "SKYFLOW_CREDENTIALS"; + +} diff --git a/src/main/java/com/skyflow/common/utils/Validations.java b/src/main/java/com/skyflow/common/utils/Validations.java new file mode 100644 index 00000000..32c96db3 --- /dev/null +++ b/src/main/java/com/skyflow/common/utils/Validations.java @@ -0,0 +1,104 @@ +package com.skyflow.common.utils; + +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; +import com.skyflow.common.logger.LogUtil; +import com.skyflow.common.logs.ErrorLogs; +import java.util.ArrayList; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class Validations { + public static void validateVaultConfig(VaultConfig vaultConfig) throws SkyflowException { + String vaultId = vaultConfig.getVaultId(); + String clusterId = vaultConfig.getClusterId(); + Credentials credentials = vaultConfig.getCredentials(); + if (vaultId == null) { + LogUtil.printErrorLog(ErrorLogs.VAULT_ID_IS_REQUIRED.getLog()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidVaultId.getMessage()); + } else if (vaultId.trim().isEmpty()) { + LogUtil.printErrorLog(ErrorLogs.EMPTY_VAULT_ID.getLog()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyVaultId.getMessage()); + } else if (clusterId == null) { + LogUtil.printErrorLog(ErrorLogs.CLUSTER_ID_IS_REQUIRED.getLog()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidClusterId.getMessage()); + } else if (clusterId.trim().isEmpty()) { + LogUtil.printErrorLog(ErrorLogs.EMPTY_CLUSTER_ID.getLog()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyClusterId.getMessage()); + } else if (credentials != null) { + validateCredentials(credentials); + } + } + public static void validateCredentials(Credentials credentials) throws SkyflowException { + int nonNullMembers = 0; + String path = credentials.getPath(); + String credentialsString = credentials.getCredentialsString(); + String token = credentials.getToken(); + String apiKey = credentials.getApiKey(); + String context = credentials.getContext(); + ArrayList roles = credentials.getRoles(); + + if (path != null) nonNullMembers++; + if (credentialsString != null) nonNullMembers++; + if (token != null) nonNullMembers++; + if (apiKey != null) nonNullMembers++; + + if (nonNullMembers > 1) { + LogUtil.printErrorLog(ErrorLogs.MULTIPLE_TOKEN_GENERATION_MEANS_PASSED.getLog()); + throw new SkyflowException( + ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.MultipleTokenGenerationMeansPassed.getMessage() + ); + } else if (nonNullMembers < 1) { + LogUtil.printErrorLog(ErrorLogs.NO_TOKEN_GENERATION_MEANS_PASSED.getLog()); + throw new SkyflowException( + ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.NoTokenGenerationMeansPassed.getMessage() + ); + } else if (path != null && path.trim().isEmpty()) { + LogUtil.printErrorLog(ErrorLogs.EMPTY_CREDENTIALS_PATH.getLog()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyCredentialFilePath.getMessage()); + } else if (credentialsString != null && credentialsString.trim().isEmpty()) { + LogUtil.printErrorLog(ErrorLogs.EMPTY_CREDENTIALS_STRING.getLog()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyCredentialsString.getMessage()); + } else if (token != null && token.trim().isEmpty()) { + LogUtil.printErrorLog(ErrorLogs.EMPTY_TOKEN_VALUE.getLog()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyToken.getMessage()); + } else if (apiKey != null) { + if (apiKey.trim().isEmpty()) { + LogUtil.printErrorLog(ErrorLogs.EMPTY_API_KEY_VALUE.getLog()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyApikey.getMessage()); + } else { + Pattern pattern = Pattern.compile(Constants.API_KEY_REGEX); + Matcher matcher = pattern.matcher(apiKey); + if (!matcher.matches()) { + LogUtil.printErrorLog(ErrorLogs.INVALID_API_KEY.getLog()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidApikey.getMessage()); + } + } + } else if (roles != null) { + if (roles.isEmpty()) { + LogUtil.printErrorLog(ErrorLogs.EMPTY_ROLES.getLog()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyRoles.getMessage()); + } else { + for (int index = 0; index < roles.size(); index++) { + String role = roles.get(index); + if (role == null || role.trim().isEmpty()) { + LogUtil.printErrorLog(CommonUtils.parameterizedString( + ErrorLogs.EMPTY_OR_NULL_ROLE_IN_ROLES.getLog(), Integer.toString(index) + )); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyRoleInRoles.getMessage()); + } + } + } + } + if (context != null && context.trim().isEmpty()) { + LogUtil.printErrorLog(ErrorLogs.EMPTY_OR_NULL_CONTEXT.getLog()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyContext.getMessage()); + } + } + + + +} diff --git a/src/main/java/com/skyflow/v2/ConnectionClient.java b/src/main/java/com/skyflow/v2/ConnectionClient.java index e312246d..544aa9fe 100644 --- a/src/main/java/com/skyflow/v2/ConnectionClient.java +++ b/src/main/java/com/skyflow/v2/ConnectionClient.java @@ -1,15 +1,15 @@ package com.skyflow.v2; import com.skyflow.common.serviceaccount.util.Token; -import com.skyflow.v2.config.ConnectionConfig; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; -import com.skyflow.v2.logs.InfoLogs; +import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; +import com.skyflow.common.logs.InfoLogs; import com.skyflow.v2.utils.Constants; import com.skyflow.v2.utils.Utils; -import com.skyflow.v2.utils.logger.LogUtil; +import com.skyflow.common.logger.LogUtil; import com.skyflow.v2.utils.validations.Validations; import io.github.cdimascio.dotenv.Dotenv; import io.github.cdimascio.dotenv.DotenvException; diff --git a/src/main/java/com/skyflow/v2/Skyflow.java b/src/main/java/com/skyflow/v2/Skyflow.java index a7ab2594..f42233ff 100644 --- a/src/main/java/com/skyflow/v2/Skyflow.java +++ b/src/main/java/com/skyflow/v2/Skyflow.java @@ -1,17 +1,17 @@ package com.skyflow.v2; -import com.skyflow.v2.config.ConnectionConfig; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.config.VaultConfig; -import com.skyflow.v2.enums.Env; -import com.skyflow.v2.enums.LogLevel; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; -import com.skyflow.v2.logs.ErrorLogs; -import com.skyflow.v2.logs.InfoLogs; +import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.common.enums.Env; +import com.skyflow.common.enums.LogLevel; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; +import com.skyflow.common.logs.ErrorLogs; +import com.skyflow.common.logs.InfoLogs; import com.skyflow.v2.utils.Utils; -import com.skyflow.v2.utils.logger.LogUtil; +import com.skyflow.common.logger.LogUtil; import com.skyflow.v2.utils.validations.Validations; import com.skyflow.v2.vault.controller.ConnectionController; import com.skyflow.v2.vault.controller.DetectController; @@ -116,7 +116,7 @@ public ConnectionController connection() throws SkyflowException { public ConnectionController connection(String connectionId) throws SkyflowException { ConnectionController controller = this.builder.connectionsMap.get(connectionId); if (controller == null) { - LogUtil.printErrorLog(ErrorLogs.CONNECTION_CONFIG_DOES_NOT_EXIST.getLog()); + com.skyflow.common.logger.LogUtil.printErrorLog(ErrorLogs.CONNECTION_CONFIG_DOES_NOT_EXIST.getLog()); throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.ConnectionIdNotInConfigList.getMessage()); } return controller; diff --git a/src/main/java/com/skyflow/v2/VaultClient.java b/src/main/java/com/skyflow/v2/VaultClient.java index 3cb714e8..1865cd00 100644 --- a/src/main/java/com/skyflow/v2/VaultClient.java +++ b/src/main/java/com/skyflow/v2/VaultClient.java @@ -1,15 +1,15 @@ package com.skyflow.v2; import com.skyflow.common.serviceaccount.util.Token; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.config.VaultConfig; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; import com.skyflow.v2.enums.DetectEntities; import com.skyflow.v2.enums.DetectOutputTranscriptions; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; -import com.skyflow.v2.generated.rest.ApiClient; -import com.skyflow.v2.generated.rest.ApiClientBuilder; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; +import com.skyflow.common.generated.ApiClient; +import com.skyflow.common.generated.ApiClientBuilder; import com.skyflow.v2.generated.rest.resources.files.FilesClient; import com.skyflow.v2.generated.rest.resources.files.requests.*; import com.skyflow.v2.generated.rest.resources.files.types.*; @@ -27,10 +27,10 @@ import com.skyflow.v2.generated.rest.resources.tokens.requests.V1TokenizePayload; import com.skyflow.v2.generated.rest.types.*; import com.skyflow.v2.generated.rest.types.Transformations; -import com.skyflow.v2.logs.InfoLogs; +import com.skyflow.common.logs.InfoLogs; import com.skyflow.v2.utils.Constants; import com.skyflow.v2.utils.Utils; -import com.skyflow.v2.utils.logger.LogUtil; +import com.skyflow.common.logger.LogUtil; import com.skyflow.v2.utils.validations.Validations; import com.skyflow.v2.vault.data.InsertRequest; import com.skyflow.v2.vault.data.UpdateRequest; diff --git a/src/main/java/com/skyflow/v2/config/ManagementConfig.java b/src/main/java/com/skyflow/v2/config/ManagementConfig.java deleted file mode 100644 index 67b78ad4..00000000 --- a/src/main/java/com/skyflow/v2/config/ManagementConfig.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.skyflow.v2.config; - -public class ManagementConfig { - // members - - // constructor - ManagementConfig() { - } - - // getters and setters -} diff --git a/src/main/java/com/skyflow/v2/generated/rest/AsyncApiClient.java b/src/main/java/com/skyflow/v2/generated/rest/AsyncApiClient.java index 49c32e96..46ee3177 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/AsyncApiClient.java +++ b/src/main/java/com/skyflow/v2/generated/rest/AsyncApiClient.java @@ -6,7 +6,7 @@ import com.skyflow.v2.generated.rest.core.ClientOptions; import com.skyflow.v2.generated.rest.core.Suppliers; import com.skyflow.v2.generated.rest.resources.audit.AsyncAuditClient; -import com.skyflow.v2.generated.rest.resources.authentication.AsyncAuthenticationClient; +import com.skyflow.common.generated.authentication.AsyncAuthenticationClient; import com.skyflow.v2.generated.rest.resources.binlookup.AsyncBinLookupClient; import com.skyflow.v2.generated.rest.resources.deprecated.AsyncDeprecatedClient; import com.skyflow.v2.generated.rest.resources.files.AsyncFilesClient; diff --git a/src/main/java/com/skyflow/v2/generated/rest/errors/BadRequestError.java b/src/main/java/com/skyflow/v2/generated/rest/errors/BadRequestError.java index 8bb41fb5..9faa3b82 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/errors/BadRequestError.java +++ b/src/main/java/com/skyflow/v2/generated/rest/errors/BadRequestError.java @@ -3,7 +3,7 @@ */ package com.skyflow.v2.generated.rest.errors; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import okhttp3.Response; public final class BadRequestError extends ApiClientApiException { diff --git a/src/main/java/com/skyflow/v2/generated/rest/errors/InternalServerError.java b/src/main/java/com/skyflow/v2/generated/rest/errors/InternalServerError.java index 17d6a716..0fd5d6ed 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/errors/InternalServerError.java +++ b/src/main/java/com/skyflow/v2/generated/rest/errors/InternalServerError.java @@ -3,7 +3,7 @@ */ package com.skyflow.v2.generated.rest.errors; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.types.ErrorResponse; import okhttp3.Response; diff --git a/src/main/java/com/skyflow/v2/generated/rest/errors/NotFoundError.java b/src/main/java/com/skyflow/v2/generated/rest/errors/NotFoundError.java index 18b25fe0..b808f8eb 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/errors/NotFoundError.java +++ b/src/main/java/com/skyflow/v2/generated/rest/errors/NotFoundError.java @@ -3,7 +3,7 @@ */ package com.skyflow.v2.generated.rest.errors; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import okhttp3.Response; public final class NotFoundError extends ApiClientApiException { diff --git a/src/main/java/com/skyflow/v2/generated/rest/errors/UnauthorizedError.java b/src/main/java/com/skyflow/v2/generated/rest/errors/UnauthorizedError.java index c2e6c3e9..9a65f438 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/errors/UnauthorizedError.java +++ b/src/main/java/com/skyflow/v2/generated/rest/errors/UnauthorizedError.java @@ -3,7 +3,7 @@ */ package com.skyflow.v2.generated.rest.errors; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import okhttp3.Response; public final class UnauthorizedError extends ApiClientApiException { diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/audit/AsyncRawAuditClient.java b/src/main/java/com/skyflow/v2/generated/rest/resources/audit/AsyncRawAuditClient.java index 5e7e77b0..f8bd5fa1 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/audit/AsyncRawAuditClient.java +++ b/src/main/java/com/skyflow/v2/generated/rest/resources/audit/AsyncRawAuditClient.java @@ -4,7 +4,7 @@ package com.skyflow.v2.generated.rest.resources.audit; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/audit/RawAuditClient.java b/src/main/java/com/skyflow/v2/generated/rest/resources/audit/RawAuditClient.java index 72e7a688..40565316 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/audit/RawAuditClient.java +++ b/src/main/java/com/skyflow/v2/generated/rest/resources/audit/RawAuditClient.java @@ -4,7 +4,7 @@ package com.skyflow.v2.generated.rest.resources.audit; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/binlookup/AsyncRawBinLookupClient.java b/src/main/java/com/skyflow/v2/generated/rest/resources/binlookup/AsyncRawBinLookupClient.java index f2bf760b..d9362c4b 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/binlookup/AsyncRawBinLookupClient.java +++ b/src/main/java/com/skyflow/v2/generated/rest/resources/binlookup/AsyncRawBinLookupClient.java @@ -4,7 +4,7 @@ package com.skyflow.v2.generated.rest.resources.binlookup; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/binlookup/RawBinLookupClient.java b/src/main/java/com/skyflow/v2/generated/rest/resources/binlookup/RawBinLookupClient.java index 17a56a4f..e5f82b55 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/binlookup/RawBinLookupClient.java +++ b/src/main/java/com/skyflow/v2/generated/rest/resources/binlookup/RawBinLookupClient.java @@ -4,7 +4,7 @@ package com.skyflow.v2.generated.rest.resources.binlookup; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/deprecated/AsyncRawDeprecatedClient.java b/src/main/java/com/skyflow/v2/generated/rest/resources/deprecated/AsyncRawDeprecatedClient.java index 68063a6c..e91f0412 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/deprecated/AsyncRawDeprecatedClient.java +++ b/src/main/java/com/skyflow/v2/generated/rest/resources/deprecated/AsyncRawDeprecatedClient.java @@ -4,7 +4,7 @@ package com.skyflow.v2.generated.rest.resources.deprecated; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/deprecated/RawDeprecatedClient.java b/src/main/java/com/skyflow/v2/generated/rest/resources/deprecated/RawDeprecatedClient.java index d59bc427..4f2b9a43 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/deprecated/RawDeprecatedClient.java +++ b/src/main/java/com/skyflow/v2/generated/rest/resources/deprecated/RawDeprecatedClient.java @@ -4,7 +4,7 @@ package com.skyflow.v2.generated.rest.resources.deprecated; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/files/AsyncRawFilesClient.java b/src/main/java/com/skyflow/v2/generated/rest/resources/files/AsyncRawFilesClient.java index f9da91fc..1cb5acd8 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/files/AsyncRawFilesClient.java +++ b/src/main/java/com/skyflow/v2/generated/rest/resources/files/AsyncRawFilesClient.java @@ -4,7 +4,7 @@ package com.skyflow.v2.generated.rest.resources.files; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/files/RawFilesClient.java b/src/main/java/com/skyflow/v2/generated/rest/resources/files/RawFilesClient.java index 33a68cd6..2c530097 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/files/RawFilesClient.java +++ b/src/main/java/com/skyflow/v2/generated/rest/resources/files/RawFilesClient.java @@ -4,7 +4,7 @@ package com.skyflow.v2.generated.rest.resources.files; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/query/AsyncRawQueryClient.java b/src/main/java/com/skyflow/v2/generated/rest/resources/query/AsyncRawQueryClient.java index 45651c81..566c2c92 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/query/AsyncRawQueryClient.java +++ b/src/main/java/com/skyflow/v2/generated/rest/resources/query/AsyncRawQueryClient.java @@ -4,7 +4,7 @@ package com.skyflow.v2.generated.rest.resources.query; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/query/RawQueryClient.java b/src/main/java/com/skyflow/v2/generated/rest/resources/query/RawQueryClient.java index d2dae8a6..5f4b4a5f 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/query/RawQueryClient.java +++ b/src/main/java/com/skyflow/v2/generated/rest/resources/query/RawQueryClient.java @@ -4,7 +4,7 @@ package com.skyflow.v2.generated.rest.resources.query; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/records/AsyncRawRecordsClient.java b/src/main/java/com/skyflow/v2/generated/rest/resources/records/AsyncRawRecordsClient.java index 2091d9f3..d0cd42a5 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/records/AsyncRawRecordsClient.java +++ b/src/main/java/com/skyflow/v2/generated/rest/resources/records/AsyncRawRecordsClient.java @@ -4,7 +4,7 @@ package com.skyflow.v2.generated.rest.resources.records; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/records/RawRecordsClient.java b/src/main/java/com/skyflow/v2/generated/rest/resources/records/RawRecordsClient.java index 837a8d2b..021f3182 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/records/RawRecordsClient.java +++ b/src/main/java/com/skyflow/v2/generated/rest/resources/records/RawRecordsClient.java @@ -4,7 +4,7 @@ package com.skyflow.v2.generated.rest.resources.records; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/strings/AsyncRawStringsClient.java b/src/main/java/com/skyflow/v2/generated/rest/resources/strings/AsyncRawStringsClient.java index e19683aa..14cba7ec 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/strings/AsyncRawStringsClient.java +++ b/src/main/java/com/skyflow/v2/generated/rest/resources/strings/AsyncRawStringsClient.java @@ -4,7 +4,7 @@ package com.skyflow.v2.generated.rest.resources.strings; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/strings/RawStringsClient.java b/src/main/java/com/skyflow/v2/generated/rest/resources/strings/RawStringsClient.java index 003ad0c9..ef26bafe 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/strings/RawStringsClient.java +++ b/src/main/java/com/skyflow/v2/generated/rest/resources/strings/RawStringsClient.java @@ -4,7 +4,7 @@ package com.skyflow.v2.generated.rest.resources.strings; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/tokens/AsyncRawTokensClient.java b/src/main/java/com/skyflow/v2/generated/rest/resources/tokens/AsyncRawTokensClient.java index d9b463b8..a3eb3b6e 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/tokens/AsyncRawTokensClient.java +++ b/src/main/java/com/skyflow/v2/generated/rest/resources/tokens/AsyncRawTokensClient.java @@ -4,7 +4,7 @@ package com.skyflow.v2.generated.rest.resources.tokens; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; diff --git a/src/main/java/com/skyflow/v2/generated/rest/resources/tokens/RawTokensClient.java b/src/main/java/com/skyflow/v2/generated/rest/resources/tokens/RawTokensClient.java index d83d2c28..aa69fd76 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/resources/tokens/RawTokensClient.java +++ b/src/main/java/com/skyflow/v2/generated/rest/resources/tokens/RawTokensClient.java @@ -4,7 +4,7 @@ package com.skyflow.v2.generated.rest.resources.tokens; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.core.ClientOptions; diff --git a/src/main/java/com/skyflow/v2/utils/Constants.java b/src/main/java/com/skyflow/v2/utils/Constants.java index f3b57a8e..6f0c468d 100644 --- a/src/main/java/com/skyflow/v2/utils/Constants.java +++ b/src/main/java/com/skyflow/v2/utils/Constants.java @@ -1,17 +1,7 @@ package com.skyflow.v2.utils; -public final class Constants { - public static final String SECURE_PROTOCOL = "https://"; - public static final String DEV_DOMAIN = ".vault.skyflowapis.dev"; - public static final String STAGE_DOMAIN = ".vault.skyflowapis.tech"; - public static final String SANDBOX_DOMAIN = ".vault.skyflowapis-preview.com"; - public static final String PROD_DOMAIN = ".vault.skyflowapis.com"; - public static final String PKCS8_PRIVATE_HEADER = "-----BEGIN PRIVATE KEY-----"; - public static final String PKCS8_PRIVATE_FOOTER = "-----END PRIVATE KEY-----"; - public static final String GRANT_TYPE = "urn:ietf:params:oauth:grant-type:jwt-bearer"; - public static final String SIGNED_DATA_TOKEN_PREFIX = "signed_token_"; +public final class Constants extends com.skyflow.common.utils.Constants { public static final String ORDER_ASCENDING = "ASCENDING"; - public static final String API_KEY_REGEX = "^sky-[a-zA-Z0-9]{5}-[a-fA-F0-9]{32}$"; public static final String ENV_CREDENTIALS_KEY_NAME = "SKYFLOW_CREDENTIALS"; public static final String SDK_NAME = "Skyflow Java SDK "; public static final String SDK_VERSION = "v2"; diff --git a/src/main/java/com/skyflow/v2/utils/HttpUtility.java b/src/main/java/com/skyflow/v2/utils/HttpUtility.java index a747a941..4c199e25 100644 --- a/src/main/java/com/skyflow/v2/utils/HttpUtility.java +++ b/src/main/java/com/skyflow/v2/utils/HttpUtility.java @@ -2,7 +2,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.errors.SkyflowException; import java.io.*; import java.net.HttpURLConnection; diff --git a/src/main/java/com/skyflow/v2/utils/Utils.java b/src/main/java/com/skyflow/v2/utils/Utils.java index 5f22b5c0..c3d334a0 100644 --- a/src/main/java/com/skyflow/v2/utils/Utils.java +++ b/src/main/java/com/skyflow/v2/utils/Utils.java @@ -1,106 +1,16 @@ package com.skyflow.v2.utils; import com.google.gson.JsonObject; -import com.skyflow.common.serviceaccount.util.BearerToken; -import com.skyflow.v2.config.ConnectionConfig; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.enums.Env; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; -import com.skyflow.v2.logs.ErrorLogs; -import com.skyflow.v2.logs.InfoLogs; -import com.skyflow.v2.utils.logger.LogUtil; +import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.common.logger.LogUtil; +import com.skyflow.common.logs.InfoLogs; +import com.skyflow.common.utils.CommonUtils; import com.skyflow.v2.vault.connection.InvokeConnectionRequest; -import org.apache.commons.codec.binary.Base64; -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.security.KeyFactory; -import java.security.NoSuchAlgorithmException; -import java.security.PrivateKey; -import java.security.spec.InvalidKeySpecException; -import java.security.spec.PKCS8EncodedKeySpec; import java.util.HashMap; import java.util.Map; -public final class Utils { - public static String getVaultURL(String clusterId, Env env) { - StringBuilder sb = new StringBuilder(Constants.SECURE_PROTOCOL); - sb.append(clusterId); - switch (env) { - case DEV: - sb.append(Constants.DEV_DOMAIN); - break; - case STAGE: - sb.append(Constants.STAGE_DOMAIN); - break; - case SANDBOX: - sb.append(Constants.SANDBOX_DOMAIN); - break; - case PROD: - default: - sb.append(Constants.PROD_DOMAIN); - break; - } - return sb.toString(); - } - - public static String generateBearerToken(Credentials credentials) throws SkyflowException { - if (credentials.getPath() != null) { - return BearerToken.builder() - .setCredentials(new File(credentials.getPath())) - .setRoles(credentials.getRoles()) - .setCtx(credentials.getContext()) - .build() - .getBearerToken(); - } else if (credentials.getCredentialsString() != null) { - return BearerToken.builder() - .setCredentials(credentials.getCredentialsString()) - .setRoles(credentials.getRoles()) - .setCtx(credentials.getContext()) - .build() - .getBearerToken(); - } else { - return credentials.getToken(); - } - } - - public static PrivateKey getPrivateKeyFromPem(String pemKey) throws SkyflowException { - String PKCS8PrivateHeader = Constants.PKCS8_PRIVATE_HEADER; - String PKCS8PrivateFooter = Constants.PKCS8_PRIVATE_FOOTER; - - String privateKeyContent = pemKey; - PrivateKey privateKey = null; - - if (pemKey.contains(PKCS8PrivateHeader)) { - privateKeyContent = privateKeyContent.replace(PKCS8PrivateHeader, ""); - privateKeyContent = privateKeyContent.replace(PKCS8PrivateFooter, ""); - privateKeyContent = privateKeyContent.replace("\n", ""); - privateKeyContent = privateKeyContent.replace("\r\n", ""); - privateKey = parsePkcs8PrivateKey(Base64.decodeBase64(privateKeyContent)); - } else { - LogUtil.printErrorLog(ErrorLogs.JWT_INVALID_FORMAT.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.JwtInvalidFormat.getMessage()); - } - return privateKey; - } - - public static String getBaseURL(String url) throws MalformedURLException { - URL parsedUrl = new URL(url); - String protocol = parsedUrl.getProtocol(); - String host = parsedUrl.getHost(); - return String.format("%s://%s", protocol, host); - } - - public static String parameterizedString(String base, String... args) { - for (int index = 0; index < args.length; index++) { - base = base.replace("%s" + (index + 1), args[index]); - } - return base; - } - +public final class Utils extends CommonUtils { public static String constructConnectionURL(ConnectionConfig config, InvokeConnectionRequest invokeConnectionRequest) { StringBuilder filledURL = new StringBuilder(config.getConnectionUrl()); @@ -182,21 +92,4 @@ public static JsonObject getMetrics() { details.addProperty(Constants.SDK_METRIC_CLIENT_OS_DETAILS, osDetails); return details; } - - private static PrivateKey parsePkcs8PrivateKey(byte[] pkcs8Bytes) throws SkyflowException { - KeyFactory keyFactory; - PrivateKey privateKey = null; - try { - PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(pkcs8Bytes); - keyFactory = KeyFactory.getInstance("RSA"); - privateKey = keyFactory.generatePrivate(keySpec); - } catch (NoSuchAlgorithmException e) { - LogUtil.printErrorLog(ErrorLogs.INVALID_ALGORITHM.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidAlgorithm.getMessage()); - } catch (InvalidKeySpecException e) { - LogUtil.printErrorLog(ErrorLogs.INVALID_KEY_SPEC.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidKeySpec.getMessage()); - } - return privateKey; - } } diff --git a/src/main/java/com/skyflow/v2/utils/validations/Validations.java b/src/main/java/com/skyflow/v2/utils/validations/Validations.java index 37a376be..a8655462 100644 --- a/src/main/java/com/skyflow/v2/utils/validations/Validations.java +++ b/src/main/java/com/skyflow/v2/utils/validations/Validations.java @@ -2,19 +2,19 @@ import com.google.gson.Gson; import com.google.gson.JsonObject; -import com.skyflow.v2.config.ConnectionConfig; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.config.VaultConfig; +import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; import com.skyflow.v2.enums.InterfaceName; import com.skyflow.v2.enums.RedactionType; import com.skyflow.v2.enums.TokenMode; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; -import com.skyflow.v2.logs.ErrorLogs; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; +import com.skyflow.common.logs.ErrorLogs; import com.skyflow.v2.utils.Constants; import com.skyflow.v2.utils.Utils; -import com.skyflow.v2.utils.logger.LogUtil; +import com.skyflow.common.logger.LogUtil; import com.skyflow.v2.vault.connection.InvokeConnectionRequest; import com.skyflow.v2.vault.data.*; import com.skyflow.v2.vault.detect.*; @@ -32,31 +32,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -public class Validations { +public class Validations extends com.skyflow.common.utils.Validations { private Validations() { } - public static void validateVaultConfig(VaultConfig vaultConfig) throws SkyflowException { - String vaultId = vaultConfig.getVaultId(); - String clusterId = vaultConfig.getClusterId(); - Credentials credentials = vaultConfig.getCredentials(); - if (vaultId == null) { - LogUtil.printErrorLog(ErrorLogs.VAULT_ID_IS_REQUIRED.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidVaultId.getMessage()); - } else if (vaultId.trim().isEmpty()) { - LogUtil.printErrorLog(ErrorLogs.EMPTY_VAULT_ID.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyVaultId.getMessage()); - } else if (clusterId == null) { - LogUtil.printErrorLog(ErrorLogs.CLUSTER_ID_IS_REQUIRED.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidClusterId.getMessage()); - } else if (clusterId.trim().isEmpty()) { - LogUtil.printErrorLog(ErrorLogs.EMPTY_CLUSTER_ID.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyClusterId.getMessage()); - } else if (credentials != null) { - validateCredentials(credentials); - } - } - public static void validateConnectionConfig(ConnectionConfig connectionConfig) throws SkyflowException { String connectionId = connectionConfig.getConnectionId(); String connectionUrl = connectionConfig.getConnectionUrl(); @@ -147,73 +126,6 @@ public static void validateInvokeConnectionRequest(InvokeConnectionRequest invok } } - public static void validateCredentials(Credentials credentials) throws SkyflowException { - int nonNullMembers = 0; - String path = credentials.getPath(); - String credentialsString = credentials.getCredentialsString(); - String token = credentials.getToken(); - String apiKey = credentials.getApiKey(); - String context = credentials.getContext(); - ArrayList roles = credentials.getRoles(); - - if (path != null) nonNullMembers++; - if (credentialsString != null) nonNullMembers++; - if (token != null) nonNullMembers++; - if (apiKey != null) nonNullMembers++; - - if (nonNullMembers > 1) { - LogUtil.printErrorLog(ErrorLogs.MULTIPLE_TOKEN_GENERATION_MEANS_PASSED.getLog()); - throw new SkyflowException( - ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.MultipleTokenGenerationMeansPassed.getMessage() - ); - } else if (nonNullMembers < 1) { - LogUtil.printErrorLog(ErrorLogs.NO_TOKEN_GENERATION_MEANS_PASSED.getLog()); - throw new SkyflowException( - ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.NoTokenGenerationMeansPassed.getMessage() - ); - } else if (path != null && path.trim().isEmpty()) { - LogUtil.printErrorLog(ErrorLogs.EMPTY_CREDENTIALS_PATH.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyCredentialFilePath.getMessage()); - } else if (credentialsString != null && credentialsString.trim().isEmpty()) { - LogUtil.printErrorLog(ErrorLogs.EMPTY_CREDENTIALS_STRING.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyCredentialsString.getMessage()); - } else if (token != null && token.trim().isEmpty()) { - LogUtil.printErrorLog(ErrorLogs.EMPTY_TOKEN_VALUE.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyToken.getMessage()); - } else if (apiKey != null) { - if (apiKey.trim().isEmpty()) { - LogUtil.printErrorLog(ErrorLogs.EMPTY_API_KEY_VALUE.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyApikey.getMessage()); - } else { - Pattern pattern = Pattern.compile(Constants.API_KEY_REGEX); - Matcher matcher = pattern.matcher(apiKey); - if (!matcher.matches()) { - LogUtil.printErrorLog(ErrorLogs.INVALID_API_KEY.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidApikey.getMessage()); - } - } - } else if (roles != null) { - if (roles.isEmpty()) { - LogUtil.printErrorLog(ErrorLogs.EMPTY_ROLES.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyRoles.getMessage()); - } else { - for (int index = 0; index < roles.size(); index++) { - String role = roles.get(index); - if (role == null || role.trim().isEmpty()) { - LogUtil.printErrorLog(Utils.parameterizedString( - ErrorLogs.EMPTY_OR_NULL_ROLE_IN_ROLES.getLog(), Integer.toString(index) - )); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyRoleInRoles.getMessage()); - } - } - } - } - if (context != null && context.trim().isEmpty()) { - LogUtil.printErrorLog(ErrorLogs.EMPTY_OR_NULL_CONTEXT.getLog()); - throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyContext.getMessage()); - } - } - public static void validateDetokenizeRequest(DetokenizeRequest detokenizeRequest) throws SkyflowException { ArrayList detokenizeData = detokenizeRequest.getDetokenizeData(); if (detokenizeData == null) { diff --git a/src/main/java/com/skyflow/v2/vault/controller/AuditController.java b/src/main/java/com/skyflow/v2/vault/controller/AuditController.java index d9d09c1b..d6ea7bb9 100644 --- a/src/main/java/com/skyflow/v2/vault/controller/AuditController.java +++ b/src/main/java/com/skyflow/v2/vault/controller/AuditController.java @@ -1,6 +1,6 @@ package com.skyflow.v2.vault.controller; -import com.skyflow.v2.generated.rest.ApiClient; +import com.skyflow.common.generated.ApiClient; import com.skyflow.v2.vault.audit.ListEventRequest; import com.skyflow.v2.vault.audit.ListEventResponse; diff --git a/src/main/java/com/skyflow/v2/vault/controller/BinLookupController.java b/src/main/java/com/skyflow/v2/vault/controller/BinLookupController.java index 7a5c2224..0267d0a1 100644 --- a/src/main/java/com/skyflow/v2/vault/controller/BinLookupController.java +++ b/src/main/java/com/skyflow/v2/vault/controller/BinLookupController.java @@ -1,6 +1,6 @@ package com.skyflow.v2.vault.controller; -import com.skyflow.v2.generated.rest.ApiClient; +import com.skyflow.common.generated.ApiClient; import com.skyflow.v2.vault.bin.GetBinRequest; import com.skyflow.v2.vault.bin.GetBinResponse; diff --git a/src/main/java/com/skyflow/v2/vault/controller/ConnectionController.java b/src/main/java/com/skyflow/v2/vault/controller/ConnectionController.java index 3c380962..5587ce91 100644 --- a/src/main/java/com/skyflow/v2/vault/controller/ConnectionController.java +++ b/src/main/java/com/skyflow/v2/vault/controller/ConnectionController.java @@ -5,18 +5,18 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.skyflow.v2.ConnectionClient; -import com.skyflow.v2.config.ConnectionConfig; -import com.skyflow.v2.config.Credentials; +import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.common.config.Credentials; import com.skyflow.v2.enums.RequestMethod; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; -import com.skyflow.v2.logs.ErrorLogs; -import com.skyflow.v2.logs.InfoLogs; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; +import com.skyflow.common.logs.ErrorLogs; +import com.skyflow.common.logs.InfoLogs; import com.skyflow.v2.utils.Constants; import com.skyflow.v2.utils.HttpUtility; import com.skyflow.v2.utils.Utils; -import com.skyflow.v2.utils.logger.LogUtil; +import com.skyflow.common.logger.LogUtil; import com.skyflow.v2.utils.validations.Validations; import com.skyflow.v2.vault.connection.InvokeConnectionRequest; import com.skyflow.v2.vault.connection.InvokeConnectionResponse; diff --git a/src/main/java/com/skyflow/v2/vault/controller/DetectController.java b/src/main/java/com/skyflow/v2/vault/controller/DetectController.java index d6828f2d..9cddee0f 100644 --- a/src/main/java/com/skyflow/v2/vault/controller/DetectController.java +++ b/src/main/java/com/skyflow/v2/vault/controller/DetectController.java @@ -2,21 +2,21 @@ import com.google.gson.*; import com.skyflow.v2.VaultClient; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.config.VaultConfig; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; import com.skyflow.v2.enums.DeidentifyFileStatus; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.resources.files.requests.*; import com.skyflow.v2.generated.rest.resources.strings.requests.DeidentifyStringRequest; import com.skyflow.v2.generated.rest.resources.strings.requests.ReidentifyStringRequest; import com.skyflow.v2.generated.rest.types.*; -import com.skyflow.v2.logs.ErrorLogs; -import com.skyflow.v2.logs.InfoLogs; +import com.skyflow.common.logs.ErrorLogs; +import com.skyflow.common.logs.InfoLogs; import com.skyflow.v2.utils.Constants; -import com.skyflow.v2.utils.logger.LogUtil; +import com.skyflow.common.logger.LogUtil; import com.skyflow.v2.utils.validations.Validations; import com.skyflow.v2.vault.detect.*; import com.skyflow.v2.vault.detect.DeidentifyFileRequest; diff --git a/src/main/java/com/skyflow/v2/vault/controller/VaultController.java b/src/main/java/com/skyflow/v2/vault/controller/VaultController.java index bea9aacb..d6296a87 100644 --- a/src/main/java/com/skyflow/v2/vault/controller/VaultController.java +++ b/src/main/java/com/skyflow/v2/vault/controller/VaultController.java @@ -1,12 +1,13 @@ package com.skyflow.v2.vault.controller; import com.google.gson.*; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.common.logger.LogUtil; import com.skyflow.v2.VaultClient; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.config.VaultConfig; import com.skyflow.v2.enums.RedactionType; -import com.skyflow.v2.errors.SkyflowException; -import com.skyflow.v2.generated.rest.core.ApiClientApiException; +import com.skyflow.common.errors.SkyflowException; +import com.skyflow.common.generated.core.ApiClientApiException; import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse; import com.skyflow.v2.generated.rest.resources.query.requests.QueryServiceExecuteQueryBody; import com.skyflow.v2.generated.rest.resources.records.requests.*; @@ -15,13 +16,13 @@ import com.skyflow.v2.generated.rest.resources.tokens.requests.V1DetokenizePayload; import com.skyflow.v2.generated.rest.resources.tokens.requests.V1TokenizePayload; import com.skyflow.v2.generated.rest.types.*; -import com.skyflow.v2.logs.ErrorLogs; -import com.skyflow.v2.logs.InfoLogs; +import com.skyflow.common.logs.ErrorLogs; +import com.skyflow.common.logs.InfoLogs; import com.skyflow.v2.utils.Constants; -import com.skyflow.v2.utils.logger.LogUtil; import com.skyflow.v2.utils.validations.Validations; import com.skyflow.v2.vault.data.*; import com.skyflow.v2.vault.tokens.*; + import java.util.*; public final class VaultController extends VaultClient { diff --git a/src/main/java/com/skyflow/vaultLH/Skyflow.java b/src/main/java/com/skyflow/vaultLH/Skyflow.java new file mode 100644 index 00000000..7e6ae28e --- /dev/null +++ b/src/main/java/com/skyflow/vaultLH/Skyflow.java @@ -0,0 +1,173 @@ +package com.skyflow.vaultLH; + +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.common.enums.Env; +import com.skyflow.common.enums.LogLevel; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; +import com.skyflow.common.logs.ErrorLogs; +import com.skyflow.common.logs.InfoLogs; +import com.skyflow.common.utils.CommonUtils; +import com.skyflow.common.logger.LogUtil; +import com.skyflow.common.utils.Validations; +import com.skyflow.vaultLH.vault.controller.VaultController; + +import java.util.LinkedHashMap; + +public final class Skyflow { + private final SkyflowClientBuilder builder; + + private Skyflow(SkyflowClientBuilder builder) { + this.builder = builder; + LogUtil.printInfoLog(InfoLogs.CLIENT_INITIALIZED.getLog()); + } + + public static SkyflowClientBuilder builder() { + return new SkyflowClientBuilder(); + } + + public Skyflow addVaultConfig(VaultConfig vaultConfig) throws SkyflowException { + this.builder.addVaultConfig(vaultConfig); + return this; + } + + public VaultConfig getVaultConfig(String vaultId) { + return this.builder.vaultConfigMap.get(vaultId); + } + + public Skyflow updateVaultConfig(VaultConfig vaultConfig) throws SkyflowException { + this.builder.updateVaultConfig(vaultConfig); + return this; + } + + public Skyflow removeVaultConfig(String vaultId) throws SkyflowException { + this.builder.removeVaultConfig(vaultId); + return this; + } + + public Skyflow updateSkyflowCredentials(Credentials credentials) throws SkyflowException { + this.builder.addSkyflowCredentials(credentials); + return this; + } + + public Skyflow updateLogLevel(LogLevel logLevel) { + this.builder.setLogLevel(logLevel); + return this; + } + + public LogLevel getLogLevel() { + return this.builder.logLevel; + } + + public VaultController vault() throws SkyflowException { + Object[] array = this.builder.vaultClientsMap.keySet().toArray(); + if (array.length < 1) { + LogUtil.printErrorLog(ErrorLogs.VAULT_CONFIG_DOES_NOT_EXIST.getLog()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.VaultIdNotInConfigList.getMessage()); + } + String vaultId = (String) array[0]; + return this.vault(vaultId); + } + + public VaultController vault(String vaultId) throws SkyflowException { + VaultController controller = this.builder.vaultClientsMap.get(vaultId); + if (controller == null) { + LogUtil.printErrorLog(ErrorLogs.VAULT_CONFIG_DOES_NOT_EXIST.getLog()); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.VaultIdNotInConfigList.getMessage()); + } + return controller; + } + public static final class SkyflowClientBuilder { + private final LinkedHashMap vaultClientsMap; + private final LinkedHashMap vaultConfigMap; + private Credentials skyflowCredentials; + private LogLevel logLevel; + + public SkyflowClientBuilder() { + this.vaultClientsMap = new LinkedHashMap<>(); + this.vaultConfigMap = new LinkedHashMap<>(); + this.skyflowCredentials = null; + this.logLevel = LogLevel.ERROR; + } + + public SkyflowClientBuilder addVaultConfig(VaultConfig vaultConfig) throws SkyflowException { + LogUtil.printInfoLog(InfoLogs.VALIDATING_VAULT_CONFIG.getLog()); + Validations.validateVaultConfig(vaultConfig); + if (this.vaultClientsMap.containsKey(vaultConfig.getVaultId())) { + LogUtil.printErrorLog(CommonUtils.parameterizedString( + ErrorLogs.VAULT_CONFIG_EXISTS.getLog(), vaultConfig.getVaultId() + )); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), + ErrorMessage.VaultIdAlreadyInConfigList.getMessage()); + } else { + this.vaultConfigMap.put(vaultConfig.getVaultId(), vaultConfig); + this.vaultClientsMap.put(vaultConfig.getVaultId(), new VaultController(vaultConfig, this.skyflowCredentials)); + LogUtil.printInfoLog(CommonUtils.parameterizedString( + InfoLogs.VAULT_CONTROLLER_INITIALIZED.getLog(), vaultConfig.getVaultId())); + LogUtil.printInfoLog(CommonUtils.parameterizedString( + InfoLogs.DETECT_CONTROLLER_INITIALIZED.getLog(), vaultConfig.getVaultId())); + } + return this; + } + + public SkyflowClientBuilder updateVaultConfig(VaultConfig vaultConfig) throws SkyflowException { + LogUtil.printInfoLog(InfoLogs.VALIDATING_VAULT_CONFIG.getLog()); + Validations.validateVaultConfig(vaultConfig); + if (this.vaultClientsMap.containsKey(vaultConfig.getVaultId())) { + VaultConfig updatedConfig = findAndUpdateVaultConfig(vaultConfig); + this.vaultClientsMap.get(updatedConfig.getVaultId()).updateVaultConfig(); + } else { + LogUtil.printErrorLog(CommonUtils.parameterizedString( + ErrorLogs.VAULT_CONFIG_DOES_NOT_EXIST.getLog(), vaultConfig.getVaultId() + )); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.VaultIdNotInConfigList.getMessage()); + } + return this; + } + + public SkyflowClientBuilder removeVaultConfig(String vaultId) throws SkyflowException { + if (this.vaultClientsMap.containsKey(vaultId)) { + this.vaultClientsMap.remove(vaultId); + this.vaultConfigMap.remove(vaultId); + } else { + LogUtil.printErrorLog(CommonUtils.parameterizedString(ErrorLogs.VAULT_CONFIG_DOES_NOT_EXIST.getLog(), vaultId)); + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.VaultIdNotInConfigList.getMessage()); + } + return this; + } + public SkyflowClientBuilder addSkyflowCredentials(Credentials credentials) throws SkyflowException { + Validations.validateCredentials(credentials); + this.skyflowCredentials = credentials; + for (VaultController vault : this.vaultClientsMap.values()) { + vault.setCommonCredentials(this.skyflowCredentials); + } + return this; + } + + public SkyflowClientBuilder setLogLevel(LogLevel logLevel) { + this.logLevel = logLevel == null ? LogLevel.ERROR : logLevel; + LogUtil.setupLogger(this.logLevel); + LogUtil.printInfoLog(CommonUtils.parameterizedString( + InfoLogs.CURRENT_LOG_LEVEL.getLog(), String.valueOf(logLevel) + )); + return this; + } + + public Skyflow build() { + return new Skyflow(this); + } + + private VaultConfig findAndUpdateVaultConfig(VaultConfig vaultConfig) { + VaultConfig previousConfig = this.vaultConfigMap.get(vaultConfig.getVaultId()); + Env env = vaultConfig.getEnv() != null ? vaultConfig.getEnv() : previousConfig.getEnv(); + String clusterId = vaultConfig.getClusterId() != null ? vaultConfig.getClusterId() : previousConfig.getClusterId(); + Credentials credentials = vaultConfig.getCredentials() != null ? vaultConfig.getCredentials() : previousConfig.getCredentials(); + previousConfig.setEnv(env); + previousConfig.setClusterId(clusterId); + previousConfig.setCredentials(credentials); + return previousConfig; + } + } +} diff --git a/src/main/java/com/skyflow/vaultLH/VaultClient.java b/src/main/java/com/skyflow/vaultLH/VaultClient.java new file mode 100644 index 00000000..7a4df5e9 --- /dev/null +++ b/src/main/java/com/skyflow/vaultLH/VaultClient.java @@ -0,0 +1,114 @@ +package com.skyflow.vaultLH; + +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.common.logger.LogUtil; +import com.skyflow.common.serviceaccount.util.Token; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; +import com.skyflow.vaultLH.generated.ApiClient; +import com.skyflow.vaultLH.generated.ApiClientBuilder; +import com.skyflow.common.logs.InfoLogs; +import com.skyflow.common.utils.Constants; +import com.skyflow.common.utils.CommonUtils; +import com.skyflow.common.utils.Validations; +import io.github.cdimascio.dotenv.Dotenv; +import io.github.cdimascio.dotenv.DotenvException; + + +public class VaultClient { + private final VaultConfig vaultConfig; + private final ApiClientBuilder apiClientBuilder; + private ApiClient apiClient; + private Credentials commonCredentials; + private Credentials finalCredentials; + private String token; + private String apiKey; + + protected VaultClient(VaultConfig vaultConfig, Credentials credentials) { + super(); + this.vaultConfig = vaultConfig; + this.commonCredentials = credentials; + this.apiClientBuilder = new ApiClientBuilder(); + this.apiClient = null; + updateVaultURL(); + } + +// protected RecordsClient getRecordsApi() { +// return this.apiClient.records(); +// } +// +// protected TokensClient getTokensApi() { +// return this.apiClient.tokens(); +// } +// +// protected QueryClient getQueryApi() { +// return this.apiClient.query(); +// } + + protected VaultConfig getVaultConfig() { + return vaultConfig; + } + + protected void setCommonCredentials(Credentials commonCredentials) throws SkyflowException { + this.commonCredentials = commonCredentials; + prioritiseCredentials(); + } + + protected void updateVaultConfig() throws SkyflowException { + updateVaultURL(); + prioritiseCredentials(); + } + + protected void setBearerToken() throws SkyflowException { + prioritiseCredentials(); + Validations.validateCredentials(this.finalCredentials); + if (this.finalCredentials.getApiKey() != null) { + LogUtil.printInfoLog(InfoLogs.REUSE_API_KEY.getLog()); + token=this.finalCredentials.getApiKey(); + } else if (Token.isExpired(token)) { + LogUtil.printInfoLog(InfoLogs.BEARER_TOKEN_EXPIRED.getLog()); + token = CommonUtils.generateBearerToken(this.finalCredentials); + } else { + LogUtil.printInfoLog(InfoLogs.REUSE_BEARER_TOKEN.getLog()); + } +// this.apiClientBuilder.token(token); + this.apiClient = this.apiClientBuilder.build(); + } + + private void updateVaultURL() { + String vaultURL = CommonUtils.getVaultURL(this.vaultConfig.getClusterId(), this.vaultConfig.getEnv()); + this.apiClientBuilder.url(vaultURL); + } + + private void prioritiseCredentials() throws SkyflowException { + try { + Credentials original = this.finalCredentials; + if (this.vaultConfig.getCredentials() != null) { + this.finalCredentials = this.vaultConfig.getCredentials(); + } else if (this.commonCredentials != null) { + this.finalCredentials = this.commonCredentials; + } else { + Dotenv dotenv = Dotenv.load(); + String sysCredentials = dotenv.get(Constants.ENV_CREDENTIALS_KEY_NAME); + if (sysCredentials == null) { + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), + ErrorMessage.EmptyCredentials.getMessage()); + } else { + this.finalCredentials = new Credentials(); + this.finalCredentials.setCredentialsString(sysCredentials); + } + } + if (original != null && !original.equals(this.finalCredentials)) { + token = null; + apiKey = null; + } + } catch (DotenvException e) { + throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), + ErrorMessage.EmptyCredentials.getMessage()); + } catch (Exception e) { + throw new RuntimeException(e); + } + } +} diff --git a/src/main/java/com/skyflow/vaultLH/enums/Enums.java b/src/main/java/com/skyflow/vaultLH/enums/Enums.java new file mode 100644 index 00000000..844bad66 --- /dev/null +++ b/src/main/java/com/skyflow/vaultLH/enums/Enums.java @@ -0,0 +1,4 @@ +package com.skyflow.vaultLH.enums; + +public class Enums { +} diff --git a/src/main/java/com/skyflow/vaultLH/ApiClient.java b/src/main/java/com/skyflow/vaultLH/generated/ApiClient.java similarity index 74% rename from src/main/java/com/skyflow/vaultLH/ApiClient.java rename to src/main/java/com/skyflow/vaultLH/generated/ApiClient.java index 1dfad6d2..590162e1 100644 --- a/src/main/java/com/skyflow/vaultLH/ApiClient.java +++ b/src/main/java/com/skyflow/vaultLH/generated/ApiClient.java @@ -1,11 +1,11 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH; +package com.skyflow.vaultLH.generated; -import com.skyflow.vaultLH.core.ClientOptions; -import com.skyflow.vaultLH.core.Suppliers; -import com.skyflow.vaultLH.resources.recordservice.RecordserviceClient; +import com.skyflow.vaultLH.generated.core.ClientOptions; +import com.skyflow.vaultLH.generated.core.Suppliers; +import com.skyflow.vaultLH.generated.resources.recordservice.RecordserviceClient; import java.util.function.Supplier; public class ApiClient { diff --git a/src/main/java/com/skyflow/vaultLH/ApiClientBuilder.java b/src/main/java/com/skyflow/vaultLH/generated/ApiClientBuilder.java similarity index 88% rename from src/main/java/com/skyflow/vaultLH/ApiClientBuilder.java rename to src/main/java/com/skyflow/vaultLH/generated/ApiClientBuilder.java index 143854e7..6da4bb23 100644 --- a/src/main/java/com/skyflow/vaultLH/ApiClientBuilder.java +++ b/src/main/java/com/skyflow/vaultLH/generated/ApiClientBuilder.java @@ -1,10 +1,10 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH; +package com.skyflow.vaultLH.generated; -import com.skyflow.vaultLH.core.ClientOptions; -import com.skyflow.vaultLH.core.Environment; +import com.skyflow.vaultLH.generated.core.ClientOptions; +import com.skyflow.vaultLH.generated.core.Environment; import okhttp3.OkHttpClient; public final class ApiClientBuilder { diff --git a/src/main/java/com/skyflow/vaultLH/AsyncApiClient.java b/src/main/java/com/skyflow/vaultLH/generated/AsyncApiClient.java similarity index 74% rename from src/main/java/com/skyflow/vaultLH/AsyncApiClient.java rename to src/main/java/com/skyflow/vaultLH/generated/AsyncApiClient.java index d68b08cf..75a21ee6 100644 --- a/src/main/java/com/skyflow/vaultLH/AsyncApiClient.java +++ b/src/main/java/com/skyflow/vaultLH/generated/AsyncApiClient.java @@ -1,11 +1,11 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH; +package com.skyflow.vaultLH.generated; -import com.skyflow.vaultLH.core.ClientOptions; -import com.skyflow.vaultLH.core.Suppliers; -import com.skyflow.vaultLH.resources.recordservice.AsyncRecordserviceClient; +import com.skyflow.vaultLH.generated.core.ClientOptions; +import com.skyflow.vaultLH.generated.core.Suppliers; +import com.skyflow.vaultLH.generated.resources.recordservice.AsyncRecordserviceClient; import java.util.function.Supplier; public class AsyncApiClient { diff --git a/src/main/java/com/skyflow/vaultLH/AsyncApiClientBuilder.java b/src/main/java/com/skyflow/vaultLH/generated/AsyncApiClientBuilder.java similarity index 89% rename from src/main/java/com/skyflow/vaultLH/AsyncApiClientBuilder.java rename to src/main/java/com/skyflow/vaultLH/generated/AsyncApiClientBuilder.java index 2c3117a7..fb3d1841 100644 --- a/src/main/java/com/skyflow/vaultLH/AsyncApiClientBuilder.java +++ b/src/main/java/com/skyflow/vaultLH/generated/AsyncApiClientBuilder.java @@ -1,10 +1,10 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH; +package com.skyflow.vaultLH.generated; -import com.skyflow.vaultLH.core.ClientOptions; -import com.skyflow.vaultLH.core.Environment; +import com.skyflow.vaultLH.generated.core.ClientOptions; +import com.skyflow.vaultLH.generated.core.Environment; import okhttp3.OkHttpClient; public final class AsyncApiClientBuilder { diff --git a/src/main/java/com/skyflow/v2/generated/rest/core/ApiClientApiException.java b/src/main/java/com/skyflow/vaultLH/generated/core/ApiClientApiException.java similarity index 97% rename from src/main/java/com/skyflow/v2/generated/rest/core/ApiClientApiException.java rename to src/main/java/com/skyflow/vaultLH/generated/core/ApiClientApiException.java index 893b8c95..cbb77ff8 100644 --- a/src/main/java/com/skyflow/v2/generated/rest/core/ApiClientApiException.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/ApiClientApiException.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.v2.generated.rest.core; +package com.skyflow.vaultLH.generated.core; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/skyflow/vaultLH/core/ApiClientException.java b/src/main/java/com/skyflow/vaultLH/generated/core/ApiClientException.java similarity index 89% rename from src/main/java/com/skyflow/vaultLH/core/ApiClientException.java rename to src/main/java/com/skyflow/vaultLH/generated/core/ApiClientException.java index 4e108d3f..325f6fe8 100644 --- a/src/main/java/com/skyflow/vaultLH/core/ApiClientException.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/ApiClientException.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; /** * This class serves as the base exception for all errors in the SDK. diff --git a/src/main/java/com/skyflow/vaultLH/core/ApiClientHttpResponse.java b/src/main/java/com/skyflow/vaultLH/generated/core/ApiClientHttpResponse.java similarity index 95% rename from src/main/java/com/skyflow/vaultLH/core/ApiClientHttpResponse.java rename to src/main/java/com/skyflow/vaultLH/generated/core/ApiClientHttpResponse.java index 62ce1d80..025342eb 100644 --- a/src/main/java/com/skyflow/vaultLH/core/ApiClientHttpResponse.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/ApiClientHttpResponse.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/skyflow/vaultLH/core/ClientOptions.java b/src/main/java/com/skyflow/vaultLH/generated/core/ClientOptions.java similarity index 99% rename from src/main/java/com/skyflow/vaultLH/core/ClientOptions.java rename to src/main/java/com/skyflow/vaultLH/generated/core/ClientOptions.java index 4130d991..fad4d83e 100644 --- a/src/main/java/com/skyflow/vaultLH/core/ClientOptions.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/ClientOptions.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/core/DateTimeDeserializer.java b/src/main/java/com/skyflow/vaultLH/generated/core/DateTimeDeserializer.java similarity index 97% rename from src/main/java/com/skyflow/vaultLH/core/DateTimeDeserializer.java rename to src/main/java/com/skyflow/vaultLH/generated/core/DateTimeDeserializer.java index 4e94768e..ad299c1d 100644 --- a/src/main/java/com/skyflow/vaultLH/core/DateTimeDeserializer.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/DateTimeDeserializer.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; diff --git a/src/main/java/com/skyflow/vaultLH/core/Environment.java b/src/main/java/com/skyflow/vaultLH/generated/core/Environment.java similarity index 89% rename from src/main/java/com/skyflow/vaultLH/core/Environment.java rename to src/main/java/com/skyflow/vaultLH/generated/core/Environment.java index 2b6492f1..09d00c69 100644 --- a/src/main/java/com/skyflow/vaultLH/core/Environment.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/Environment.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; public final class Environment { private final String url; diff --git a/src/main/java/com/skyflow/vaultLH/core/FileStream.java b/src/main/java/com/skyflow/vaultLH/generated/core/FileStream.java similarity index 97% rename from src/main/java/com/skyflow/vaultLH/core/FileStream.java rename to src/main/java/com/skyflow/vaultLH/generated/core/FileStream.java index 65a770d9..1ba61bcf 100644 --- a/src/main/java/com/skyflow/vaultLH/core/FileStream.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/FileStream.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; import java.io.InputStream; import java.util.Objects; diff --git a/src/main/java/com/skyflow/vaultLH/core/InputStreamRequestBody.java b/src/main/java/com/skyflow/vaultLH/generated/core/InputStreamRequestBody.java similarity index 98% rename from src/main/java/com/skyflow/vaultLH/core/InputStreamRequestBody.java rename to src/main/java/com/skyflow/vaultLH/generated/core/InputStreamRequestBody.java index c49f2006..842522c9 100644 --- a/src/main/java/com/skyflow/vaultLH/core/InputStreamRequestBody.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/InputStreamRequestBody.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/skyflow/vaultLH/core/MediaTypes.java b/src/main/java/com/skyflow/vaultLH/generated/core/MediaTypes.java similarity index 85% rename from src/main/java/com/skyflow/vaultLH/core/MediaTypes.java rename to src/main/java/com/skyflow/vaultLH/generated/core/MediaTypes.java index 9f30207c..a7ca4760 100644 --- a/src/main/java/com/skyflow/vaultLH/core/MediaTypes.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/MediaTypes.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; import okhttp3.MediaType; diff --git a/src/main/java/com/skyflow/vaultLH/core/Nullable.java b/src/main/java/com/skyflow/vaultLH/generated/core/Nullable.java similarity index 98% rename from src/main/java/com/skyflow/vaultLH/core/Nullable.java rename to src/main/java/com/skyflow/vaultLH/generated/core/Nullable.java index e5e4d5b3..64bdcdd9 100644 --- a/src/main/java/com/skyflow/vaultLH/core/Nullable.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/Nullable.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; import java.util.Optional; import java.util.function.Function; diff --git a/src/main/java/com/skyflow/vaultLH/core/NullableNonemptyFilter.java b/src/main/java/com/skyflow/vaultLH/generated/core/NullableNonemptyFilter.java similarity index 90% rename from src/main/java/com/skyflow/vaultLH/core/NullableNonemptyFilter.java rename to src/main/java/com/skyflow/vaultLH/generated/core/NullableNonemptyFilter.java index e1cc5eb3..0667d417 100644 --- a/src/main/java/com/skyflow/vaultLH/core/NullableNonemptyFilter.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/NullableNonemptyFilter.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; import java.util.Optional; diff --git a/src/main/java/com/skyflow/vaultLH/core/ObjectMappers.java b/src/main/java/com/skyflow/vaultLH/generated/core/ObjectMappers.java similarity index 96% rename from src/main/java/com/skyflow/vaultLH/core/ObjectMappers.java rename to src/main/java/com/skyflow/vaultLH/generated/core/ObjectMappers.java index fcf25988..a097fe74 100644 --- a/src/main/java/com/skyflow/vaultLH/core/ObjectMappers.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/ObjectMappers.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/src/main/java/com/skyflow/vaultLH/core/QueryStringMapper.java b/src/main/java/com/skyflow/vaultLH/generated/core/QueryStringMapper.java similarity index 99% rename from src/main/java/com/skyflow/vaultLH/core/QueryStringMapper.java rename to src/main/java/com/skyflow/vaultLH/generated/core/QueryStringMapper.java index 400b2e61..e8715dac 100644 --- a/src/main/java/com/skyflow/vaultLH/core/QueryStringMapper.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/QueryStringMapper.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/com/skyflow/vaultLH/core/RequestOptions.java b/src/main/java/com/skyflow/vaultLH/generated/core/RequestOptions.java similarity index 98% rename from src/main/java/com/skyflow/vaultLH/core/RequestOptions.java rename to src/main/java/com/skyflow/vaultLH/generated/core/RequestOptions.java index 3dd2c6d9..9ccde370 100644 --- a/src/main/java/com/skyflow/vaultLH/core/RequestOptions.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/RequestOptions.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/core/ResponseBodyInputStream.java b/src/main/java/com/skyflow/vaultLH/generated/core/ResponseBodyInputStream.java similarity index 97% rename from src/main/java/com/skyflow/vaultLH/core/ResponseBodyInputStream.java rename to src/main/java/com/skyflow/vaultLH/generated/core/ResponseBodyInputStream.java index 50033769..b9424b0e 100644 --- a/src/main/java/com/skyflow/vaultLH/core/ResponseBodyInputStream.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/ResponseBodyInputStream.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; import java.io.FilterInputStream; import java.io.IOException; diff --git a/src/main/java/com/skyflow/vaultLH/core/ResponseBodyReader.java b/src/main/java/com/skyflow/vaultLH/generated/core/ResponseBodyReader.java similarity index 97% rename from src/main/java/com/skyflow/vaultLH/core/ResponseBodyReader.java rename to src/main/java/com/skyflow/vaultLH/generated/core/ResponseBodyReader.java index 35f63c87..514e9cc2 100644 --- a/src/main/java/com/skyflow/vaultLH/core/ResponseBodyReader.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/ResponseBodyReader.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; import java.io.FilterReader; import java.io.IOException; diff --git a/src/main/java/com/skyflow/vaultLH/core/RetryInterceptor.java b/src/main/java/com/skyflow/vaultLH/generated/core/RetryInterceptor.java similarity index 98% rename from src/main/java/com/skyflow/vaultLH/core/RetryInterceptor.java rename to src/main/java/com/skyflow/vaultLH/generated/core/RetryInterceptor.java index 58f2f80f..8c8a673d 100644 --- a/src/main/java/com/skyflow/vaultLH/core/RetryInterceptor.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/RetryInterceptor.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; import java.io.IOException; import java.time.Duration; diff --git a/src/main/java/com/skyflow/vaultLH/core/Stream.java b/src/main/java/com/skyflow/vaultLH/generated/core/Stream.java similarity index 98% rename from src/main/java/com/skyflow/vaultLH/core/Stream.java rename to src/main/java/com/skyflow/vaultLH/generated/core/Stream.java index 3b6225b8..63b2e566 100644 --- a/src/main/java/com/skyflow/vaultLH/core/Stream.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/Stream.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; import java.io.Reader; import java.util.Iterator; diff --git a/src/main/java/com/skyflow/vaultLH/core/Suppliers.java b/src/main/java/com/skyflow/vaultLH/generated/core/Suppliers.java similarity index 93% rename from src/main/java/com/skyflow/vaultLH/core/Suppliers.java rename to src/main/java/com/skyflow/vaultLH/generated/core/Suppliers.java index cb921e80..17955971 100644 --- a/src/main/java/com/skyflow/vaultLH/core/Suppliers.java +++ b/src/main/java/com/skyflow/vaultLH/generated/core/Suppliers.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.core; +package com.skyflow.vaultLH.generated.core; import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/com/skyflow/vaultLH/resources/recordservice/AsyncRawRecordserviceClient.java b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/AsyncRawRecordserviceClient.java similarity index 94% rename from src/main/java/com/skyflow/vaultLH/resources/recordservice/AsyncRawRecordserviceClient.java rename to src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/AsyncRawRecordserviceClient.java index 37154b2d..1bf3a9ed 100644 --- a/src/main/java/com/skyflow/vaultLH/resources/recordservice/AsyncRawRecordserviceClient.java +++ b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/AsyncRawRecordserviceClient.java @@ -1,32 +1,32 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.resources.recordservice; +package com.skyflow.vaultLH.generated.resources.recordservice; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.vaultLH.core.ApiClientApiException; -import com.skyflow.vaultLH.core.ApiClientException; -import com.skyflow.vaultLH.core.ApiClientHttpResponse; -import com.skyflow.vaultLH.core.ClientOptions; -import com.skyflow.vaultLH.core.MediaTypes; -import com.skyflow.vaultLH.core.ObjectMappers; -import com.skyflow.vaultLH.core.RequestOptions; -import com.skyflow.vaultLH.resources.recordservice.requests.DeleteRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.DeleteTokenRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.DetokenizeRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.ExecuteQueryRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.GetRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.InsertRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.TokenizeRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.UpdateRequest; -import com.skyflow.vaultLH.types.DeleteResponse; -import com.skyflow.vaultLH.types.DeleteTokenResponse; -import com.skyflow.vaultLH.types.DetokenizeResponse; -import com.skyflow.vaultLH.types.ExecuteQueryResponse; -import com.skyflow.vaultLH.types.GetResponse; -import com.skyflow.vaultLH.types.InsertResponse; -import com.skyflow.vaultLH.types.TokenizeResponse; -import com.skyflow.vaultLH.types.UpdateResponse; +import com.skyflow.vaultLH.generated.core.ApiClientApiException; +import com.skyflow.vaultLH.generated.core.ApiClientException; +import com.skyflow.vaultLH.generated.core.ApiClientHttpResponse; +import com.skyflow.vaultLH.generated.core.ClientOptions; +import com.skyflow.vaultLH.generated.core.MediaTypes; +import com.skyflow.vaultLH.generated.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.RequestOptions; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.DeleteRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.DeleteTokenRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.DetokenizeRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.ExecuteQueryRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.GetRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.InsertRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.TokenizeRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.UpdateRequest; +import com.skyflow.vaultLH.generated.types.DeleteResponse; +import com.skyflow.vaultLH.generated.types.DeleteTokenResponse; +import com.skyflow.vaultLH.generated.types.DetokenizeResponse; +import com.skyflow.vaultLH.generated.types.ExecuteQueryResponse; +import com.skyflow.vaultLH.generated.types.GetResponse; +import com.skyflow.vaultLH.generated.types.InsertResponse; +import com.skyflow.vaultLH.generated.types.TokenizeResponse; +import com.skyflow.vaultLH.generated.types.UpdateResponse; import java.io.IOException; import java.util.concurrent.CompletableFuture; import okhttp3.Call; diff --git a/src/main/java/com/skyflow/vaultLH/resources/recordservice/AsyncRecordserviceClient.java b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/AsyncRecordserviceClient.java similarity index 79% rename from src/main/java/com/skyflow/vaultLH/resources/recordservice/AsyncRecordserviceClient.java rename to src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/AsyncRecordserviceClient.java index c9554133..f7459aaf 100644 --- a/src/main/java/com/skyflow/vaultLH/resources/recordservice/AsyncRecordserviceClient.java +++ b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/AsyncRecordserviceClient.java @@ -1,26 +1,26 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.resources.recordservice; - -import com.skyflow.vaultLH.core.ClientOptions; -import com.skyflow.vaultLH.core.RequestOptions; -import com.skyflow.vaultLH.resources.recordservice.requests.DeleteRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.DeleteTokenRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.DetokenizeRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.ExecuteQueryRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.GetRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.InsertRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.TokenizeRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.UpdateRequest; -import com.skyflow.vaultLH.types.DeleteResponse; -import com.skyflow.vaultLH.types.DeleteTokenResponse; -import com.skyflow.vaultLH.types.DetokenizeResponse; -import com.skyflow.vaultLH.types.ExecuteQueryResponse; -import com.skyflow.vaultLH.types.GetResponse; -import com.skyflow.vaultLH.types.InsertResponse; -import com.skyflow.vaultLH.types.TokenizeResponse; -import com.skyflow.vaultLH.types.UpdateResponse; +package com.skyflow.vaultLH.generated.resources.recordservice; + +import com.skyflow.vaultLH.generated.core.ClientOptions; +import com.skyflow.vaultLH.generated.core.RequestOptions; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.DeleteRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.DeleteTokenRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.DetokenizeRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.ExecuteQueryRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.GetRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.InsertRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.TokenizeRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.UpdateRequest; +import com.skyflow.vaultLH.generated.types.DeleteResponse; +import com.skyflow.vaultLH.generated.types.DeleteTokenResponse; +import com.skyflow.vaultLH.generated.types.DetokenizeResponse; +import com.skyflow.vaultLH.generated.types.ExecuteQueryResponse; +import com.skyflow.vaultLH.generated.types.GetResponse; +import com.skyflow.vaultLH.generated.types.InsertResponse; +import com.skyflow.vaultLH.generated.types.TokenizeResponse; +import com.skyflow.vaultLH.generated.types.UpdateResponse; import java.util.concurrent.CompletableFuture; public class AsyncRecordserviceClient { diff --git a/src/main/java/com/skyflow/vaultLH/resources/recordservice/RawRecordserviceClient.java b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/RawRecordserviceClient.java similarity index 92% rename from src/main/java/com/skyflow/vaultLH/resources/recordservice/RawRecordserviceClient.java rename to src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/RawRecordserviceClient.java index 307e6157..173b1696 100644 --- a/src/main/java/com/skyflow/vaultLH/resources/recordservice/RawRecordserviceClient.java +++ b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/RawRecordserviceClient.java @@ -1,32 +1,32 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.resources.recordservice; +package com.skyflow.vaultLH.generated.resources.recordservice; import com.fasterxml.jackson.core.JsonProcessingException; -import com.skyflow.vaultLH.core.ApiClientApiException; -import com.skyflow.vaultLH.core.ApiClientException; -import com.skyflow.vaultLH.core.ApiClientHttpResponse; -import com.skyflow.vaultLH.core.ClientOptions; -import com.skyflow.vaultLH.core.MediaTypes; -import com.skyflow.vaultLH.core.ObjectMappers; -import com.skyflow.vaultLH.core.RequestOptions; -import com.skyflow.vaultLH.resources.recordservice.requests.DeleteRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.DeleteTokenRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.DetokenizeRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.ExecuteQueryRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.GetRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.InsertRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.TokenizeRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.UpdateRequest; -import com.skyflow.vaultLH.types.DeleteResponse; -import com.skyflow.vaultLH.types.DeleteTokenResponse; -import com.skyflow.vaultLH.types.DetokenizeResponse; -import com.skyflow.vaultLH.types.ExecuteQueryResponse; -import com.skyflow.vaultLH.types.GetResponse; -import com.skyflow.vaultLH.types.InsertResponse; -import com.skyflow.vaultLH.types.TokenizeResponse; -import com.skyflow.vaultLH.types.UpdateResponse; +import com.skyflow.vaultLH.generated.core.ApiClientApiException; +import com.skyflow.vaultLH.generated.core.ApiClientException; +import com.skyflow.vaultLH.generated.core.ApiClientHttpResponse; +import com.skyflow.vaultLH.generated.core.ClientOptions; +import com.skyflow.vaultLH.generated.core.MediaTypes; +import com.skyflow.vaultLH.generated.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.RequestOptions; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.DeleteRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.DeleteTokenRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.DetokenizeRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.ExecuteQueryRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.GetRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.InsertRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.TokenizeRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.UpdateRequest; +import com.skyflow.vaultLH.generated.types.DeleteResponse; +import com.skyflow.vaultLH.generated.types.DeleteTokenResponse; +import com.skyflow.vaultLH.generated.types.DetokenizeResponse; +import com.skyflow.vaultLH.generated.types.ExecuteQueryResponse; +import com.skyflow.vaultLH.generated.types.GetResponse; +import com.skyflow.vaultLH.generated.types.InsertResponse; +import com.skyflow.vaultLH.generated.types.TokenizeResponse; +import com.skyflow.vaultLH.generated.types.UpdateResponse; import java.io.IOException; import okhttp3.Headers; import okhttp3.HttpUrl; diff --git a/src/main/java/com/skyflow/vaultLH/resources/recordservice/RecordserviceClient.java b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/RecordserviceClient.java similarity index 74% rename from src/main/java/com/skyflow/vaultLH/resources/recordservice/RecordserviceClient.java rename to src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/RecordserviceClient.java index 3861a8be..51cd656d 100644 --- a/src/main/java/com/skyflow/vaultLH/resources/recordservice/RecordserviceClient.java +++ b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/RecordserviceClient.java @@ -1,26 +1,26 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.resources.recordservice; - -import com.skyflow.vaultLH.core.ClientOptions; -import com.skyflow.vaultLH.core.RequestOptions; -import com.skyflow.vaultLH.resources.recordservice.requests.DeleteRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.DeleteTokenRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.DetokenizeRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.ExecuteQueryRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.GetRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.InsertRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.TokenizeRequest; -import com.skyflow.vaultLH.resources.recordservice.requests.UpdateRequest; -import com.skyflow.vaultLH.types.DeleteResponse; -import com.skyflow.vaultLH.types.DeleteTokenResponse; -import com.skyflow.vaultLH.types.DetokenizeResponse; -import com.skyflow.vaultLH.types.ExecuteQueryResponse; -import com.skyflow.vaultLH.types.GetResponse; -import com.skyflow.vaultLH.types.InsertResponse; -import com.skyflow.vaultLH.types.TokenizeResponse; -import com.skyflow.vaultLH.types.UpdateResponse; +package com.skyflow.vaultLH.generated.resources.recordservice; + +import com.skyflow.vaultLH.generated.core.ClientOptions; +import com.skyflow.vaultLH.generated.core.RequestOptions; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.DeleteRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.DeleteTokenRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.DetokenizeRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.ExecuteQueryRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.GetRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.InsertRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.TokenizeRequest; +import com.skyflow.vaultLH.generated.resources.recordservice.requests.UpdateRequest; +import com.skyflow.vaultLH.generated.types.DeleteResponse; +import com.skyflow.vaultLH.generated.types.DeleteTokenResponse; +import com.skyflow.vaultLH.generated.types.DetokenizeResponse; +import com.skyflow.vaultLH.generated.types.ExecuteQueryResponse; +import com.skyflow.vaultLH.generated.types.GetResponse; +import com.skyflow.vaultLH.generated.types.InsertResponse; +import com.skyflow.vaultLH.generated.types.TokenizeResponse; +import com.skyflow.vaultLH.generated.types.UpdateResponse; public class RecordserviceClient { protected final ClientOptions clientOptions; diff --git a/src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/DeleteRequest.java b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/DeleteRequest.java similarity index 97% rename from src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/DeleteRequest.java rename to src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/DeleteRequest.java index 192fd8a0..04c12a73 100644 --- a/src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/DeleteRequest.java +++ b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/DeleteRequest.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.resources.recordservice.requests; +package com.skyflow.vaultLH.generated.resources.recordservice.requests; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/DeleteTokenRequest.java b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/DeleteTokenRequest.java similarity index 96% rename from src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/DeleteTokenRequest.java rename to src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/DeleteTokenRequest.java index 18098042..30c2c16c 100644 --- a/src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/DeleteTokenRequest.java +++ b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/DeleteTokenRequest.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.resources.recordservice.requests; +package com.skyflow.vaultLH.generated.resources.recordservice.requests; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/DetokenizeRequest.java b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/DetokenizeRequest.java similarity index 96% rename from src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/DetokenizeRequest.java rename to src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/DetokenizeRequest.java index e17d6a0a..7b4684b0 100644 --- a/src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/DetokenizeRequest.java +++ b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/DetokenizeRequest.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.resources.recordservice.requests; +package com.skyflow.vaultLH.generated.resources.recordservice.requests; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,8 +11,8 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; -import com.skyflow.vaultLH.types.TokenGroupRedactions; +import com.skyflow.vaultLH.generated.core.ObjectMappers; +import com.skyflow.vaultLH.generated.types.TokenGroupRedactions; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/ExecuteQueryRequest.java b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/ExecuteQueryRequest.java similarity index 96% rename from src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/ExecuteQueryRequest.java rename to src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/ExecuteQueryRequest.java index 7449600e..1629ca63 100644 --- a/src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/ExecuteQueryRequest.java +++ b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/ExecuteQueryRequest.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.resources.recordservice.requests; +package com.skyflow.vaultLH.generated.resources.recordservice.requests; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/GetRequest.java b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/GetRequest.java similarity index 97% rename from src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/GetRequest.java rename to src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/GetRequest.java index 14220ee0..f2ee7e4c 100644 --- a/src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/GetRequest.java +++ b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/GetRequest.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.resources.recordservice.requests; +package com.skyflow.vaultLH.generated.resources.recordservice.requests; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,8 +11,8 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; -import com.skyflow.vaultLH.types.ColumnRedactions; +import com.skyflow.vaultLH.generated.core.ObjectMappers; +import com.skyflow.vaultLH.generated.types.ColumnRedactions; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/InsertRequest.java b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/InsertRequest.java similarity index 95% rename from src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/InsertRequest.java rename to src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/InsertRequest.java index 5ffbad6e..74ffa08f 100644 --- a/src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/InsertRequest.java +++ b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/InsertRequest.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.resources.recordservice.requests; +package com.skyflow.vaultLH.generated.resources.recordservice.requests; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,9 +11,9 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; -import com.skyflow.vaultLH.types.InsertRecordData; -import com.skyflow.vaultLH.types.Upsert; +import com.skyflow.vaultLH.generated.core.ObjectMappers; +import com.skyflow.vaultLH.generated.types.InsertRecordData; +import com.skyflow.vaultLH.generated.types.Upsert; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/TokenizeRequest.java b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/TokenizeRequest.java similarity index 95% rename from src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/TokenizeRequest.java rename to src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/TokenizeRequest.java index d15d5806..51136ab7 100644 --- a/src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/TokenizeRequest.java +++ b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/TokenizeRequest.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.resources.recordservice.requests; +package com.skyflow.vaultLH.generated.resources.recordservice.requests; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,8 +11,8 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; -import com.skyflow.vaultLH.types.TokenizeRequestObject; +import com.skyflow.vaultLH.generated.core.ObjectMappers; +import com.skyflow.vaultLH.generated.types.TokenizeRequestObject; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/UpdateRequest.java b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/UpdateRequest.java similarity index 95% rename from src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/UpdateRequest.java rename to src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/UpdateRequest.java index 667e19c4..e1cb561e 100644 --- a/src/main/java/com/skyflow/vaultLH/resources/recordservice/requests/UpdateRequest.java +++ b/src/main/java/com/skyflow/vaultLH/generated/resources/recordservice/requests/UpdateRequest.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.resources.recordservice.requests; +package com.skyflow.vaultLH.generated.resources.recordservice.requests; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,9 +11,9 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; -import com.skyflow.vaultLH.types.EnumUpdateType; -import com.skyflow.vaultLH.types.UpdateRecordData; +import com.skyflow.vaultLH.generated.core.ObjectMappers; +import com.skyflow.vaultLH.generated.types.EnumUpdateType; +import com.skyflow.vaultLH.generated.types.UpdateRecordData; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/types/ColumnRedactions.java b/src/main/java/com/skyflow/vaultLH/generated/types/ColumnRedactions.java similarity index 97% rename from src/main/java/com/skyflow/vaultLH/types/ColumnRedactions.java rename to src/main/java/com/skyflow/vaultLH/generated/types/ColumnRedactions.java index cacc377b..75a942e7 100644 --- a/src/main/java/com/skyflow/vaultLH/types/ColumnRedactions.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/ColumnRedactions.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/skyflow/vaultLH/types/DeleteResponse.java b/src/main/java/com/skyflow/vaultLH/generated/types/DeleteResponse.java similarity index 96% rename from src/main/java/com/skyflow/vaultLH/types/DeleteResponse.java rename to src/main/java/com/skyflow/vaultLH/generated/types/DeleteResponse.java index ee218c8f..230ce5bb 100644 --- a/src/main/java/com/skyflow/vaultLH/types/DeleteResponse.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/DeleteResponse.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/types/DeleteResponseObject.java b/src/main/java/com/skyflow/vaultLH/generated/types/DeleteResponseObject.java similarity index 97% rename from src/main/java/com/skyflow/vaultLH/types/DeleteResponseObject.java rename to src/main/java/com/skyflow/vaultLH/generated/types/DeleteResponseObject.java index 0ffef2c5..f0d5d87b 100644 --- a/src/main/java/com/skyflow/vaultLH/types/DeleteResponseObject.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/DeleteResponseObject.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/skyflow/vaultLH/types/DeleteTokenResponse.java b/src/main/java/com/skyflow/vaultLH/generated/types/DeleteTokenResponse.java similarity index 96% rename from src/main/java/com/skyflow/vaultLH/types/DeleteTokenResponse.java rename to src/main/java/com/skyflow/vaultLH/generated/types/DeleteTokenResponse.java index 70159199..13766fc4 100644 --- a/src/main/java/com/skyflow/vaultLH/types/DeleteTokenResponse.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/DeleteTokenResponse.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/types/DeleteTokenResponseObject.java b/src/main/java/com/skyflow/vaultLH/generated/types/DeleteTokenResponseObject.java similarity index 97% rename from src/main/java/com/skyflow/vaultLH/types/DeleteTokenResponseObject.java rename to src/main/java/com/skyflow/vaultLH/generated/types/DeleteTokenResponseObject.java index 256b35f7..17a0b0c9 100644 --- a/src/main/java/com/skyflow/vaultLH/types/DeleteTokenResponseObject.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/DeleteTokenResponseObject.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/skyflow/vaultLH/types/DetokenizeResponse.java b/src/main/java/com/skyflow/vaultLH/generated/types/DetokenizeResponse.java similarity index 96% rename from src/main/java/com/skyflow/vaultLH/types/DetokenizeResponse.java rename to src/main/java/com/skyflow/vaultLH/generated/types/DetokenizeResponse.java index eaae5c3a..a76053e5 100644 --- a/src/main/java/com/skyflow/vaultLH/types/DetokenizeResponse.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/DetokenizeResponse.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/types/DetokenizeResponseObject.java b/src/main/java/com/skyflow/vaultLH/generated/types/DetokenizeResponseObject.java similarity index 98% rename from src/main/java/com/skyflow/vaultLH/types/DetokenizeResponseObject.java rename to src/main/java/com/skyflow/vaultLH/generated/types/DetokenizeResponseObject.java index 4de56458..7453850a 100644 --- a/src/main/java/com/skyflow/vaultLH/types/DetokenizeResponseObject.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/DetokenizeResponseObject.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/skyflow/vaultLH/types/EnumDataType.java b/src/main/java/com/skyflow/vaultLH/generated/types/EnumDataType.java similarity index 91% rename from src/main/java/com/skyflow/vaultLH/types/EnumDataType.java rename to src/main/java/com/skyflow/vaultLH/generated/types/EnumDataType.java index 76835054..e9a642b7 100644 --- a/src/main/java/com/skyflow/vaultLH/types/EnumDataType.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/EnumDataType.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/com/skyflow/vaultLH/types/EnumUpdateType.java b/src/main/java/com/skyflow/vaultLH/generated/types/EnumUpdateType.java similarity index 90% rename from src/main/java/com/skyflow/vaultLH/types/EnumUpdateType.java rename to src/main/java/com/skyflow/vaultLH/generated/types/EnumUpdateType.java index 6683e8da..34ff4786 100644 --- a/src/main/java/com/skyflow/vaultLH/types/EnumUpdateType.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/EnumUpdateType.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/com/skyflow/vaultLH/types/ExecuteQueryRecordResponse.java b/src/main/java/com/skyflow/vaultLH/generated/types/ExecuteQueryRecordResponse.java similarity index 96% rename from src/main/java/com/skyflow/vaultLH/types/ExecuteQueryRecordResponse.java rename to src/main/java/com/skyflow/vaultLH/generated/types/ExecuteQueryRecordResponse.java index 533545fb..a8b39586 100644 --- a/src/main/java/com/skyflow/vaultLH/types/ExecuteQueryRecordResponse.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/ExecuteQueryRecordResponse.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/skyflow/vaultLH/types/ExecuteQueryResponse.java b/src/main/java/com/skyflow/vaultLH/generated/types/ExecuteQueryResponse.java similarity index 96% rename from src/main/java/com/skyflow/vaultLH/types/ExecuteQueryResponse.java rename to src/main/java/com/skyflow/vaultLH/generated/types/ExecuteQueryResponse.java index a807d9ca..05d7e789 100644 --- a/src/main/java/com/skyflow/vaultLH/types/ExecuteQueryResponse.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/ExecuteQueryResponse.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/types/GetResponse.java b/src/main/java/com/skyflow/vaultLH/generated/types/GetResponse.java similarity index 96% rename from src/main/java/com/skyflow/vaultLH/types/GetResponse.java rename to src/main/java/com/skyflow/vaultLH/generated/types/GetResponse.java index d0bc6250..0cf3f123 100644 --- a/src/main/java/com/skyflow/vaultLH/types/GetResponse.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/GetResponse.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/types/InsertRecordData.java b/src/main/java/com/skyflow/vaultLH/generated/types/InsertRecordData.java similarity index 97% rename from src/main/java/com/skyflow/vaultLH/types/InsertRecordData.java rename to src/main/java/com/skyflow/vaultLH/generated/types/InsertRecordData.java index 70de408a..540cbdb4 100644 --- a/src/main/java/com/skyflow/vaultLH/types/InsertRecordData.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/InsertRecordData.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/skyflow/vaultLH/types/InsertResponse.java b/src/main/java/com/skyflow/vaultLH/generated/types/InsertResponse.java similarity index 96% rename from src/main/java/com/skyflow/vaultLH/types/InsertResponse.java rename to src/main/java/com/skyflow/vaultLH/generated/types/InsertResponse.java index 88cde715..06db18fa 100644 --- a/src/main/java/com/skyflow/vaultLH/types/InsertResponse.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/InsertResponse.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/types/ProtobufAny.java b/src/main/java/com/skyflow/vaultLH/generated/types/ProtobufAny.java similarity index 96% rename from src/main/java/com/skyflow/vaultLH/types/ProtobufAny.java rename to src/main/java/com/skyflow/vaultLH/generated/types/ProtobufAny.java index b7fb5599..e952dc7c 100644 --- a/src/main/java/com/skyflow/vaultLH/types/ProtobufAny.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/ProtobufAny.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/skyflow/vaultLH/types/RecordResponseObject.java b/src/main/java/com/skyflow/vaultLH/generated/types/RecordResponseObject.java similarity index 98% rename from src/main/java/com/skyflow/vaultLH/types/RecordResponseObject.java rename to src/main/java/com/skyflow/vaultLH/generated/types/RecordResponseObject.java index 83c03287..0c1df0aa 100644 --- a/src/main/java/com/skyflow/vaultLH/types/RecordResponseObject.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/RecordResponseObject.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/skyflow/vaultLH/types/RpcStatus.java b/src/main/java/com/skyflow/vaultLH/generated/types/RpcStatus.java similarity index 97% rename from src/main/java/com/skyflow/vaultLH/types/RpcStatus.java rename to src/main/java/com/skyflow/vaultLH/generated/types/RpcStatus.java index 748c24bf..3dc5fa8a 100644 --- a/src/main/java/com/skyflow/vaultLH/types/RpcStatus.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/RpcStatus.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/types/TokenGroupRedactions.java b/src/main/java/com/skyflow/vaultLH/generated/types/TokenGroupRedactions.java similarity index 97% rename from src/main/java/com/skyflow/vaultLH/types/TokenGroupRedactions.java rename to src/main/java/com/skyflow/vaultLH/generated/types/TokenGroupRedactions.java index 486074d2..22c790f0 100644 --- a/src/main/java/com/skyflow/vaultLH/types/TokenGroupRedactions.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/TokenGroupRedactions.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/skyflow/vaultLH/types/TokenizeRequestObject.java b/src/main/java/com/skyflow/vaultLH/generated/types/TokenizeRequestObject.java similarity index 97% rename from src/main/java/com/skyflow/vaultLH/types/TokenizeRequestObject.java rename to src/main/java/com/skyflow/vaultLH/generated/types/TokenizeRequestObject.java index 9bd58665..ec7ddce9 100644 --- a/src/main/java/com/skyflow/vaultLH/types/TokenizeRequestObject.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/TokenizeRequestObject.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/types/TokenizeResponse.java b/src/main/java/com/skyflow/vaultLH/generated/types/TokenizeResponse.java similarity index 96% rename from src/main/java/com/skyflow/vaultLH/types/TokenizeResponse.java rename to src/main/java/com/skyflow/vaultLH/generated/types/TokenizeResponse.java index 038ddd36..9f5a1cb7 100644 --- a/src/main/java/com/skyflow/vaultLH/types/TokenizeResponse.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/TokenizeResponse.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/types/TokenizeResponseObject.java b/src/main/java/com/skyflow/vaultLH/generated/types/TokenizeResponseObject.java similarity index 97% rename from src/main/java/com/skyflow/vaultLH/types/TokenizeResponseObject.java rename to src/main/java/com/skyflow/vaultLH/generated/types/TokenizeResponseObject.java index 0c68a146..5a5679a1 100644 --- a/src/main/java/com/skyflow/vaultLH/types/TokenizeResponseObject.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/TokenizeResponseObject.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/types/TokenizeResponseObjectToken.java b/src/main/java/com/skyflow/vaultLH/generated/types/TokenizeResponseObjectToken.java similarity index 98% rename from src/main/java/com/skyflow/vaultLH/types/TokenizeResponseObjectToken.java rename to src/main/java/com/skyflow/vaultLH/generated/types/TokenizeResponseObjectToken.java index 370a2cae..96834ab4 100644 --- a/src/main/java/com/skyflow/vaultLH/types/TokenizeResponseObjectToken.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/TokenizeResponseObjectToken.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/skyflow/vaultLH/types/UpdateRecordData.java b/src/main/java/com/skyflow/vaultLH/generated/types/UpdateRecordData.java similarity index 97% rename from src/main/java/com/skyflow/vaultLH/types/UpdateRecordData.java rename to src/main/java/com/skyflow/vaultLH/generated/types/UpdateRecordData.java index e4d5159c..fa2d2523 100644 --- a/src/main/java/com/skyflow/vaultLH/types/UpdateRecordData.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/UpdateRecordData.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/skyflow/vaultLH/types/UpdateResponse.java b/src/main/java/com/skyflow/vaultLH/generated/types/UpdateResponse.java similarity index 96% rename from src/main/java/com/skyflow/vaultLH/types/UpdateResponse.java rename to src/main/java/com/skyflow/vaultLH/generated/types/UpdateResponse.java index 9224d904..e8ad9d62 100644 --- a/src/main/java/com/skyflow/vaultLH/types/UpdateResponse.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/UpdateResponse.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/types/Upsert.java b/src/main/java/com/skyflow/vaultLH/generated/types/Upsert.java similarity index 97% rename from src/main/java/com/skyflow/vaultLH/types/Upsert.java rename to src/main/java/com/skyflow/vaultLH/generated/types/Upsert.java index 01695c6b..c6c1438b 100644 --- a/src/main/java/com/skyflow/vaultLH/types/Upsert.java +++ b/src/main/java/com/skyflow/vaultLH/generated/types/Upsert.java @@ -1,7 +1,7 @@ /** * This file was auto-generated by Fern from our API Definition. */ -package com.skyflow.vaultLH.types; +package com.skyflow.vaultLH.generated.types; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.skyflow.vaultLH.core.ObjectMappers; +import com.skyflow.vaultLH.generated.core.ObjectMappers; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/skyflow/vaultLH/utils/Utils.java b/src/main/java/com/skyflow/vaultLH/utils/Utils.java new file mode 100644 index 00000000..f9810cec --- /dev/null +++ b/src/main/java/com/skyflow/vaultLH/utils/Utils.java @@ -0,0 +1,6 @@ +package com.skyflow.vaultLH.utils; + +import com.skyflow.common.utils.CommonUtils; + +public final class Utils extends CommonUtils { +} diff --git a/src/main/java/com/skyflow/vaultLH/utils/validations/Validations.java b/src/main/java/com/skyflow/vaultLH/utils/validations/Validations.java new file mode 100644 index 00000000..a88ceee7 --- /dev/null +++ b/src/main/java/com/skyflow/vaultLH/utils/validations/Validations.java @@ -0,0 +1,6 @@ +package com.skyflow.vaultLH.utils.validations; + +public class Validations extends com.skyflow.common.utils.Validations { + private Validations() { + } +} diff --git a/src/main/java/com/skyflow/vaultLH/vault/controller/VaultController.java b/src/main/java/com/skyflow/vaultLH/vault/controller/VaultController.java new file mode 100644 index 00000000..0d0fd814 --- /dev/null +++ b/src/main/java/com/skyflow/vaultLH/vault/controller/VaultController.java @@ -0,0 +1,15 @@ +package com.skyflow.vaultLH.vault.controller; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.vaultLH.VaultClient; + +public final class VaultController extends VaultClient { + private static final Gson gson = new GsonBuilder().serializeNulls().create(); + + public VaultController(VaultConfig vaultConfig, Credentials credentials) { + super(vaultConfig, credentials); + } +} diff --git a/src/test/java/com/skyflow/v2/ConnectionClientTests.java b/src/test/java/com/skyflow/v2/ConnectionClientTests.java index ca9718d3..169e0be0 100644 --- a/src/test/java/com/skyflow/v2/ConnectionClientTests.java +++ b/src/test/java/com/skyflow/v2/ConnectionClientTests.java @@ -1,7 +1,7 @@ package com.skyflow.v2; -import com.skyflow.v2.config.ConnectionConfig; -import com.skyflow.v2.config.Credentials; +import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.common.config.Credentials; import io.github.cdimascio.dotenv.Dotenv; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/src/test/java/com/skyflow/v2/SkyflowTests.java b/src/test/java/com/skyflow/v2/SkyflowTests.java index ad5df0d5..d3b485b5 100644 --- a/src/test/java/com/skyflow/v2/SkyflowTests.java +++ b/src/test/java/com/skyflow/v2/SkyflowTests.java @@ -1,13 +1,13 @@ package com.skyflow.v2; -import com.skyflow.v2.config.ConnectionConfig; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.config.VaultConfig; -import com.skyflow.v2.enums.Env; -import com.skyflow.v2.enums.LogLevel; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.common.enums.Env; +import com.skyflow.common.enums.LogLevel; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/src/test/java/com/skyflow/v2/VaultClientTests.java b/src/test/java/com/skyflow/v2/VaultClientTests.java index 4c0170e8..f972e170 100644 --- a/src/test/java/com/skyflow/v2/VaultClientTests.java +++ b/src/test/java/com/skyflow/v2/VaultClientTests.java @@ -1,10 +1,11 @@ package com.skyflow.v2; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.config.VaultConfig; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.common.enums.Env; import com.skyflow.v2.enums.*; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.generated.rest.resources.files.FilesClient; import com.skyflow.v2.generated.rest.resources.files.requests.*; import com.skyflow.v2.generated.rest.resources.query.QueryClient; diff --git a/src/test/java/com/skyflow/v2/config/ConnectionConfigTests.java b/src/test/java/com/skyflow/v2/config/ConnectionConfigTests.java index e8d722c8..cee8f560 100644 --- a/src/test/java/com/skyflow/v2/config/ConnectionConfigTests.java +++ b/src/test/java/com/skyflow/v2/config/ConnectionConfigTests.java @@ -1,8 +1,10 @@ package com.skyflow.v2.config; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.utils.validations.Validations; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/src/test/java/com/skyflow/v2/config/CredentialsTests.java b/src/test/java/com/skyflow/v2/config/CredentialsTests.java index ae9c7e2a..5fe63627 100644 --- a/src/test/java/com/skyflow/v2/config/CredentialsTests.java +++ b/src/test/java/com/skyflow/v2/config/CredentialsTests.java @@ -1,8 +1,9 @@ package com.skyflow.v2.config; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.utils.validations.Validations; import org.junit.Assert; import org.junit.Before; diff --git a/src/test/java/com/skyflow/v2/config/VaultConfigTests.java b/src/test/java/com/skyflow/v2/config/VaultConfigTests.java index 37d30f92..f7c8c369 100644 --- a/src/test/java/com/skyflow/v2/config/VaultConfigTests.java +++ b/src/test/java/com/skyflow/v2/config/VaultConfigTests.java @@ -1,9 +1,11 @@ package com.skyflow.v2.config; -import com.skyflow.v2.enums.Env; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.common.enums.Env; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.utils.validations.Validations; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/src/test/java/com/skyflow/v2/errors/SkyflowExceptionTest.java b/src/test/java/com/skyflow/v2/errors/SkyflowExceptionTest.java index e4a93d3f..5c3c505c 100644 --- a/src/test/java/com/skyflow/v2/errors/SkyflowExceptionTest.java +++ b/src/test/java/com/skyflow/v2/errors/SkyflowExceptionTest.java @@ -1,5 +1,6 @@ package com.skyflow.v2.errors; +import com.skyflow.common.errors.SkyflowException; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/skyflow/v2/serviceaccount/util/BearerTokenTests.java b/src/test/java/com/skyflow/v2/serviceaccount/util/BearerTokenTests.java index 3c7ef348..ec46f4c9 100644 --- a/src/test/java/com/skyflow/v2/serviceaccount/util/BearerTokenTests.java +++ b/src/test/java/com/skyflow/v2/serviceaccount/util/BearerTokenTests.java @@ -1,8 +1,8 @@ package com.skyflow.v2.serviceaccount.util; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.utils.Utils; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/src/test/java/com/skyflow/v2/serviceaccount/util/SignedDataTokensTests.java b/src/test/java/com/skyflow/v2/serviceaccount/util/SignedDataTokensTests.java index ea47e393..b412f07a 100644 --- a/src/test/java/com/skyflow/v2/serviceaccount/util/SignedDataTokensTests.java +++ b/src/test/java/com/skyflow/v2/serviceaccount/util/SignedDataTokensTests.java @@ -1,8 +1,8 @@ package com.skyflow.v2.serviceaccount.util; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.utils.Utils; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/src/test/java/com/skyflow/v2/serviceaccount/util/TokenTests.java b/src/test/java/com/skyflow/v2/serviceaccount/util/TokenTests.java index 026b4770..aec67760 100644 --- a/src/test/java/com/skyflow/v2/serviceaccount/util/TokenTests.java +++ b/src/test/java/com/skyflow/v2/serviceaccount/util/TokenTests.java @@ -1,7 +1,7 @@ package com.skyflow.v2.serviceaccount.util; import com.skyflow.v2.Skyflow; -import com.skyflow.v2.enums.LogLevel; +import com.skyflow.common.enums.LogLevel; import io.github.cdimascio.dotenv.Dotenv; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/src/test/java/com/skyflow/v2/utils/HttpUtilityTests.java b/src/test/java/com/skyflow/v2/utils/HttpUtilityTests.java index e829d862..0932cd52 100644 --- a/src/test/java/com/skyflow/v2/utils/HttpUtilityTests.java +++ b/src/test/java/com/skyflow/v2/utils/HttpUtilityTests.java @@ -1,7 +1,7 @@ package com.skyflow.v2.utils; import com.google.gson.JsonObject; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.errors.SkyflowException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/com/skyflow/v2/utils/UtilsTests.java b/src/test/java/com/skyflow/v2/utils/UtilsTests.java index 86e1328c..eb2e4085 100644 --- a/src/test/java/com/skyflow/v2/utils/UtilsTests.java +++ b/src/test/java/com/skyflow/v2/utils/UtilsTests.java @@ -1,13 +1,13 @@ package com.skyflow.v2.utils; import com.google.gson.JsonObject; -import com.skyflow.v2.config.ConnectionConfig; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.enums.Env; +import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.enums.Env; import com.skyflow.v2.enums.RequestMethod; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.vault.connection.InvokeConnectionRequest; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/src/test/java/com/skyflow/v2/vault/connection/InvokeConnectionTests.java b/src/test/java/com/skyflow/v2/vault/connection/InvokeConnectionTests.java index c0d7f0a7..164efe46 100644 --- a/src/test/java/com/skyflow/v2/vault/connection/InvokeConnectionTests.java +++ b/src/test/java/com/skyflow/v2/vault/connection/InvokeConnectionTests.java @@ -2,9 +2,9 @@ import com.google.gson.JsonObject; import com.skyflow.v2.enums.RequestMethod; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.utils.validations.Validations; import org.junit.Assert; import org.junit.Before; diff --git a/src/test/java/com/skyflow/v2/vault/controller/ConnectionControllerTests.java b/src/test/java/com/skyflow/v2/vault/controller/ConnectionControllerTests.java index 65db03d7..a8518bf4 100644 --- a/src/test/java/com/skyflow/v2/vault/controller/ConnectionControllerTests.java +++ b/src/test/java/com/skyflow/v2/vault/controller/ConnectionControllerTests.java @@ -1,12 +1,12 @@ package com.skyflow.v2.vault.controller; import com.skyflow.v2.Skyflow; -import com.skyflow.v2.config.ConnectionConfig; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.enums.LogLevel; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.enums.LogLevel; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.vault.connection.InvokeConnectionRequest; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/src/test/java/com/skyflow/v2/vault/controller/DetectControllerFileTests.java b/src/test/java/com/skyflow/v2/vault/controller/DetectControllerFileTests.java index 77646412..4dbd8da5 100644 --- a/src/test/java/com/skyflow/v2/vault/controller/DetectControllerFileTests.java +++ b/src/test/java/com/skyflow/v2/vault/controller/DetectControllerFileTests.java @@ -1,10 +1,11 @@ package com.skyflow.v2.vault.controller; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.config.VaultConfig; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.common.enums.Env; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.vault.detect.AudioBleep; import com.skyflow.v2.vault.detect.DeidentifyFileRequest; import com.skyflow.v2.vault.detect.FileInput; @@ -35,7 +36,7 @@ public static void setup() { vaultConfig = new VaultConfig(); vaultConfig.setVaultId(vaultID); vaultConfig.setClusterId(clusterID); - vaultConfig.setEnv(com.skyflow.v2.enums.Env.DEV); + vaultConfig.setEnv(Env.DEV); vaultConfig.setCredentials(credentials); detectController = new DetectController(vaultConfig, credentials); diff --git a/src/test/java/com/skyflow/v2/vault/controller/DetectControllerTests.java b/src/test/java/com/skyflow/v2/vault/controller/DetectControllerTests.java index cf0f79c2..b492a659 100644 --- a/src/test/java/com/skyflow/v2/vault/controller/DetectControllerTests.java +++ b/src/test/java/com/skyflow/v2/vault/controller/DetectControllerTests.java @@ -1,13 +1,13 @@ package com.skyflow.v2.vault.controller; import com.skyflow.v2.Skyflow; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.config.VaultConfig; -import com.skyflow.v2.enums.Env; -import com.skyflow.v2.enums.LogLevel; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.HttpStatus; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.common.enums.Env; +import com.skyflow.common.enums.LogLevel; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.HttpStatus; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.utils.Constants; import com.skyflow.v2.utils.Utils; import com.skyflow.v2.vault.detect.DeidentifyTextRequest; diff --git a/src/test/java/com/skyflow/v2/vault/controller/VaultControllerTests.java b/src/test/java/com/skyflow/v2/vault/controller/VaultControllerTests.java index a70620da..c36bc4cc 100644 --- a/src/test/java/com/skyflow/v2/vault/controller/VaultControllerTests.java +++ b/src/test/java/com/skyflow/v2/vault/controller/VaultControllerTests.java @@ -1,15 +1,15 @@ package com.skyflow.v2.vault.controller; import com.skyflow.v2.Skyflow; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.config.VaultConfig; -import com.skyflow.v2.enums.Env; -import com.skyflow.v2.enums.LogLevel; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.HttpStatus; -import com.skyflow.v2.errors.SkyflowException; -import com.skyflow.v2.generated.rest.ApiClient; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.common.enums.Env; +import com.skyflow.common.enums.LogLevel; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.HttpStatus; +import com.skyflow.common.errors.SkyflowException; +import com.skyflow.common.generated.ApiClient; import com.skyflow.v2.utils.Constants; import com.skyflow.v2.utils.Utils; import com.skyflow.v2.vault.data.*; diff --git a/src/test/java/com/skyflow/v2/vault/data/DeleteTests.java b/src/test/java/com/skyflow/v2/vault/data/DeleteTests.java index da4f47c1..5b06c6be 100644 --- a/src/test/java/com/skyflow/v2/vault/data/DeleteTests.java +++ b/src/test/java/com/skyflow/v2/vault/data/DeleteTests.java @@ -1,12 +1,12 @@ package com.skyflow.v2.vault.data; import com.skyflow.v2.Skyflow; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.config.VaultConfig; -import com.skyflow.v2.enums.Env; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.common.enums.Env; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.utils.Constants; import com.skyflow.v2.utils.Utils; import com.skyflow.v2.utils.validations.Validations; diff --git a/src/test/java/com/skyflow/v2/vault/data/GetTests.java b/src/test/java/com/skyflow/v2/vault/data/GetTests.java index 92bc8202..1aa1dd69 100644 --- a/src/test/java/com/skyflow/v2/vault/data/GetTests.java +++ b/src/test/java/com/skyflow/v2/vault/data/GetTests.java @@ -1,13 +1,13 @@ package com.skyflow.v2.vault.data; import com.skyflow.v2.Skyflow; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.config.VaultConfig; -import com.skyflow.v2.enums.Env; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.common.enums.Env; import com.skyflow.v2.enums.RedactionType; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.utils.Constants; import com.skyflow.v2.utils.Utils; import com.skyflow.v2.utils.validations.Validations; diff --git a/src/test/java/com/skyflow/v2/vault/data/InsertTests.java b/src/test/java/com/skyflow/v2/vault/data/InsertTests.java index 387f1edb..1b1f5c3f 100644 --- a/src/test/java/com/skyflow/v2/vault/data/InsertTests.java +++ b/src/test/java/com/skyflow/v2/vault/data/InsertTests.java @@ -1,13 +1,13 @@ package com.skyflow.v2.vault.data; import com.skyflow.v2.Skyflow; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.config.VaultConfig; -import com.skyflow.v2.enums.Env; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.common.enums.Env; import com.skyflow.v2.enums.TokenMode; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.utils.Constants; import com.skyflow.v2.utils.Utils; import com.skyflow.v2.utils.validations.Validations; diff --git a/src/test/java/com/skyflow/v2/vault/data/QueryTests.java b/src/test/java/com/skyflow/v2/vault/data/QueryTests.java index f4ef86e4..74999a7b 100644 --- a/src/test/java/com/skyflow/v2/vault/data/QueryTests.java +++ b/src/test/java/com/skyflow/v2/vault/data/QueryTests.java @@ -1,12 +1,12 @@ package com.skyflow.v2.vault.data; import com.skyflow.v2.Skyflow; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.config.VaultConfig; -import com.skyflow.v2.enums.Env; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.common.enums.Env; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.utils.Constants; import com.skyflow.v2.utils.Utils; import com.skyflow.v2.utils.validations.Validations; diff --git a/src/test/java/com/skyflow/v2/vault/data/UpdateTests.java b/src/test/java/com/skyflow/v2/vault/data/UpdateTests.java index 7f055b9a..72163201 100644 --- a/src/test/java/com/skyflow/v2/vault/data/UpdateTests.java +++ b/src/test/java/com/skyflow/v2/vault/data/UpdateTests.java @@ -1,13 +1,13 @@ package com.skyflow.v2.vault.data; import com.skyflow.v2.Skyflow; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.config.VaultConfig; -import com.skyflow.v2.enums.Env; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.common.enums.Env; import com.skyflow.v2.enums.TokenMode; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.utils.Constants; import com.skyflow.v2.utils.Utils; import com.skyflow.v2.utils.validations.Validations; diff --git a/src/test/java/com/skyflow/v2/vault/detect/DeidentifyTextTests.java b/src/test/java/com/skyflow/v2/vault/detect/DeidentifyTextTests.java index a9fae273..f442796f 100644 --- a/src/test/java/com/skyflow/v2/vault/detect/DeidentifyTextTests.java +++ b/src/test/java/com/skyflow/v2/vault/detect/DeidentifyTextTests.java @@ -1,8 +1,8 @@ package com.skyflow.v2.vault.detect; import com.skyflow.v2.enums.DetectEntities; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.utils.validations.Validations; import org.junit.Assert; import org.junit.BeforeClass; @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; -import static com.skyflow.v2.errors.ErrorMessage.InvalidTextInDeIdentify; +import static com.skyflow.common.errors.ErrorMessage.InvalidTextInDeIdentify; public class DeidentifyTextTests { diff --git a/src/test/java/com/skyflow/v2/vault/detect/ReidentifyTextTests.java b/src/test/java/com/skyflow/v2/vault/detect/ReidentifyTextTests.java index dfc76f78..b273c6a2 100644 --- a/src/test/java/com/skyflow/v2/vault/detect/ReidentifyTextTests.java +++ b/src/test/java/com/skyflow/v2/vault/detect/ReidentifyTextTests.java @@ -1,8 +1,8 @@ package com.skyflow.v2.vault.detect; import com.skyflow.v2.enums.DetectEntities; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.utils.validations.Validations; import org.junit.Assert; import org.junit.BeforeClass; @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; -import static com.skyflow.v2.errors.ErrorMessage.InvalidTextInReIdentify; +import static com.skyflow.common.errors.ErrorMessage.InvalidTextInReIdentify; public class ReidentifyTextTests { diff --git a/src/test/java/com/skyflow/v2/vault/tokens/DetokenizeTests.java b/src/test/java/com/skyflow/v2/vault/tokens/DetokenizeTests.java index 9ede380b..81e0e940 100644 --- a/src/test/java/com/skyflow/v2/vault/tokens/DetokenizeTests.java +++ b/src/test/java/com/skyflow/v2/vault/tokens/DetokenizeTests.java @@ -1,9 +1,9 @@ package com.skyflow.v2.vault.tokens; import com.skyflow.v2.enums.RedactionType; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.generated.rest.types.DetokenizeRecordResponseValueType; import com.skyflow.v2.generated.rest.types.V1DetokenizeRecordResponse; import com.skyflow.v2.utils.Constants; diff --git a/src/test/java/com/skyflow/v2/vault/tokens/TokenizeTests.java b/src/test/java/com/skyflow/v2/vault/tokens/TokenizeTests.java index 544abff3..d33e0e68 100644 --- a/src/test/java/com/skyflow/v2/vault/tokens/TokenizeTests.java +++ b/src/test/java/com/skyflow/v2/vault/tokens/TokenizeTests.java @@ -1,12 +1,12 @@ package com.skyflow.v2.vault.tokens; import com.skyflow.v2.Skyflow; -import com.skyflow.v2.config.Credentials; -import com.skyflow.v2.config.VaultConfig; -import com.skyflow.v2.enums.Env; -import com.skyflow.v2.errors.ErrorCode; -import com.skyflow.v2.errors.ErrorMessage; -import com.skyflow.v2.errors.SkyflowException; +import com.skyflow.common.config.Credentials; +import com.skyflow.common.config.VaultConfig; +import com.skyflow.common.enums.Env; +import com.skyflow.common.errors.ErrorCode; +import com.skyflow.common.errors.ErrorMessage; +import com.skyflow.common.errors.SkyflowException; import com.skyflow.v2.utils.validations.Validations; import org.junit.Assert; import org.junit.Before; From 7fbff4cc7ec96148f006e6b311d6f35151473796 Mon Sep 17 00:00:00 2001 From: skyflow-bharti Date: Fri, 8 Aug 2025 20:35:02 +0530 Subject: [PATCH 2/2] SK-2232 refactor common code --- .../com/skyflow/common/errors/ErrorMessage.java | 4 ++-- .../java/com/skyflow/common/logger/LogUtil.java | 4 ++-- .../java/com/skyflow/common/utils/Constants.java | 5 +++++ .../com/skyflow/common/utils/SdkVersion.java | 16 ++++++++++++++++ .../java/com/skyflow/v2/ConnectionClient.java | 2 +- src/main/java/com/skyflow/v2/Skyflow.java | 5 ++++- .../{common => v2}/config/ConnectionConfig.java | 4 +++- .../java/com/skyflow/v2/utils/Constants.java | 1 + src/main/java/com/skyflow/v2/utils/Utils.java | 2 +- .../v2/utils/validations/Validations.java | 7 +------ .../vault/controller/ConnectionController.java | 2 +- src/main/java/com/skyflow/vaultLH/Skyflow.java | 3 +++ .../com/skyflow/v2/ConnectionClientTests.java | 2 +- src/test/java/com/skyflow/v2/SkyflowTests.java | 2 +- .../skyflow/v2/config/ConnectionConfigTests.java | 1 - .../java/com/skyflow/v2/utils/UtilsTests.java | 2 +- .../controller/ConnectionControllerTests.java | 2 +- 17 files changed, 44 insertions(+), 20 deletions(-) create mode 100644 src/main/java/com/skyflow/common/utils/SdkVersion.java rename src/main/java/com/skyflow/{common => v2}/config/ConnectionConfig.java (91%) diff --git a/src/main/java/com/skyflow/common/errors/ErrorMessage.java b/src/main/java/com/skyflow/common/errors/ErrorMessage.java index bdfc821c..6f7dab5e 100644 --- a/src/main/java/com/skyflow/common/errors/ErrorMessage.java +++ b/src/main/java/com/skyflow/common/errors/ErrorMessage.java @@ -1,6 +1,6 @@ package com.skyflow.common.errors; -import com.skyflow.v2.utils.Constants; +import com.skyflow.common.utils.SdkVersion; public enum ErrorMessage { // Client initialization @@ -154,7 +154,7 @@ public enum ErrorMessage { ErrorMessage(String message) { - this.message = message.replace("%s0", Constants.SDK_PREFIX); + this.message = message.replace("%s0", SdkVersion.getSdkPrefix()); } public String getMessage() { diff --git a/src/main/java/com/skyflow/common/logger/LogUtil.java b/src/main/java/com/skyflow/common/logger/LogUtil.java index 321d392f..4763c9f2 100644 --- a/src/main/java/com/skyflow/common/logger/LogUtil.java +++ b/src/main/java/com/skyflow/common/logger/LogUtil.java @@ -2,13 +2,13 @@ import com.skyflow.common.enums.LogLevel; import com.skyflow.common.logs.InfoLogs; -import com.skyflow.v2.utils.Constants; +import com.skyflow.common.utils.SdkVersion; import java.util.logging.*; public final class LogUtil { private static final Logger LOGGER = Logger.getLogger(LogUtil.class.getName()); - private static final String SDK_LOG_PREFIX = "[" + Constants.SDK_PREFIX + "] "; + private static final String SDK_LOG_PREFIX = "[" + SdkVersion.getSdkPrefix() + "] "; private static boolean IS_LOGGER_SETUP_DONE = false; synchronized public static void setupLogger(LogLevel logLevel) { diff --git a/src/main/java/com/skyflow/common/utils/Constants.java b/src/main/java/com/skyflow/common/utils/Constants.java index f21ea517..928f2730 100644 --- a/src/main/java/com/skyflow/common/utils/Constants.java +++ b/src/main/java/com/skyflow/common/utils/Constants.java @@ -6,7 +6,12 @@ public class Constants { public static final String GRANT_TYPE = "urn:ietf:params:oauth:grant-type:jwt-bearer"; public static final String SECURE_PROTOCOL = "https://"; public static final String SIGNED_DATA_TOKEN_PREFIX = "signed_token_"; + public static final String SDK_VERSION_V3 = "v3"; + public static final String SDK_NAME = "Skyflow Java SDK "; + public static final String SDK_VERSION = "v2"; + public static final String SDK_PREFIX = SDK_NAME + SDK_VERSION; + public static final String SDK_PREFIX_V3 = SDK_NAME + SDK_VERSION_V3; public static final String API_KEY_REGEX = "^sky-[a-zA-Z0-9]{5}-[a-fA-F0-9]{32}$"; public static final String DEV_DOMAIN = ".vault.skyflowapis.dev"; public static final String STAGE_DOMAIN = ".vault.skyflowapis.tech"; diff --git a/src/main/java/com/skyflow/common/utils/SdkVersion.java b/src/main/java/com/skyflow/common/utils/SdkVersion.java new file mode 100644 index 00000000..1fa91682 --- /dev/null +++ b/src/main/java/com/skyflow/common/utils/SdkVersion.java @@ -0,0 +1,16 @@ +package com.skyflow.common.utils; + +import com.skyflow.v2.utils.Constants; + +public class SdkVersion { + private static String sdkPrefix = Constants.SDK_PREFIX; + + public static void setSdkPrefix(String prefix) { + sdkPrefix = prefix; + } + + public static String getSdkPrefix() { + return sdkPrefix; + } +} + diff --git a/src/main/java/com/skyflow/v2/ConnectionClient.java b/src/main/java/com/skyflow/v2/ConnectionClient.java index 544aa9fe..ab42c3d1 100644 --- a/src/main/java/com/skyflow/v2/ConnectionClient.java +++ b/src/main/java/com/skyflow/v2/ConnectionClient.java @@ -1,7 +1,7 @@ package com.skyflow.v2; import com.skyflow.common.serviceaccount.util.Token; -import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.v2.config.ConnectionConfig; import com.skyflow.common.config.Credentials; import com.skyflow.common.errors.ErrorCode; import com.skyflow.common.errors.ErrorMessage; diff --git a/src/main/java/com/skyflow/v2/Skyflow.java b/src/main/java/com/skyflow/v2/Skyflow.java index f42233ff..edcd224f 100644 --- a/src/main/java/com/skyflow/v2/Skyflow.java +++ b/src/main/java/com/skyflow/v2/Skyflow.java @@ -1,6 +1,7 @@ package com.skyflow.v2; -import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.common.utils.SdkVersion; +import com.skyflow.v2.config.ConnectionConfig; import com.skyflow.common.config.Credentials; import com.skyflow.common.config.VaultConfig; import com.skyflow.common.enums.Env; @@ -10,6 +11,7 @@ import com.skyflow.common.errors.SkyflowException; import com.skyflow.common.logs.ErrorLogs; import com.skyflow.common.logs.InfoLogs; +import com.skyflow.v2.utils.Constants; import com.skyflow.v2.utils.Utils; import com.skyflow.common.logger.LogUtil; import com.skyflow.v2.utils.validations.Validations; @@ -28,6 +30,7 @@ private Skyflow(SkyflowClientBuilder builder) { } public static SkyflowClientBuilder builder() { + SdkVersion.setSdkPrefix(Constants.SDK_PREFIX); return new SkyflowClientBuilder(); } diff --git a/src/main/java/com/skyflow/common/config/ConnectionConfig.java b/src/main/java/com/skyflow/v2/config/ConnectionConfig.java similarity index 91% rename from src/main/java/com/skyflow/common/config/ConnectionConfig.java rename to src/main/java/com/skyflow/v2/config/ConnectionConfig.java index c397a867..081cf9c7 100644 --- a/src/main/java/com/skyflow/common/config/ConnectionConfig.java +++ b/src/main/java/com/skyflow/v2/config/ConnectionConfig.java @@ -1,4 +1,6 @@ -package com.skyflow.common.config; +package com.skyflow.v2.config; + +import com.skyflow.common.config.Credentials; public class ConnectionConfig { private String connectionId; diff --git a/src/main/java/com/skyflow/v2/utils/Constants.java b/src/main/java/com/skyflow/v2/utils/Constants.java index 6f0c468d..77d1511d 100644 --- a/src/main/java/com/skyflow/v2/utils/Constants.java +++ b/src/main/java/com/skyflow/v2/utils/Constants.java @@ -5,6 +5,7 @@ public final class Constants extends com.skyflow.common.utils.Constants { public static final String ENV_CREDENTIALS_KEY_NAME = "SKYFLOW_CREDENTIALS"; public static final String SDK_NAME = "Skyflow Java SDK "; public static final String SDK_VERSION = "v2"; + public static final String SDK_PREFIX = SDK_NAME + SDK_VERSION; public static final String SDK_METRIC_NAME_VERSION = "sdk_name_version"; public static final String SDK_METRIC_NAME_VERSION_PREFIX = "skyflow-java@"; diff --git a/src/main/java/com/skyflow/v2/utils/Utils.java b/src/main/java/com/skyflow/v2/utils/Utils.java index c3d334a0..61cfa9c0 100644 --- a/src/main/java/com/skyflow/v2/utils/Utils.java +++ b/src/main/java/com/skyflow/v2/utils/Utils.java @@ -1,7 +1,7 @@ package com.skyflow.v2.utils; import com.google.gson.JsonObject; -import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.v2.config.ConnectionConfig; import com.skyflow.common.logger.LogUtil; import com.skyflow.common.logs.InfoLogs; import com.skyflow.common.utils.CommonUtils; diff --git a/src/main/java/com/skyflow/v2/utils/validations/Validations.java b/src/main/java/com/skyflow/v2/utils/validations/Validations.java index a8655462..f1007dc6 100644 --- a/src/main/java/com/skyflow/v2/utils/validations/Validations.java +++ b/src/main/java/com/skyflow/v2/utils/validations/Validations.java @@ -2,9 +2,7 @@ import com.google.gson.Gson; import com.google.gson.JsonObject; -import com.skyflow.common.config.ConnectionConfig; -import com.skyflow.common.config.Credentials; -import com.skyflow.common.config.VaultConfig; +import com.skyflow.v2.config.ConnectionConfig; import com.skyflow.v2.enums.InterfaceName; import com.skyflow.v2.enums.RedactionType; import com.skyflow.v2.enums.TokenMode; @@ -12,7 +10,6 @@ import com.skyflow.common.errors.ErrorMessage; import com.skyflow.common.errors.SkyflowException; import com.skyflow.common.logs.ErrorLogs; -import com.skyflow.v2.utils.Constants; import com.skyflow.v2.utils.Utils; import com.skyflow.common.logger.LogUtil; import com.skyflow.v2.vault.connection.InvokeConnectionRequest; @@ -29,8 +26,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class Validations extends com.skyflow.common.utils.Validations { private Validations() { diff --git a/src/main/java/com/skyflow/v2/vault/controller/ConnectionController.java b/src/main/java/com/skyflow/v2/vault/controller/ConnectionController.java index 5587ce91..f34f5ec0 100644 --- a/src/main/java/com/skyflow/v2/vault/controller/ConnectionController.java +++ b/src/main/java/com/skyflow/v2/vault/controller/ConnectionController.java @@ -5,7 +5,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.skyflow.v2.ConnectionClient; -import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.v2.config.ConnectionConfig; import com.skyflow.common.config.Credentials; import com.skyflow.v2.enums.RequestMethod; import com.skyflow.common.errors.ErrorCode; diff --git a/src/main/java/com/skyflow/vaultLH/Skyflow.java b/src/main/java/com/skyflow/vaultLH/Skyflow.java index 7e6ae28e..da5f37f7 100644 --- a/src/main/java/com/skyflow/vaultLH/Skyflow.java +++ b/src/main/java/com/skyflow/vaultLH/Skyflow.java @@ -11,6 +11,8 @@ import com.skyflow.common.logs.InfoLogs; import com.skyflow.common.utils.CommonUtils; import com.skyflow.common.logger.LogUtil; +import com.skyflow.common.utils.Constants; +import com.skyflow.common.utils.SdkVersion; import com.skyflow.common.utils.Validations; import com.skyflow.vaultLH.vault.controller.VaultController; @@ -25,6 +27,7 @@ private Skyflow(SkyflowClientBuilder builder) { } public static SkyflowClientBuilder builder() { + SdkVersion.setSdkPrefix(Constants.SDK_PREFIX_V3); return new SkyflowClientBuilder(); } diff --git a/src/test/java/com/skyflow/v2/ConnectionClientTests.java b/src/test/java/com/skyflow/v2/ConnectionClientTests.java index 169e0be0..a2990bc0 100644 --- a/src/test/java/com/skyflow/v2/ConnectionClientTests.java +++ b/src/test/java/com/skyflow/v2/ConnectionClientTests.java @@ -1,6 +1,6 @@ package com.skyflow.v2; -import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.v2.config.ConnectionConfig; import com.skyflow.common.config.Credentials; import io.github.cdimascio.dotenv.Dotenv; import org.junit.Assert; diff --git a/src/test/java/com/skyflow/v2/SkyflowTests.java b/src/test/java/com/skyflow/v2/SkyflowTests.java index d3b485b5..574bb46c 100644 --- a/src/test/java/com/skyflow/v2/SkyflowTests.java +++ b/src/test/java/com/skyflow/v2/SkyflowTests.java @@ -1,6 +1,6 @@ package com.skyflow.v2; -import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.v2.config.ConnectionConfig; import com.skyflow.common.config.Credentials; import com.skyflow.common.config.VaultConfig; import com.skyflow.common.enums.Env; diff --git a/src/test/java/com/skyflow/v2/config/ConnectionConfigTests.java b/src/test/java/com/skyflow/v2/config/ConnectionConfigTests.java index cee8f560..bab9f109 100644 --- a/src/test/java/com/skyflow/v2/config/ConnectionConfigTests.java +++ b/src/test/java/com/skyflow/v2/config/ConnectionConfigTests.java @@ -1,6 +1,5 @@ package com.skyflow.v2.config; -import com.skyflow.common.config.ConnectionConfig; import com.skyflow.common.config.Credentials; import com.skyflow.common.errors.ErrorCode; import com.skyflow.common.errors.ErrorMessage; diff --git a/src/test/java/com/skyflow/v2/utils/UtilsTests.java b/src/test/java/com/skyflow/v2/utils/UtilsTests.java index eb2e4085..c0b759b3 100644 --- a/src/test/java/com/skyflow/v2/utils/UtilsTests.java +++ b/src/test/java/com/skyflow/v2/utils/UtilsTests.java @@ -1,7 +1,7 @@ package com.skyflow.v2.utils; import com.google.gson.JsonObject; -import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.v2.config.ConnectionConfig; import com.skyflow.common.config.Credentials; import com.skyflow.common.enums.Env; import com.skyflow.v2.enums.RequestMethod; diff --git a/src/test/java/com/skyflow/v2/vault/controller/ConnectionControllerTests.java b/src/test/java/com/skyflow/v2/vault/controller/ConnectionControllerTests.java index a8518bf4..50d37285 100644 --- a/src/test/java/com/skyflow/v2/vault/controller/ConnectionControllerTests.java +++ b/src/test/java/com/skyflow/v2/vault/controller/ConnectionControllerTests.java @@ -1,7 +1,7 @@ package com.skyflow.v2.vault.controller; import com.skyflow.v2.Skyflow; -import com.skyflow.common.config.ConnectionConfig; +import com.skyflow.v2.config.ConnectionConfig; import com.skyflow.common.config.Credentials; import com.skyflow.common.enums.LogLevel; import com.skyflow.common.errors.ErrorCode;