vaultClientsMap = new LinkedHashMap<>();
+ // Client-wide HTTP config. Resolution per vault, most specific first:
+ // VaultConfig value -> the value set here -> SDK default (60s call timeout, 0 retries).
+ // null here means "not set", so the SDK default applies to vaults that don't override it.
+ // Only null means inherit: an explicit 0 is a real value and wins over the level below.
+ private Integer timeout;
+ private Integer connectTimeout;
+ private Integer readTimeout;
+ private Integer writeTimeout;
+ private Integer maxRetries;
@Override
protected void validateVaultConfig(VaultConfig vaultConfig) throws SkyflowException {
@@ -54,13 +63,26 @@ protected void validateVaultConfig(VaultConfig vaultConfig) throws SkyflowExcept
@Override
protected void onVaultConfigAdded(VaultConfig vaultConfig) throws SkyflowException {
- this.vaultClientsMap.put(vaultConfig.getVaultId(), new VaultController(vaultConfig, this.skyflowCredentials));
+ VaultController controller = new VaultController(vaultConfig, this.skyflowCredentials);
+ controller.setCommonHttpConfig(this.timeout, this.connectTimeout, this.readTimeout,
+ this.writeTimeout, this.maxRetries);
+ this.vaultClientsMap.put(vaultConfig.getVaultId(), controller);
LogUtil.printInfoLog(Utils.parameterizedString(InfoLogs.VAULT_CONTROLLER_INITIALIZED.getLog(), vaultConfig.getVaultId()));
}
@Override
protected void onVaultConfigUpdated(VaultConfig updatedConfig) throws SkyflowException {
- this.vaultClientsMap.put(updatedConfig.getVaultId(), new VaultController(updatedConfig, this.skyflowCredentials));
+ // Update the existing controller in place — replacing it would leave any VaultController
+ // reference the caller already holds pointing at the previous config.
+ VaultController updated = this.vaultClientsMap.get(updatedConfig.getVaultId());
+ if (updated == null) {
+ updated = new VaultController(updatedConfig, this.skyflowCredentials);
+ this.vaultClientsMap.put(updatedConfig.getVaultId(), updated);
+ } else {
+ updated.setVaultConfig(updatedConfig);
+ }
+ updated.setCommonHttpConfig(this.timeout, this.connectTimeout, this.readTimeout,
+ this.writeTimeout, this.maxRetries);
}
@Override
@@ -89,9 +111,48 @@ public SkyflowClientBuilder addVaultConfig(VaultConfig vaultConfig) throws Skyfl
@Override
public SkyflowClientBuilder updateVaultConfig(VaultConfig vaultConfig) throws SkyflowException {
super.updateVaultConfig(vaultConfig);
+ carryVaultOverrides(vaultConfig);
return this;
}
+ /**
+ * BaseSkyflow.mergeVaultConfig() only carries env, clusterId and credentials across, so the
+ * flowvault-specific fields on an incoming update — vaultUrl and the HTTP settings — would
+ * be dropped silently. Apply them to the merged config the new controller is holding. A null
+ * on the incoming config means "leave as is", matching how the base class merges every
+ * other field.
+ */
+ private void carryVaultOverrides(VaultConfig incoming) throws SkyflowException {
+ VaultConfig merged = this.vaultConfigMap.get(incoming.getVaultId());
+ if (merged == null || merged == incoming) {
+ return;
+ }
+ if (incoming.getTimeout() != null) {
+ merged.setTimeout(incoming.getTimeout());
+ }
+ if (incoming.getConnectTimeout() != null) {
+ merged.setConnectTimeout(incoming.getConnectTimeout());
+ }
+ if (incoming.getReadTimeout() != null) {
+ merged.setReadTimeout(incoming.getReadTimeout());
+ }
+ if (incoming.getWriteTimeout() != null) {
+ merged.setWriteTimeout(incoming.getWriteTimeout());
+ }
+ if (incoming.getMaxRetries() != null) {
+ merged.setMaxRetries(incoming.getMaxRetries());
+ }
+ // The HTTP settings above are resolved lazily on the next request, but the URL is
+ // resolved once in the VaultClient constructor — which already ran with the old value.
+ if (incoming.getVaultUrl() != null) {
+ merged.setVaultUrl(incoming.getVaultUrl());
+ VaultController controller = this.vaultClientsMap.get(incoming.getVaultId());
+ if (controller != null) {
+ controller.refreshVaultUrl();
+ }
+ }
+ }
+
@Override
public SkyflowClientBuilder removeVaultConfig(String vaultId) throws SkyflowException {
super.removeVaultConfig(vaultId);
@@ -110,6 +171,75 @@ public SkyflowClientBuilder setLogLevel(LogLevel logLevel) {
return this;
}
+ /**
+ * Overall call timeout in seconds, including retries. Default 60.
+ *
+ * Precedence: a vault that sets {@link VaultConfig#setTimeout(Integer)} wins; this
+ * value applies only to vaults that leave it unset.
+ */
+ public SkyflowClientBuilder timeout(int timeout) {
+ this.timeout = timeout;
+ propagateHttpConfig();
+ return this;
+ }
+
+ /**
+ * Per-attempt connection-establishment timeout in seconds. Unset => HTTP client default (10s).
+ *
+ * Precedence: a vault that sets {@link VaultConfig#setConnectTimeout(Integer)} wins;
+ * this value applies only to vaults that leave it unset.
+ */
+ public SkyflowClientBuilder connectTimeout(int connectTimeout) {
+ this.connectTimeout = connectTimeout;
+ propagateHttpConfig();
+ return this;
+ }
+
+ /**
+ * Per-attempt response-read timeout in seconds. Unset => HTTP client default (10s).
+ *
+ * Precedence: a vault that sets {@link VaultConfig#setReadTimeout(Integer)} wins;
+ * this value applies only to vaults that leave it unset.
+ */
+ public SkyflowClientBuilder readTimeout(int readTimeout) {
+ this.readTimeout = readTimeout;
+ propagateHttpConfig();
+ return this;
+ }
+
+ /**
+ * Per-attempt request-write timeout in seconds. Unset => HTTP client default (10s).
+ *
+ * Precedence: a vault that sets {@link VaultConfig#setWriteTimeout(Integer)} wins;
+ * this value applies only to vaults that leave it unset.
+ */
+ public SkyflowClientBuilder writeTimeout(int writeTimeout) {
+ this.writeTimeout = writeTimeout;
+ propagateHttpConfig();
+ return this;
+ }
+
+ /**
+ * Retry attempts after the first failure. Default 0 — retries are opt-in so non-idempotent
+ * bulk writes are not replayed automatically.
+ *
+ * Precedence: a vault that sets {@link VaultConfig#setMaxRetries(Integer)} wins;
+ * this value applies only to vaults that leave it unset.
+ */
+ public SkyflowClientBuilder maxRetries(int maxRetries) {
+ this.maxRetries = maxRetries;
+ propagateHttpConfig();
+ return this;
+ }
+
+ /** Push the current client-wide HTTP settings onto every vault controller built so far. */
+ private void propagateHttpConfig() {
+ for (VaultController vault : this.vaultClientsMap.values()) {
+ vault.setCommonHttpConfig(this.timeout, this.connectTimeout, this.readTimeout,
+ this.writeTimeout, this.maxRetries);
+ }
+ }
+
public Skyflow build() {
return new Skyflow(this);
}
diff --git a/flowvault/src/main/java/com/skyflow/VaultClient.java b/flowvault/src/main/java/com/skyflow/VaultClient.java
index 9033e642..a8a2e2d7 100644
--- a/flowvault/src/main/java/com/skyflow/VaultClient.java
+++ b/flowvault/src/main/java/com/skyflow/VaultClient.java
@@ -5,19 +5,67 @@
import com.skyflow.errors.SkyflowException;
import com.skyflow.generated.rest.ApiClient;
import com.skyflow.generated.rest.ApiClientBuilder;
+import com.skyflow.generated.rest.core.RetryInterceptor;
import com.skyflow.generated.rest.resources.flowservice.FlowserviceClient;
import com.skyflow.generated.rest.resources.records.RecordsClient;
import com.skyflow.utils.Utils;
+import java.util.concurrent.TimeUnit;
+
+import okhttp3.ConnectionPool;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+
public class VaultClient extends BaseVaultClient {
private final ApiClientBuilder apiClientBuilder;
private ApiClient apiClient;
+ // Client-wide (Skyflow builder) HTTP config; null => fall back to the SDK defaults below.
+ private Integer commonTimeout;
+ private Integer commonConnectTimeout;
+ private Integer commonReadTimeout;
+ private Integer commonWriteTimeout;
+ private Integer commonMaxRetries;
+ // SDK defaults, used when neither the vault-level nor the client-wide value is set.
+ private static final int DEFAULT_TIMEOUT_SECONDS = 60;
+ // Retries OFF by default (opt-in) so non-idempotent bulk writes aren't replayed automatically.
+ private static final int DEFAULT_MAX_RETRIES = 0;
protected VaultClient(VaultConfig vaultConfig, Credentials credentials) throws SkyflowException {
super(vaultConfig, credentials);
this.apiClientBuilder = new ApiClientBuilder();
this.apiClient = null;
- updateVaultURL();
+ updateVaultUrl();
+ }
+
+ /**
+ * Applies the client-wide HTTP settings from the Skyflow builder. Discards the cached HTTP
+ * client and ApiClient so the next call rebuilds them with the new values.
+ */
+ protected void setCommonHttpConfig(Integer timeout, Integer connectTimeout, Integer readTimeout,
+ Integer writeTimeout, Integer maxRetries) {
+ this.commonTimeout = timeout;
+ this.commonConnectTimeout = connectTimeout;
+ this.commonReadTimeout = readTimeout;
+ this.commonWriteTimeout = writeTimeout;
+ this.commonMaxRetries = maxRetries;
+ this.sharedHttpClient = null;
+ this.apiClient = null;
+ }
+
+ /** Resolve a setting: vault-level override, else client-wide default, else the SDK default. */
+ private static int resolveInt(Integer vaultLevel, Integer clientLevel, int defaultValue) {
+ if (vaultLevel != null) {
+ return vaultLevel;
+ }
+ return clientLevel != null ? clientLevel : defaultValue;
+ }
+
+ /**
+ * Resolve an optional setting: vault-level override, else client-wide default, else null.
+ * Null means "not configured" — the caller leaves the underlying HTTP client default in place.
+ */
+ private static Integer resolveNullableInt(Integer vaultLevel, Integer clientLevel) {
+ return vaultLevel != null ? vaultLevel : clientLevel;
}
protected FlowserviceClient getRecordsApi() {
@@ -41,29 +89,79 @@ protected synchronized void setBearerToken() throws SkyflowException {
}
}
- private void updateVaultURL() throws SkyflowException {
- // Fetch vaultURL from ENV
- String vaultURL = Utils.getEnvVaultURL();
+ /**
+ * Adopts an updated config in place, so a VaultController reference the caller already holds
+ * keeps working instead of silently serving the previous config. Discards the cached HTTP and
+ * API clients; the bearer token is re-resolved by setBearerToken, which drops it when the
+ * effective credentials changed.
+ */
+ protected void setVaultConfig(VaultConfig vaultConfig) throws SkyflowException {
+ this.vaultConfig = vaultConfig;
+ this.sharedHttpClient = null;
+ this.apiClient = null;
+ updateVaultUrl();
+ }
+
+ /**
+ * Re-resolves the vault URL from the current config. The constructor resolves it once, so a
+ * vaultUrl supplied later through updateVaultConfig would otherwise never take effect.
+ */
+ protected void refreshVaultUrl() throws SkyflowException {
+ updateVaultUrl();
+ }
+
+ private void updateVaultUrl() throws SkyflowException {
+ // Fetch vaultUrl from ENV
+ String vaultUrl = Utils.getEnvVaultUrl();
- // If vaultURL from ENV is null or empty, fetch vaultURL from vault config
- if (vaultURL == null || vaultURL.isEmpty()) {
- vaultURL = this.vaultConfig.getVaultURL();
+ // If vaultUrl from ENV is null or empty, fetch vaultUrl from vault config
+ if (vaultUrl == null || vaultUrl.isEmpty()) {
+ vaultUrl = this.vaultConfig.getVaultUrl();
}
- // If vaultURL from vault config is also null or empty, construct vaultURL from clusterId passed in vault config
- if (vaultURL == null || vaultURL.isEmpty()) {
- vaultURL = Utils.getVaultURL(this.vaultConfig.getClusterId(), this.vaultConfig.getEnv());
+ // If vaultUrl from vault config is also null or empty, construct vaultUrl from clusterId passed in vault config
+ if (vaultUrl == null || vaultUrl.isEmpty()) {
+ vaultUrl = Utils.getVaultUrl(this.vaultConfig.getClusterId(), this.vaultConfig.getEnv());
}
- this.apiClientBuilder.url(vaultURL);
- if (!vaultURL.equals(this.currentVaultURL)) {
- this.currentVaultURL = vaultURL;
+ this.apiClientBuilder.url(vaultUrl);
+ if (!vaultUrl.equals(this.currentVaultURL)) {
+ this.currentVaultURL = vaultUrl;
this.apiClient = null;
}
}
protected void updateExecutorInHTTP() {
if (sharedHttpClient == null) {
- sharedHttpClient = buildSharedHttpClient(() -> this.token);
+ int timeoutSeconds = resolveInt(vaultConfig.getTimeout(), commonTimeout, DEFAULT_TIMEOUT_SECONDS);
+ int maxRetries = resolveInt(vaultConfig.getMaxRetries(), commonMaxRetries, DEFAULT_MAX_RETRIES);
+ // Per-attempt timeouts: null => leave OkHttp's built-in default (backward compatible).
+ Integer connectTimeout = resolveNullableInt(vaultConfig.getConnectTimeout(), commonConnectTimeout);
+ Integer readTimeout = resolveNullableInt(vaultConfig.getReadTimeout(), commonReadTimeout);
+ Integer writeTimeout = resolveNullableInt(vaultConfig.getWriteTimeout(), commonWriteTimeout);
+
+ OkHttpClient.Builder httpBuilder = new OkHttpClient.Builder()
+ .connectionPool(new ConnectionPool(10, 1, TimeUnit.MINUTES))
+ // Overall ceiling; bounds the whole call including retries.
+ .callTimeout(timeoutSeconds, TimeUnit.SECONDS)
+ // OUTER: retries. Must wrap the auth interceptor so each attempt re-reads the
+ // (possibly refreshed) bearer token rather than replaying a stale one.
+ .addInterceptor(new RetryInterceptor(maxRetries))
+ .addInterceptor(chain -> { // INNER: auth
+ Request requestWithAuth = chain.request().newBuilder()
+ .header("Authorization", "Bearer " + this.token)
+ .build();
+ return chain.proceed(requestWithAuth);
+ });
+ if (connectTimeout != null) {
+ httpBuilder.connectTimeout(connectTimeout, TimeUnit.SECONDS);
+ }
+ if (readTimeout != null) {
+ httpBuilder.readTimeout(readTimeout, TimeUnit.SECONDS);
+ }
+ if (writeTimeout != null) {
+ httpBuilder.writeTimeout(writeTimeout, TimeUnit.SECONDS);
+ }
+ sharedHttpClient = httpBuilder.build();
apiClientBuilder.httpClient(sharedHttpClient);
}
}
diff --git a/flowvault/src/main/java/com/skyflow/config/VaultConfig.java b/flowvault/src/main/java/com/skyflow/config/VaultConfig.java
index 8966d29f..b14ed6b5 100644
--- a/flowvault/src/main/java/com/skyflow/config/VaultConfig.java
+++ b/flowvault/src/main/java/com/skyflow/config/VaultConfig.java
@@ -1,20 +1,117 @@
package com.skyflow.config;
+/**
+ * Per-vault configuration.
+ *
+ * The HTTP timeout and retry settings below are vault-level overrides. Each one resolves
+ * most-specific-first: the value set here, else the client-wide value set on
+ * {@code Skyflow.builder()}, else the SDK default. So when the same setting is supplied at both
+ * levels, the value on this VaultConfig takes precedence and the client-wide value is
+ * ignored for this vault.
+ *
+ * Only {@code null} means "inherit" — an explicit {@code 0} is a real value and wins over the
+ * client-wide setting.
+ */
public class VaultConfig extends BaseVaultConfig {
- private String vaultURL;
+ private String vaultUrl;
+ // HTTP timeout & retry config (vault-level overrides). null => inherit client-wide default, then SDK default.
+ private Integer timeout; // overall call timeout, in seconds
+ private Integer connectTimeout; // per-attempt connection-establishment timeout, in seconds
+ private Integer readTimeout; // per-attempt response-read timeout, in seconds
+ private Integer writeTimeout; // per-attempt request-write timeout, in seconds
+ private Integer maxRetries; // retry attempts after the first failure
public VaultConfig() {
super();
- this.vaultURL = null;
+ this.vaultUrl = null;
+ this.timeout = null;
+ this.connectTimeout = null;
+ this.readTimeout = null;
+ this.writeTimeout = null;
+ this.maxRetries = null;
}
- public String getVaultURL() {
- return vaultURL;
+ public String getVaultUrl() {
+ return vaultUrl;
}
- public void setVaultURL(String vaultURL) {
- this.vaultURL = vaultURL;
+ public void setVaultUrl(String vaultUrl) {
+ this.vaultUrl = vaultUrl;
+ }
+
+ public Integer getTimeout() {
+ return timeout;
+ }
+
+ /**
+ * Overall call timeout in seconds for this vault, including retries.
+ *
+ * Takes precedence over the client-wide {@code Skyflow.builder().timeout(...)}. Leave unset
+ * (null) to inherit that value, or the SDK default of 60s if it is also unset.
+ */
+ public void setTimeout(Integer timeout) {
+ this.timeout = timeout;
+ }
+
+ public Integer getConnectTimeout() {
+ return connectTimeout;
+ }
+
+ /**
+ * Per-attempt connection-establishment timeout in seconds for this vault.
+ *
+ * Takes precedence over the client-wide {@code Skyflow.builder().connectTimeout(...)}. Leave
+ * unset (null) to inherit that value; if neither is set, the underlying HTTP client default
+ * (10s) applies. Note the overall {@code timeout} still bounds the whole call, including retries.
+ */
+ public void setConnectTimeout(Integer connectTimeout) {
+ this.connectTimeout = connectTimeout;
+ }
+
+ public Integer getReadTimeout() {
+ return readTimeout;
+ }
+
+ /**
+ * Per-attempt response-read timeout in seconds for this vault.
+ *
+ * Takes precedence over the client-wide {@code Skyflow.builder().readTimeout(...)}. Leave
+ * unset (null) to inherit that value; if neither is set, the underlying HTTP client default
+ * (10s) applies. Note the overall {@code timeout} still bounds the whole call, including retries.
+ */
+ public void setReadTimeout(Integer readTimeout) {
+ this.readTimeout = readTimeout;
+ }
+
+ public Integer getWriteTimeout() {
+ return writeTimeout;
+ }
+
+ /**
+ * Per-attempt request-write timeout in seconds for this vault.
+ *
+ * Takes precedence over the client-wide {@code Skyflow.builder().writeTimeout(...)}. Leave
+ * unset (null) to inherit that value; if neither is set, the underlying HTTP client default
+ * (10s) applies. Note the overall {@code timeout} still bounds the whole call, including retries.
+ */
+ public void setWriteTimeout(Integer writeTimeout) {
+ this.writeTimeout = writeTimeout;
+ }
+
+ public Integer getMaxRetries() {
+ return maxRetries;
+ }
+
+ /**
+ * Retry attempts after the first failure for this vault.
+ *
+ * Takes precedence over the client-wide {@code Skyflow.builder().maxRetries(...)}. Leave unset
+ * (null) to inherit that value, or the SDK default of 0 if it is also unset — retries are
+ * opt-in, so non-idempotent bulk writes are not replayed silently.
+ */
+ public void setMaxRetries(Integer maxRetries) {
+ this.maxRetries = maxRetries;
}
}
diff --git a/flowvault/src/main/java/com/skyflow/enums/UpsertType.java b/flowvault/src/main/java/com/skyflow/enums/UpsertType.java
deleted file mode 100644
index fa2350d2..00000000
--- a/flowvault/src/main/java/com/skyflow/enums/UpsertType.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.skyflow.enums;
-
-public enum UpsertType {
- UPDATE("UPDATE"),
-
- REPLACE("REPLACE");
-
- private final String value;
-
- UpsertType(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return this.value;
- }
-}
diff --git a/flowvault/src/main/java/com/skyflow/utils/Constants.java b/flowvault/src/main/java/com/skyflow/utils/Constants.java
index 983e82b3..acbd471f 100644
--- a/flowvault/src/main/java/com/skyflow/utils/Constants.java
+++ b/flowvault/src/main/java/com/skyflow/utils/Constants.java
@@ -10,6 +10,7 @@ public final class Constants extends BaseConstants {
public static final String VAULT_DOMAIN = ".skyvault.";
public static final String SDK_PREFIX;
public static final String SDK_METRIC_NAME_VERSION_PREFIX = "skyflow-flowvault-java@";
+ public static final Integer MAX_BULK_DATA_SIZE = 10000;
public static final Integer INSERT_BATCH_SIZE = 50;
public static final Integer MAX_INSERT_BATCH_SIZE = 1000;
public static final Integer INSERT_CONCURRENCY_LIMIT = 1;
diff --git a/flowvault/src/main/java/com/skyflow/utils/Utils.java b/flowvault/src/main/java/com/skyflow/utils/Utils.java
index e26286c0..a88b3b15 100644
--- a/flowvault/src/main/java/com/skyflow/utils/Utils.java
+++ b/flowvault/src/main/java/com/skyflow/utils/Utils.java
@@ -1,41 +1,64 @@
package com.skyflow.utils;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
import com.google.gson.JsonObject;
-import com.skyflow.config.Credentials;
import com.skyflow.config.VaultConfig;
import com.skyflow.enums.Env;
-import com.skyflow.enums.UpsertType;
import com.skyflow.errors.ErrorCode;
import com.skyflow.errors.ErrorMessage;
import com.skyflow.errors.SkyflowException;
import com.skyflow.generated.rest.core.ApiClientApiException;
import com.skyflow.generated.rest.resources.flowservice.requests.V1FlowDetokenizeRequest;
-import com.skyflow.generated.rest.resources.flowservice.requests.V1GetRequest;
import com.skyflow.generated.rest.resources.flowservice.requests.V1InsertRequest;
-import com.skyflow.generated.rest.resources.records.requests.V1ExecuteQueryRequest;
-import com.skyflow.generated.rest.types.*;
+import com.skyflow.generated.rest.types.FlowEnumUpdateType;
+import com.skyflow.generated.rest.types.FlowTokenizeResponseObjectToken;
+import com.skyflow.generated.rest.types.V1DeleteTokenResponseObject;
+import com.skyflow.generated.rest.types.V1FlowDeleteTokenResponse;
+import com.skyflow.generated.rest.types.V1FlowDetokenizeResponse;
+import com.skyflow.generated.rest.types.V1FlowDetokenizeResponseObject;
+import com.skyflow.generated.rest.types.V1FlowTokenizeRequestObject;
+import com.skyflow.generated.rest.types.V1FlowTokenizeResponse;
+import com.skyflow.generated.rest.types.V1FlowTokenizeResponseObject;
+import com.skyflow.generated.rest.types.V1InsertRecordData;
+import com.skyflow.generated.rest.types.V1InsertResponse;
+import com.skyflow.generated.rest.types.V1RecordResponseObject;
+import com.skyflow.generated.rest.types.V1TokenGroupRedactions;
+import com.skyflow.generated.rest.types.V1Upsert;
import com.skyflow.logs.ErrorLogs;
-import com.skyflow.logs.InfoLogs;
-import com.skyflow.logs.WarningLogs;
-import com.skyflow.serviceaccount.util.BearerToken;
-import com.skyflow.serviceaccount.util.Token;
import com.skyflow.utils.logger.LogUtil;
-import com.skyflow.vault.data.*;
+import com.skyflow.vault.data.BulkDeleteTokensRequest;
+import com.skyflow.vault.data.BulkDeleteTokensResponse;
+import com.skyflow.vault.data.BulkDetokenizeRequest;
+import com.skyflow.vault.data.BulkDetokenizeResponse;
+import com.skyflow.vault.data.BulkDetokenizeResponseRecord;
+import com.skyflow.vault.data.BulkInsertRequest;
+import com.skyflow.vault.data.BulkInsertResponse;
+import com.skyflow.vault.data.BulkInsertResponseRecord;
+import com.skyflow.vault.data.BulkTokenizeRecord;
+import com.skyflow.vault.data.BulkTokenizeRequest;
+import com.skyflow.vault.data.BulkTokenizeResponse;
+import com.skyflow.vault.data.DeleteTokensSuccess;
+import com.skyflow.vault.data.ErrorRecord;
+import com.skyflow.vault.data.InsertRequest;
+import com.skyflow.vault.data.InsertRequestRecord;
+import com.skyflow.vault.data.TokenGroupRedactions;
+import com.skyflow.vault.data.TokenizeSuccess;
+import com.skyflow.vault.data.UpsertOptions;
+
import io.github.cdimascio.dotenv.Dotenv;
import io.github.cdimascio.dotenv.DotenvException;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
public final class Utils extends BaseUtils {
- public static String getVaultURL(String clusterId, Env env) {
- return getVaultURL(clusterId, env, Constants.VAULT_DOMAIN);
+ public static String getVaultUrl(String clusterId, Env env) {
+ // The 3-arg overload is inherited from common's BaseUtils, which keeps the older
+ // getVaultURL spelling (shared with v2), so it is qualified rather than renamed here.
+ return BaseUtils.getVaultURL(clusterId, env, Constants.VAULT_DOMAIN);
}
public static JsonObject getMetrics() {
@@ -46,27 +69,27 @@ public static JsonObject getMetrics() {
}
- public static String getEnvVaultURL() throws SkyflowException {
+ public static String getEnvVaultUrl() throws SkyflowException {
try {
- String vaultURL = System.getenv("VAULT_URL");
- if (vaultURL == null) {
+ String vaultUrl = System.getenv("VAULT_URL");
+ if (vaultUrl == null) {
Dotenv dotenv = Dotenv.load();
- vaultURL = dotenv.get("VAULT_URL");
+ vaultUrl = dotenv.get("VAULT_URL");
}
- if (vaultURL != null && vaultURL.trim().isEmpty()) {
+ if (vaultUrl != null && vaultUrl.trim().isEmpty()) {
LogUtil.printErrorLog(ErrorLogs.EMPTY_VAULT_URL.getLog());
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyVaultUrl.getMessage());
- } else if (vaultURL != null && !isValidURL(vaultURL)) {
+ } else if (vaultUrl != null && !isValidUrl(vaultUrl)) {
LogUtil.printErrorLog(ErrorLogs.INVALID_VAULT_URL_FORMAT.getLog());
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidVaultUrlFormat.getMessage());
}
- return vaultURL;
+ return vaultUrl;
} catch (DotenvException e) {
return null;
}
}
- public static boolean isValidURL(String url) {
+ public static boolean isValidUrl(String url) {
URL parsedUrl;
try {
parsedUrl = new URL(url);
@@ -82,57 +105,40 @@ public static boolean isValidURL(String url) {
}
- public static String generateBearerToken(Credentials credentials) throws SkyflowException {
- if (credentials.getPath() != null) {
- BearerToken.BearerTokenBuilder builder = BearerToken.builder()
- .setCredentials(new File(credentials.getPath()))
- .setRoles(credentials.getRoles());
- Object ctx = credentials.getContext();
- if (ctx instanceof String) {
- builder.setCtx((String) ctx);
- } else if (ctx instanceof Map) {
- builder.setCtx((Map) ctx);
- }
- return builder.build().getBearerToken();
- } else if (credentials.getCredentialsString() != null) {
- BearerToken.BearerTokenBuilder builder = BearerToken.builder()
- .setCredentials(credentials.getCredentialsString())
- .setRoles(credentials.getRoles());
- Object ctx = credentials.getContext();
- if (ctx instanceof String) {
- builder.setCtx((String) ctx);
- } else if (ctx instanceof Map) {
- builder.setCtx((Map) ctx);
+ // Mirrors the "present" test used by the request validators: null and blank both count as absent.
+ private static boolean hasText(String value) {
+ return value != null && !value.trim().isEmpty();
+ }
+
+ private static V1Upsert toV1Upsert(UpsertOptions upsert) {
+ V1Upsert.Builder builder = V1Upsert.builder().uniqueColumns(upsert.getUniqueColumns());
+ // updateType is a String on the request; the legal values come from the wire enum itself
+ // so there is a single source of truth. Validations rejects anything that does not match.
+ String updateType = upsert.getUpdateType();
+ for (FlowEnumUpdateType type : FlowEnumUpdateType.values()) {
+ if (type.toString().equalsIgnoreCase(updateType)) {
+ builder.updateType(type);
+ break;
}
- return builder.build().getBearerToken();
- } else {
- return credentials.getToken();
}
+ return builder.build();
}
- public static V1InsertRequest getBulkInsertRequestBody(InsertRequest request, VaultConfig config) {
- ArrayList records = request.getRecords();
+ public static V1InsertRequest getInsertRequestBody(InsertRequest request, VaultConfig config) {
+ List records = request.getRecords();
List insertRecordDataList = new ArrayList<>();
- for (InsertRecord record : records) {
- V1InsertRecordData.Builder data = V1InsertRecordData.builder();
- data.data(record.getData());
- if (record.getTable() != null && !record.getTable().isEmpty()) {
- data.tableName(record.getTable());
- }
- if (record.getUpsert() != null && !record.getUpsert().isEmpty()) {
- if (record.getUpsertType() != null) {
- FlowEnumUpdateType updateType = null;
- if (record.getUpsertType() == UpsertType.REPLACE) {
- updateType = FlowEnumUpdateType.REPLACE;
- } else if (record.getUpsertType() == UpsertType.UPDATE) {
- updateType = FlowEnumUpdateType.UPDATE;
- }
- V1Upsert upsert = V1Upsert.builder().uniqueColumns(record.getUpsert()).updateType(updateType).build();
- data.upsert(upsert);
- } else {
- V1Upsert upsert = V1Upsert.builder().uniqueColumns(record.getUpsert()).build();
- data.upsert(upsert);
- }
+ for (InsertRequestRecord record : records) {
+ V1InsertRecordData.Builder data = V1InsertRecordData.builder()
+ .data(record.getData())
+ // A blank record-level table name counts as absent, matching
+ // validateInsertRequest, so it falls back to the request-level one.
+ .tableName(hasText(record.getTableName()) ? record.getTableName() : request.getTableName());
+ if (record.getTokens() != null && !record.getTokens().isEmpty()) {
+ data.tokens(record.getTokens());
+ }
+ UpsertOptions upsert = record.getUpsert() != null ? record.getUpsert() : request.getUpsert();
+ if (upsert != null && upsert.getUniqueColumns() != null && !upsert.getUniqueColumns().isEmpty()) {
+ data.upsert(toV1Upsert(upsert));
}
insertRecordDataList.add(data.build());
}
@@ -140,249 +146,23 @@ public static V1InsertRequest getBulkInsertRequestBody(InsertRequest request, Va
V1InsertRequest.Builder builder = V1InsertRequest.builder()
.vaultId(config.getVaultId())
.records(insertRecordDataList);
-
- if (request.getTable() != null && !request.getTable().isEmpty()) {
- builder.tableName(request.getTable());
- }
-
- if (request.getUpsert() != null && !request.getUpsert().isEmpty()) {
- if (request.getUpsertType() != null) {
- FlowEnumUpdateType updateType = null;
- if (request.getUpsertType() == UpsertType.REPLACE) {
- updateType = FlowEnumUpdateType.REPLACE;
- } else if (request.getUpsertType() == UpsertType.UPDATE) {
- updateType = FlowEnumUpdateType.UPDATE;
- }
- V1Upsert upsert = V1Upsert.builder().uniqueColumns(request.getUpsert()).updateType(updateType).build();
- builder.upsert(upsert);
- } else {
- V1Upsert upsert = V1Upsert.builder().uniqueColumns(request.getUpsert()).build();
- builder.upsert(upsert);
- }
+ if (hasText(request.getTableName())) {
+ builder.tableName(request.getTableName());
}
return builder.build();
-
}
- public static InsertResponse buildInsertResponse(V1InsertResponse res) {
- ArrayList> insertedFields = new ArrayList<>();
- ArrayList> errors = new ArrayList<>();
-
- if (res != null && res.getRecords().isPresent()) {
- for (V1RecordResponseObject record : res.getRecords().get()) {
- if (record.getError().isPresent()) {
- HashMap errorRecord = new HashMap<>();
- record.getSkyflowId().ifPresent(skyflowId -> errorRecord.put("skyflowId", skyflowId));
- record.getTableName().ifPresent(tableName -> errorRecord.put("tableName", tableName));
- errorRecord.put("error", record.getError().get());
- record.getHttpCode().ifPresent(httpCode -> errorRecord.put("httpCode", httpCode));
- errors.add(errorRecord);
- } else {
- HashMap insertedRecord = new HashMap<>();
- record.getSkyflowId().ifPresent(skyflowId -> insertedRecord.put("skyflowId", skyflowId));
- record.getTokens().ifPresent(insertedRecord::putAll);
- insertedFields.add(insertedRecord);
- }
- }
- }
- return new InsertResponse(insertedFields, errors);
- }
-
- public static com.skyflow.generated.rest.resources.flowservice.requests.V1FlowDetokenizeRequest getDetokenizeRequestBody(DetokenizeRequest request, String vaultid) {
- List detokenizeData = request.getDetokenizeData();
- List tokens = new ArrayList<>();
- for(int i = 0; i< detokenizeData.size(); i++){
- tokens.add(detokenizeData.get(i).getToken());
- }
- com.skyflow.generated.rest.resources.flowservice.requests.V1FlowDetokenizeRequest.Builder builder =
- com.skyflow.generated.rest.resources.flowservice.requests.V1FlowDetokenizeRequest.builder()
- .vaultId(vaultid)
- .tokens(tokens);
- if (request.getTokenGroupRedactions() != null) {
- List tokenGroupRedactionsList = new ArrayList<>();
- for (com.skyflow.vault.data.TokenGroupRedactions tokenGroupRedactions : request.getTokenGroupRedactions()) {
- com.skyflow.generated.rest.types.V1TokenGroupRedactions redactions =
- com.skyflow.generated.rest.types.V1TokenGroupRedactions.builder()
- .tokenGroupName(tokenGroupRedactions.getTokenGroupName())
- .redaction(tokenGroupRedactions.getRedaction())
- .build();
- tokenGroupRedactionsList.add(redactions);
- }
-
- builder.tokenGroupRedactions(tokenGroupRedactionsList);
- }
- return builder.build();
- }
-
- public static DetokenizeResponse buildDetokenizeResponse(V1FlowDetokenizeResponse res) {
- ArrayList detokenizedFields = new ArrayList<>();
- ArrayList errors = new ArrayList<>();
-
- if (res != null && res.getResponse().isPresent()) {
- for (V1FlowDetokenizeResponseObject record : res.getResponse().get()) {
- String token = record.getToken().orElse(null);
- String tokenGroupName = record.getTokenGroupName().orElse(null);
- Map metadata = record.getMetadata().orElse(null);
- if (record.getError().isPresent()) {
- errors.add(new DetokenizeRecordResponse(token, null, record.getError().get(), tokenGroupName, metadata));
- } else {
- Object value = record.getValue().orElse(null);
- detokenizedFields.add(new DetokenizeRecordResponse(token, value, null, tokenGroupName, metadata));
- }
- }
- }
- return new DetokenizeResponse(detokenizedFields, errors);
- }
-
- public static com.skyflow.generated.rest.resources.flowservice.requests.V1FlowDeleteTokenRequest getDeleteTokensRequestBody(DeleteTokensRequest request, String vaultid) {
- return com.skyflow.generated.rest.resources.flowservice.requests.V1FlowDeleteTokenRequest.builder()
- .vaultId(vaultid)
- .tokens(request.getTokens())
- .build();
- }
private static String extractRequestId(Map> headers) {
if (headers == null) return null;
List ids = headers.get(BaseConstants.REQUEST_ID_HEADER_KEY);
return (ids == null || ids.isEmpty()) ? null : ids.get(0);
}
- public static DeleteTokensResponse buildDeleteTokensResponse(V1FlowDeleteTokenResponse res, Map> headers, int requestedTokenCount) {
- ArrayList deletedTokens = new ArrayList<>();
- ArrayList> errors = new ArrayList<>();
- String requestId = extractRequestId(headers);
- if (res != null && res.getTokens().isPresent()) {
- for (V1DeleteTokenResponseObject record : res.getTokens().get()) {
- if (record.getError().isPresent()) {
- HashMap errorRecord = new HashMap<>();
- errorRecord.put("error", record.getError().get());
- record.getHttpCode().ifPresent(httpCode -> errorRecord.put("httpCode", httpCode));
- errorRecord.put("requestId", requestId);
- errors.add(errorRecord);
- } else {
- record.getValue().ifPresent(deletedTokens::add);
- }
- }
- if (deletedTokens.size() + errors.size() != requestedTokenCount) {
- LogUtil.printWarningLog(WarningLogs.INCOMPLETE_DELETE_TOKENS_RESPONSE.getLog());
- }
- } else {
- LogUtil.printWarningLog(WarningLogs.EMPTY_DELETE_TOKENS_RESPONSE.getLog());
- }
- return new DeleteTokensResponse(deletedTokens, errors);
- }
-
- public static com.skyflow.generated.rest.resources.flowservice.requests.V1FlowTokenizeRequest getTokenizeRequestBody(TokenizeRequest request, String vaultid) {
- List dataList = new ArrayList<>();
- for (TokenizeRecord record : request.getData()) {
- V1FlowTokenizeRequestObject obj = V1FlowTokenizeRequestObject.builder()
- .value(record.getValue())
- .tokenGroupNames(record.getTokenGroupNames())
- .build();
- dataList.add(obj);
- }
- return com.skyflow.generated.rest.resources.flowservice.requests.V1FlowTokenizeRequest.builder()
- .vaultId(vaultid)
- .data(dataList)
- .build();
- }
-
- public static TokenizeResponse buildTokenizeResponse(V1FlowTokenizeResponse res, Map> headers, int requestedRecordCount) {
- List tokenizedData = new ArrayList<>();
- ArrayList> errors = new ArrayList<>();
- String requestId = extractRequestId(headers);
- if (res != null && res.getResponse().isPresent()) {
- List records = res.getResponse().get();
- int indexNumber = 0;
- for (V1FlowTokenizeResponseObject record : records) {
- Object value = record.getValue().orElse(null);
- TokenizeData tokenizeData = new TokenizeData(value, indexNumber);
- boolean hasAnySuccess = false;
- if (record.getTokens().isPresent()) {
- for (FlowTokenizeResponseObjectToken tokenObj : record.getTokens().get()) {
- if (tokenObj.getError().isPresent()) {
- HashMap errorRecord = new HashMap<>();
- errorRecord.put("error", tokenObj.getError().get());
- tokenObj.getHttpCode().ifPresent(httpCode -> errorRecord.put("httpCode", httpCode));
- tokenObj.getTokenGroupName().ifPresent(name -> errorRecord.put("tokenGroupName", name));
- errorRecord.put("index", indexNumber);
- errorRecord.put("requestId", requestId);
- errors.add(errorRecord);
- } else if (tokenObj.getTokenGroupName().isPresent() && tokenObj.getToken().isPresent()) {
- tokenizeData.addToken(tokenObj.getTokenGroupName().get(), tokenObj.getToken().get());
- hasAnySuccess = true;
- }
- }
- }
- if (hasAnySuccess) {
- tokenizedData.add(tokenizeData);
- }
- indexNumber++;
- }
- if (indexNumber != requestedRecordCount) {
- LogUtil.printWarningLog(WarningLogs.INCOMPLETE_TOKENIZE_RESPONSE.getLog());
- }
- } else {
- LogUtil.printWarningLog(WarningLogs.EMPTY_TOKENIZE_RESPONSE.getLog());
- }
- TokenizeResponse tokenizeResponse = new TokenizeResponse(errors);
- tokenizeResponse.setTokenizedData(tokenizedData);
- return tokenizeResponse;
- }
-
// ── Bulk (batched/concurrent) request-body builders ──────────────────────
+ // BulkInsertRequest is an InsertRequest, so the bulk body is built exactly the same way.
public static com.skyflow.generated.rest.resources.flowservice.requests.V1InsertRequest getBulkInsertRequestBody(BulkInsertRequest request, VaultConfig config) {
- ArrayList records = request.getRecords();
- List insertRecordDataList = new ArrayList<>();
- for (BulkInsertRecord record : records) {
- V1InsertRecordData.Builder data = V1InsertRecordData.builder();
- data.data(record.getData());
- if (record.getTable() != null && !record.getTable().isEmpty()) {
- data.tableName(record.getTable());
- }
- if (record.getUpsert() != null && !record.getUpsert().isEmpty()) {
- if (record.getUpsertType() != null) {
- FlowEnumUpdateType updateType = null;
- if (record.getUpsertType() == UpsertType.REPLACE) {
- updateType = FlowEnumUpdateType.REPLACE;
- } else if (record.getUpsertType() == UpsertType.UPDATE) {
- updateType = FlowEnumUpdateType.UPDATE;
- }
- V1Upsert upsert = V1Upsert.builder().uniqueColumns(record.getUpsert()).updateType(updateType).build();
- data.upsert(upsert);
- } else {
- V1Upsert upsert = V1Upsert.builder().uniqueColumns(record.getUpsert()).build();
- data.upsert(upsert);
- }
- }
- insertRecordDataList.add(data.build());
- }
-
- com.skyflow.generated.rest.resources.flowservice.requests.V1InsertRequest.Builder builder =
- com.skyflow.generated.rest.resources.flowservice.requests.V1InsertRequest.builder()
- .vaultId(config.getVaultId())
- .records(insertRecordDataList);
-
- if (request.getTable() != null && !request.getTable().isEmpty()) {
- builder.tableName(request.getTable());
- }
-
- if (request.getUpsert() != null && !request.getUpsert().isEmpty()) {
- if (request.getUpsertType() != null) {
- FlowEnumUpdateType updateType = null;
- if (request.getUpsertType() == UpsertType.REPLACE) {
- updateType = FlowEnumUpdateType.REPLACE;
- } else if (request.getUpsertType() == UpsertType.UPDATE) {
- updateType = FlowEnumUpdateType.UPDATE;
- }
- V1Upsert upsert = V1Upsert.builder().uniqueColumns(request.getUpsert()).updateType(updateType).build();
- builder.upsert(upsert);
- } else {
- V1Upsert upsert = V1Upsert.builder().uniqueColumns(request.getUpsert()).build();
- builder.upsert(upsert);
- }
- }
- return builder.build();
+ return getInsertRequestBody(request, config);
}
public static V1FlowDetokenizeRequest getBulkDetokenizeRequestBody(BulkDetokenizeRequest request, String vaultId) {
@@ -391,7 +171,7 @@ public static V1FlowDetokenizeRequest getBulkDetokenizeRequestBody(BulkDetokeniz
.tokens(request.getTokens());
if (request.getTokenGroupRedactions() != null && !request.getTokenGroupRedactions().isEmpty()) {
List tokenGroupRedactionsList = new ArrayList<>();
- for (BulkTokenGroupRedactions tokenGroupRedactions : request.getTokenGroupRedactions()) {
+ for (TokenGroupRedactions tokenGroupRedactions : request.getTokenGroupRedactions()) {
tokenGroupRedactionsList.add(V1TokenGroupRedactions.builder()
.tokenGroupName(tokenGroupRedactions.getTokenGroupName())
.redaction(tokenGroupRedactions.getRedaction())
@@ -486,6 +266,59 @@ public static List recordMap, int indexNumber, String requestId) {
+ BulkInsertResponseRecord err = null;
+ if (recordMap != null) {
+ int code = 500;
+ if (recordMap.containsKey("http_code")) {
+ code = (Integer) recordMap.get("http_code");
+ } else if (recordMap.containsKey("httpCode")) {
+ code = (Integer) recordMap.get("httpCode");
+ } else if (recordMap.containsKey("statusCode")) {
+ code = (Integer) recordMap.get("statusCode");
+ }
+ // check if skyflowID is present
+ String skyflowID = null;
+ if (recordMap.containsKey("skyflowID")) {
+ skyflowID = recordMap.get("skyflowID").toString();
+ }
+ String tableName = null;
+ if (recordMap.containsKey("tableName")) {
+ tableName = recordMap.get("tableName").toString();
+ }
+ String message = recordMap.containsKey("error") ? (String) recordMap.get("error") :
+ recordMap.containsKey("message") ? (String) recordMap.get("message") : "Unknown error";
+ err = new BulkInsertResponseRecord(indexNumber, tableName, skyflowID, null, null, code, message, requestId);
+ }
+ return err;
+ }
+
+ public static BulkDetokenizeResponseRecord createDetokenizeErrorRecord(Map recordMap, int indexNumber, String requestId) {
+ BulkDetokenizeResponseRecord err = null;
+ if (recordMap != null) {
+ int code = 500;
+ if (recordMap.containsKey("http_code")) {
+ code = (Integer) recordMap.get("http_code");
+ } else if (recordMap.containsKey("httpCode")) {
+ code = (Integer) recordMap.get("httpCode");
+ } else if (recordMap.containsKey("statusCode")) {
+ code = (Integer) recordMap.get("statusCode");
+ }
+ // the failing token is echoed back so the caller can tell which one it was
+ String token = null;
+ if (recordMap.containsKey("token")) {
+ token = recordMap.get("token").toString();
+ }
+ String tokenGroupName = null;
+ if (recordMap.containsKey("tokenGroupName")) {
+ tokenGroupName = recordMap.get("tokenGroupName").toString();
+ }
+ String message = recordMap.containsKey("error") ? (String) recordMap.get("error") :
+ recordMap.containsKey("message") ? (String) recordMap.get("message") : "Unknown error";
+ err = new BulkDetokenizeResponseRecord(indexNumber, token, null, tokenGroupName, null, code, message, requestId);
+ }
+ return err;
+ }
public static ErrorRecord createErrorRecord(Map recordMap, int indexNumber, String requestId) {
ErrorRecord err = null;
@@ -505,10 +338,12 @@ public static ErrorRecord createErrorRecord(Map recordMap, int i
return err;
}
- public static List handleBulkInsertBatchException(
+ // Errors are parsed into ErrorRecord (shared with the other bulk ops), then projected onto
+ // the unified BulkInsertResponseRecord shape that bulk insert now returns.
+ public static List handleBulkInsertBatchException(
Throwable ex, List batch, int batchNumber, int batchSize
) {
- List errorRecords = new ArrayList<>();
+ List allRecords = new ArrayList<>();
Throwable cause = ex.getCause();
if (cause instanceof ApiClientApiException) {
ApiClientApiException apiException = (ApiClientApiException) cause;
@@ -524,8 +359,8 @@ public static List handleBulkInsertBatchException(
for (Object record : recordsList) {
if (record instanceof Map) {
Map recordMap = (Map) record;
- ErrorRecord err = createErrorRecord(recordMap, indexNumber, requestId);
- errorRecords.add(err);
+ BulkInsertResponseRecord err = createInsertErrorRecord(recordMap, indexNumber, requestId);
+ allRecords.add(err);
indexNumber++;
}
}
@@ -535,35 +370,48 @@ public static List handleBulkInsertBatchException(
Map recordMap = (errField instanceof Map) ? (Map) errField : null;
String fallbackMsg = (errField instanceof String) ? (String) errField : null;
for (int j = 0; j < batch.size(); j++) {
- ErrorRecord err = (recordMap != null)
- ? createErrorRecord(recordMap, indexNumber, requestId)
- : new ErrorRecord(indexNumber, fallbackMsg != null ? fallbackMsg : apiException.getMessage(), apiException.statusCode(), requestId);
- errorRecords.add(err);
+ BulkInsertResponseRecord err = null;
+ if(recordMap != null){
+ err = createInsertErrorRecord(recordMap, indexNumber, requestId);
+ } else {
+ String errorMessage = null;
+ if (fallbackMsg != null){
+ errorMessage = fallbackMsg;
+ } else {
+ errorMessage = apiException.getMessage();
+ }
+ err = new BulkInsertResponseRecord(indexNumber, null, null, null, null, apiException.statusCode(), errorMessage, requestId);
+
+ }
+ allRecords.add(err);
indexNumber++;
}
}
}
- if (errorRecords.isEmpty()) {
+
+ if (allRecords.isEmpty()) {
for (int j = 0; j < batch.size(); j++) {
- errorRecords.add(new ErrorRecord(indexNumber, apiException.getMessage(), apiException.statusCode(), requestId));
+ allRecords.add(new BulkInsertResponseRecord(indexNumber, null, null, null, null, apiException.statusCode(), apiException.getMessage(), requestId));
indexNumber++;
}
}
} else {
int indexNumber = batchNumber > 0 ? batchNumber * batchSize : 0;
for (int j = 0; j < batch.size(); j++) {
- ErrorRecord err = new ErrorRecord(indexNumber, ex.getMessage(), 500);
- errorRecords.add(err);
+ BulkInsertResponseRecord err = new BulkInsertResponseRecord(indexNumber, null, null, null, null, 500, ex.getMessage(), null);
+ allRecords.add(err);
indexNumber++;
}
}
- return errorRecords;
+ return allRecords;
}
- public static List handleBulkDetokenizeBatchException(
+ // Errors are parsed into ErrorRecord (shared with the other bulk ops), then projected onto
+ // the unified BulkDetokenizeResponseRecord shape that bulk detokenize now returns.
+ public static List handleBulkDetokenizeBatchException(
Throwable ex, V1FlowDetokenizeRequest batch, int batchNumber, int batchSize
) {
- List errorRecords = new ArrayList<>();
+ List allRecords = new ArrayList<>();
Throwable cause = ex.getCause();
if (cause instanceof ApiClientApiException) {
ApiClientApiException apiException = (ApiClientApiException) cause;
@@ -571,6 +419,7 @@ public static List handleBulkDetokenizeBatchException(
Object rawBody = apiException.body();
Map responseBody = (rawBody instanceof Map) ? (Map) rawBody : null;
int indexNumber = batchNumber * batchSize;
+ int tokenCount = batch.getTokens().isPresent() ? batch.getTokens().get().size() : 0;
if (responseBody != null) {
if (responseBody.containsKey("response")) {
Object recordss = responseBody.get("response");
@@ -579,8 +428,8 @@ public static List handleBulkDetokenizeBatchException(
for (Object record : recordsList) {
if (record instanceof Map) {
Map recordMap = (Map) record;
- ErrorRecord err = createErrorRecord(recordMap, indexNumber, requestId);
- errorRecords.add(err);
+ BulkDetokenizeResponseRecord err = createDetokenizeErrorRecord(recordMap, indexNumber, requestId);
+ allRecords.add(err);
indexNumber++;
}
}
@@ -589,32 +438,40 @@ public static List handleBulkDetokenizeBatchException(
Object errField = responseBody.get("error");
Map recordMap = (errField instanceof Map) ? (Map) errField : null;
String fallbackMsg = (errField instanceof String) ? (String) errField : null;
- int tokenCount = batch.getTokens().isPresent() ? batch.getTokens().get().size() : 0;
for (int j = 0; j < tokenCount; j++) {
- ErrorRecord err = (recordMap != null)
- ? createErrorRecord(recordMap, indexNumber, requestId)
- : new ErrorRecord(indexNumber, fallbackMsg != null ? fallbackMsg : apiException.getMessage(), apiException.statusCode(), requestId);
- errorRecords.add(err);
+ BulkDetokenizeResponseRecord err = null;
+ if (recordMap != null) {
+ err = createDetokenizeErrorRecord(recordMap, indexNumber, requestId);
+ } else {
+ String errorMessage = null;
+ if (fallbackMsg != null) {
+ errorMessage = fallbackMsg;
+ } else {
+ errorMessage = apiException.getMessage();
+ }
+ err = new BulkDetokenizeResponseRecord(indexNumber, null, null, null, null, apiException.statusCode(), errorMessage, requestId);
+ }
+ allRecords.add(err);
indexNumber++;
}
}
}
- if (errorRecords.isEmpty()) {
- int tokenCount = batch.getTokens().isPresent() ? batch.getTokens().get().size() : 0;
+
+ if (allRecords.isEmpty()) {
for (int j = 0; j < tokenCount; j++) {
- errorRecords.add(new ErrorRecord(indexNumber, apiException.getMessage(), apiException.statusCode(), requestId));
+ allRecords.add(new BulkDetokenizeResponseRecord(indexNumber, null, null, null, null, apiException.statusCode(), apiException.getMessage(), requestId));
indexNumber++;
}
}
} else {
int indexNumber = batchNumber * batchSize;
for (int j = 0; j < batch.getTokens().get().size(); j++) {
- ErrorRecord err = new ErrorRecord(indexNumber, ex.getMessage(), 500);
- errorRecords.add(err);
+ BulkDetokenizeResponseRecord err = new BulkDetokenizeResponseRecord(indexNumber, null, null, null, null, 500, ex.getMessage(), null);
+ allRecords.add(err);
indexNumber++;
}
}
- return errorRecords;
+ return allRecords;
}
public static List handleBulkDeleteTokensBatchException(
@@ -738,68 +595,49 @@ public static List handleBulkTokenizeBatchException(
public static BulkInsertResponse formatBulkInsertResponse(V1InsertResponse response, int batch, int batchSize, Map> headers) {
BulkInsertResponse formattedResponse = null;
- List successRecords = new ArrayList<>();
- List errorRecords = new ArrayList<>();
+ List records = new ArrayList<>();
if (response != null && response.getRecords().isPresent()) {
- String requestId = extractRequestId(headers);
List record = response.getRecords().get();
int indexNumber = batch * batchSize;
int recordsSize = record.size();
for (int index = 0; index < recordsSize; index++) {
- if (record.get(index).getError().isPresent()) {
- ErrorRecord errorRecord = new ErrorRecord(indexNumber, record.get(index).getError().get(), record.get(index).getHttpCode().orElse(500), requestId);
- errorRecords.add(errorRecord);
- } else {
- Map> tokensMap = null;
- if (record.get(index).getTokens().isPresent()) {
- tokensMap = new HashMap<>();
- Map tok = record.get(index).getTokens().get();
- for (Map.Entry entry : tok.entrySet()) {
- String key = entry.getKey();
- Object value = entry.getValue();
- List tokenList = new ArrayList<>();
- if (value instanceof List) {
- List valueList = (List) value;
- for (Object item : valueList) {
- if (item instanceof Map) {
- Map tokenMap = (Map) item;
- com.skyflow.vault.data.Token token = new com.skyflow.vault.data.Token((String) tokenMap.get("token"), (String) tokenMap.get("tokenGroupName"));
- tokenList.add(token);
- }
- }
- }
- tokensMap.put(key, tokenList);
- }
- }
- Success success = new Success(indexNumber, record.get(index).getSkyflowId().orElse(null), tokensMap, record.get(index).getData().isPresent() ? record.get(index).getData().get() : null, record.get(index).getTableName().isPresent() ? record.get(index).getTableName().get() : null);
- successRecords.add(success);
- }
+ V1RecordResponseObject current = record.get(index);
+ records.add(new BulkInsertResponseRecord(
+ indexNumber,
+ current.getTableName().orElse(null),
+ current.getSkyflowId().orElse(null),
+ current.getTokens().orElse(null),
+ current.getHashedData().orElse(null),
+ current.getHttpCode().orElse(current.getError().isPresent() ? 500 : 200),
+ current.getError().orElse(null),
+ null));
indexNumber++;
}
- formattedResponse = new BulkInsertResponse(successRecords, errorRecords);
+ formattedResponse = new BulkInsertResponse(records);
}
return formattedResponse;
}
public static BulkDetokenizeResponse formatBulkDetokenizeResponse(V1FlowDetokenizeResponse response, int batch, int batchSize, Map> headers) {
if (response != null && response.getResponse().isPresent()) {
- String requestId = extractRequestId(headers);
List record = response.getResponse().get();
- List errorRecords = new ArrayList<>();
- List successRecords = new ArrayList<>();
+ List records = new ArrayList<>();
int indexNumber = batch * batchSize;
int recordsSize = record.size();
for (int index = 0; index < recordsSize; index++) {
- if (record.get(index).getError().isPresent()) {
- ErrorRecord errorRecord = new ErrorRecord(indexNumber, record.get(index).getError().get(), record.get(index).getHttpCode().orElse(500), requestId);
- errorRecords.add(errorRecord);
- } else {
- DetokenizeResponseObject success = new DetokenizeResponseObject(indexNumber, record.get(index).getToken().orElse(null), record.get(index).getValue().orElse(null), record.get(index).getTokenGroupName().orElse(null), record.get(index).getError().orElse(null), record.get(index).getMetadata().orElse(null));
- successRecords.add(success);
- }
+ V1FlowDetokenizeResponseObject current = record.get(index);
+ records.add(new BulkDetokenizeResponseRecord(
+ indexNumber,
+ current.getToken().orElse(null),
+ current.getValue().orElse(null),
+ current.getTokenGroupName().orElse(null),
+ current.getMetadata().orElse(null),
+ current.getHttpCode().orElse(current.getError().isPresent() ? 500 : 200),
+ current.getError().orElse(null),
+ null));
indexNumber++;
}
- return new BulkDetokenizeResponse(successRecords, errorRecords);
+ return new BulkDetokenizeResponse(records);
}
return null;
}
@@ -867,120 +705,4 @@ public static BulkTokenizeResponse formatBulkTokenizeResponse(
return null;
}
- public static V1ExecuteQueryRequest getQueryRequestBody(QueryRequest request, String vaultId) {
- return V1ExecuteQueryRequest.builder()
- .vaultId(vaultId)
- .query(request.getQuery())
- .build();
- }
-
- public static QueryResponse buildQueryResponse(V1ExecuteQueryResponse res) {
- ArrayList> fields = new ArrayList<>();
- if (res != null && res.getRecords().isPresent()) {
- for (V1ExecuteQueryRecordResponse record : res.getRecords().get()) {
- HashMap fieldMap = new HashMap<>();
- if (record.getData().isPresent()) {
- fieldMap.putAll(record.getData().get());
- }
- fields.add(fieldMap);
- }
- }
- return new QueryResponse(fields);
- }
-
- private static List buildColumnRedactions(List columnRedactions) {
- List columnRedactionsList = new ArrayList<>();
- for (ColumnRedaction columnRedaction : columnRedactions) {
- columnRedactionsList.add(V1ColumnRedactions.builder()
- .columnName(columnRedaction.getColumnName())
- .redaction(columnRedaction.getRedaction())
- .build());
- }
- return columnRedactionsList;
- }
-
- private static List buildUniqueValues(List> uniqueValues) {
- List uniqueValuesList = new ArrayList<>();
- for (Map uniqueValue : uniqueValues) {
- uniqueValuesList.add(V1UniqueValue.builder().data(uniqueValue).build());
- }
- return uniqueValuesList;
- }
-
- public static V1GetRequest getGetRequestBody(GetRequest request, String vaultId) {
- V1GetRequest.Builder builder = V1GetRequest.builder().vaultId(vaultId);
-
- if (request.getRecords() != null && !request.getRecords().isEmpty()) {
- List recordsList = new ArrayList<>();
- for (GetRecordRequest record : request.getRecords()) {
- V1GetRequestData.Builder recordBuilder = V1GetRequestData.builder()
- .tableName(record.getTable());
- if (record.getIds() != null) {
- recordBuilder.skyflowIDs(record.getIds());
- }
- if (record.getFields() != null) {
- recordBuilder.columns(record.getFields());
- }
- if (record.getColumnRedactions() != null && !record.getColumnRedactions().isEmpty()) {
- recordBuilder.columnRedactions(buildColumnRedactions(record.getColumnRedactions()));
- }
- if (record.getUniqueValues() != null && !record.getUniqueValues().isEmpty()) {
- recordBuilder.uniqueValues(buildUniqueValues(record.getUniqueValues()));
- }
- recordsList.add(recordBuilder.build());
- }
- builder.records(recordsList);
- } else {
- builder.tableName(request.getTable());
- if (request.getIds() != null) {
- builder.skyflowIDs(request.getIds());
- }
- if (request.getFields() != null) {
- builder.columns(request.getFields());
- }
- if (request.getColumnRedactions() != null && !request.getColumnRedactions().isEmpty()) {
- builder.columnRedactions(buildColumnRedactions(request.getColumnRedactions()));
- }
- if (request.getUniqueValues() != null && !request.getUniqueValues().isEmpty()) {
- builder.uniqueValues(buildUniqueValues(request.getUniqueValues()));
- }
- }
-
- if (request.getLimit() != null) {
- builder.limit(request.getLimit());
- }
- if (request.getOffset() != null) {
- builder.offset(request.getOffset());
- }
- return builder.build();
- }
-
- public static GetResponse buildGetResponse(V1GetResponse res) {
- ArrayList> data = new ArrayList<>();
- ArrayList> errors = new ArrayList<>();
- if (res != null && res.getRecords().isPresent()) {
- for (V1RecordResponseObject record : res.getRecords().get()) {
- if (record.getError().isPresent()) {
- HashMap errorRecord = new HashMap<>();
- record.getSkyflowId().ifPresent(skyflowId -> errorRecord.put("skyflowId", skyflowId));
- record.getTableName().ifPresent(tableName -> errorRecord.put("tableName", tableName));
- errorRecord.put("error", record.getError().get());
- record.getHttpCode().ifPresent(httpCode -> errorRecord.put("httpCode", httpCode));
- errors.add(errorRecord);
- } else {
- HashMap getRecord = new HashMap<>();
- if (record.getData().isPresent()) {
- getRecord.putAll(record.getData().get());
- }
- record.getSkyflowId().ifPresent(skyflowId -> getRecord.put("skyflowId", skyflowId));
- record.getTableName().ifPresent(tableName -> getRecord.put("tableName", tableName));
- if (record.getTokens().isPresent()) {
- getRecord.putAll(record.getTokens().get());
- }
- data.add(getRecord);
- }
- }
- }
- return new GetResponse(data, errors);
- }
}
diff --git a/flowvault/src/main/java/com/skyflow/utils/validations/Validations.java b/flowvault/src/main/java/com/skyflow/utils/validations/Validations.java
index 6896e6fe..2be203c4 100644
--- a/flowvault/src/main/java/com/skyflow/utils/validations/Validations.java
+++ b/flowvault/src/main/java/com/skyflow/utils/validations/Validations.java
@@ -3,6 +3,7 @@
import com.skyflow.config.Credentials;
import com.skyflow.config.VaultConfig;
import com.skyflow.enums.InterfaceName;
+import com.skyflow.generated.rest.types.FlowEnumUpdateType;
import com.skyflow.errors.ErrorCode;
import com.skyflow.errors.ErrorMessage;
import com.skyflow.errors.SkyflowException;
@@ -118,7 +119,7 @@ public static void validateCredentials(Credentials credentials) throws SkyflowEx
public static void validateVaultConfiguration(VaultConfig vaultConfig) throws SkyflowException {
String vaultId = vaultConfig.getVaultId();
String clusterId = vaultConfig.getClusterId();
- String vaultURL = vaultConfig.getVaultURL();
+ String vaultUrl = vaultConfig.getVaultUrl();
Credentials credentials = vaultConfig.getCredentials();
if (vaultId == null) {
@@ -131,15 +132,15 @@ public static void validateVaultConfiguration(VaultConfig vaultConfig) throws Sk
validateCredentials(credentials);
}
- if (vaultURL != null) {
- if (vaultURL.trim().isEmpty()) {
+ if (vaultUrl != null) {
+ if (vaultUrl.trim().isEmpty()) {
LogUtil.printErrorLog(ErrorLogs.EMPTY_VAULT_URL.getLog());
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyVaultUrl.getMessage());
- } else if (!Utils.isValidURL(vaultURL)) {
+ } else if (!Utils.isValidUrl(vaultUrl)) {
LogUtil.printErrorLog(ErrorLogs.INVALID_VAULT_URL_FORMAT.getLog());
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidVaultUrlFormat.getMessage());
}
- } else if (Utils.getEnvVaultURL() == null) {
+ } else if (Utils.getEnvVaultUrl() == null) {
if (clusterId == null) {
LogUtil.printErrorLog(ErrorLogs.EITHER_VAULT_URL_OR_CLUSTER_ID_REQUIRED.getLog());
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EitherVaultUrlOrClusterIdRequired.getMessage());
@@ -158,8 +159,7 @@ public static void validateInsertRequest(InsertRequest insertRequest) throws Sky
));
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InsertRequestNull.getMessage());
}
- String table = insertRequest.getTable();
- ArrayList records = insertRequest.getRecords();
+ List records = insertRequest.getRecords();
if (records == null) {
LogUtil.printErrorLog(Utils.parameterizedString(
ErrorLogs.RECORDS_IS_REQUIRED.getLog(), InterfaceName.INSERT.getName()
@@ -172,94 +172,121 @@ public static void validateInsertRequest(InsertRequest insertRequest) throws Sky
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyRecords.getMessage());
}
- for (InsertRecord record : records) {
- if(record == null){
+ for (InsertRequestRecord record : records) {
+ if (record == null) {
LogUtil.printErrorLog(Utils.parameterizedString(
ErrorLogs.INVALID_RECORD.getLog(), InterfaceName.INSERT.getName()
));
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidRecord.getMessage());
}
+ validateUpsertOptions(record.getUpsert());
}
+ validateUpsertOptions(insertRequest.getUpsert());
+ validateTableAndUpsertPlacement(insertRequest, records);
- // table check if specified for both
- if (insertRequest.getTable() != null && !table.trim().isEmpty()){ // if table name specified at both place
- for (InsertRecord record : records) {
- if (record.getTable() != null && !record.getTable().trim().isEmpty()){
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.TABLE_SPECIFIED_AT_BOTH_PLACE.getLog(), InterfaceName.INSERT.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.TableSpecifiedInRequestAndRecordObject.getMessage());
+ for (InsertRequestRecord record : records) {
+ if (record.getData() != null) {
+ for (String key : record.getData().keySet()) {
+ if (key == null || key.trim().isEmpty()) {
+ LogUtil.printErrorLog(Utils.parameterizedString(
+ ErrorLogs.EMPTY_OR_NULL_KEY_IN_VALUES.getLog(), InterfaceName.INSERT.getName()
+ ));
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyKeyInRecords.getMessage());
+ } else {
+ Object value = record.getData().get(key);
+ if (value == null || value.toString().trim().isEmpty()) {
+ LogUtil.printErrorLog(Utils.parameterizedString(
+ ErrorLogs.EMPTY_OR_NULL_VALUE_IN_VALUES.getLog(),
+ InterfaceName.INSERT.getName(), key
+ ));
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyValueInValues.getMessage());
+ }
+ }
}
}
}
- // table check if not specified for both or if missing in any object
- if (insertRequest.getTable() == null || table.trim().isEmpty()){ // if table name specified at both place
- for (InsertRecord record : records) {
- if (record.getTable() == null || record.getTable().trim().isEmpty()){
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.TABLE_NOT_SPECIFIED_AT_BOTH_PLACE.getLog(), InterfaceName.INSERT.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.TableNotSpecifiedInRequestAndRecordObject.getMessage());
- }
- }
+ }
+
+ /**
+ * Table name must live at exactly one level — either on the request, or on every record.
+ * Upsert is optional, but wherever it is supplied it must sit at the same level as the
+ * table name; it need not appear on every record.
+ */
+ private static void validateTableAndUpsertPlacement(
+ InsertRequest insertRequest, List records) throws SkyflowException {
+ boolean tableAtRequest = hasText(insertRequest.getTableName());
+ boolean upsertAtRequest = insertRequest.getUpsert() != null;
+
+ int recordsWithTable = 0;
+ boolean upsertAtRecords = false;
+ for (InsertRequestRecord record : records) {
+ if (hasText(record.getTableName())) recordsWithTable++;
+ if (record.getUpsert() != null) upsertAtRecords = true;
+ }
+ boolean tableAtRecords = recordsWithTable > 0;
+
+ // ── table name: exactly one level ────────────────────────────────────
+ if (tableAtRequest && tableAtRecords) {
+ LogUtil.printErrorLog(Utils.parameterizedString(
+ ErrorLogs.TABLE_SPECIFIED_AT_BOTH_PLACE.getLog(), InterfaceName.INSERT.getName()));
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(),
+ ErrorMessage.TableSpecifiedInRequestAndRecordObject.getMessage());
}
- // upsert check 1
- if (insertRequest.getTable() != null && !table.trim().isEmpty()){ // if table name specified at both place
- for (InsertRecord record : records) {
- if (record.getUpsert() != null && record.getUpsert().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_UPSERT_VALUES.getLog(), InterfaceName.INSERT.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyUpsertValues.getMessage());
- }
- if (record.getUpsert() != null && !record.getUpsert().isEmpty()){
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.UPSERT_TABLE_REQUEST_AT_RECORD_LEVEL.getLog(), InterfaceName.INSERT.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.UpsertTableRequestAtRecordLevel.getMessage());
- }
- }
+ if (!tableAtRequest && recordsWithTable != records.size()) {
+ LogUtil.printErrorLog(Utils.parameterizedString(
+ ErrorLogs.TABLE_NOT_SPECIFIED_AT_BOTH_PLACE.getLog(), InterfaceName.INSERT.getName()));
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(),
+ ErrorMessage.TableNotSpecifiedInRequestAndRecordObject.getMessage());
}
- // upsert check 2
- if (insertRequest.getTable() == null || table.trim().isEmpty()){
- if (insertRequest.getUpsert() != null && !insertRequest.getUpsert().isEmpty()){
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.UPSERT_TABLE_REQUEST_AT_REQUEST_LEVEL.getLog(), InterfaceName.INSERT.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.UpsertTableRequestAtRequestLevel.getMessage());
- }
+
+ // ── upsert (optional) must match the table name's level ──────────────
+ if (upsertAtRecords && !tableAtRecords) {
+ LogUtil.printErrorLog(Utils.parameterizedString(
+ ErrorLogs.UPSERT_TABLE_REQUEST_AT_RECORD_LEVEL.getLog(), InterfaceName.INSERT.getName()));
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(),
+ ErrorMessage.UpsertTableRequestAtRecordLevel.getMessage());
+ }
+ if (upsertAtRequest && !tableAtRequest) {
+ LogUtil.printErrorLog(Utils.parameterizedString(
+ ErrorLogs.UPSERT_TABLE_REQUEST_AT_REQUEST_LEVEL.getLog(), InterfaceName.INSERT.getName()));
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(),
+ ErrorMessage.UpsertTableRequestAtRequestLevel.getMessage());
}
+ }
- if (insertRequest.getUpsert() != null && insertRequest.getUpsert().isEmpty()) {
+ private static boolean hasText(String value) {
+ return value != null && !value.trim().isEmpty();
+ }
+
+ private static void validateUpsertOptions(UpsertOptions upsert) throws SkyflowException {
+ if (upsert == null) {
+ return;
+ }
+ if (upsert.getUniqueColumns() == null || upsert.getUniqueColumns().isEmpty()) {
LogUtil.printErrorLog(Utils.parameterizedString(
ErrorLogs.EMPTY_UPSERT_VALUES.getLog(), InterfaceName.INSERT.getName()
));
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyUpsertValues.getMessage());
}
+ // updateType is a free-form String on the request, but only the wire enum's values reach
+ // the wire. Reject anything else here rather than silently dropping it during mapping.
+ String updateType = upsert.getUpdateType();
+ if (updateType != null && !isKnownUpdateType(updateType)) {
+ LogUtil.printErrorLog(Utils.parameterizedString(
+ ErrorLogs.INVALID_UPSERT_UPDATE_TYPE.getLog(), InterfaceName.INSERT.getName()
+ ));
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(),
+ ErrorMessage.InvalidUpsertUpdateType.getMessage());
+ }
+ }
- for (InsertRecord record : records) {
- if (record != null ) {
- if (record.getData() != null){
- for (String key : record.getData().keySet()) {
- if (key == null || key.trim().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_OR_NULL_KEY_IN_VALUES.getLog(), InterfaceName.INSERT.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyKeyInRecords.getMessage());
- } else {
- Object value = record.getData().get(key);
- if (value == null || value.toString().trim().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_OR_NULL_VALUE_IN_VALUES.getLog(),
- InterfaceName.INSERT.getName(), key
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyValueInValues.getMessage());
- }
- }
- }
- }
+ private static boolean isKnownUpdateType(String updateType) {
+ for (FlowEnumUpdateType type : FlowEnumUpdateType.values()) {
+ if (type.toString().equalsIgnoreCase(updateType)) {
+ return true;
}
}
+ return false;
}
public static void validateDetokenizeRequest(DetokenizeRequest request) throws SkyflowException {
@@ -269,7 +296,7 @@ public static void validateDetokenizeRequest(DetokenizeRequest request) throws S
));
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.DetokenizeRequestNull.getMessage());
}
- ArrayList tokens = request.getDetokenizeData();
+ List tokens = request.getTokens();
if (tokens == null || tokens.isEmpty()) {
LogUtil.printErrorLog(Utils.parameterizedString(
ErrorLogs.EMPTY_DETOKENIZE_DATA.getLog(), InterfaceName.DETOKENIZE.getName()
@@ -278,8 +305,8 @@ public static void validateDetokenizeRequest(DetokenizeRequest request) throws S
}
for (int index = 0; index < tokens.size(); index++) {
- DetokenizeData token = tokens.get(index);
- if (token == null || token.getToken() == null || token.getToken().trim().isEmpty()) {
+ String token = tokens.get(index);
+ if (token == null || token.trim().isEmpty()) {
LogUtil.printErrorLog(Utils.parameterizedString(
ErrorLogs.EMPTY_OR_NULL_TOKEN_IN_DETOKENIZE_DATA.getLog(),
InterfaceName.DETOKENIZE.getName(),
@@ -310,239 +337,42 @@ public static void validateDetokenizeRequest(DetokenizeRequest request) throws S
}
- public static void validateDeleteTokensRequest(DeleteTokensRequest request) throws SkyflowException {
- if (request == null) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.DELETE_TOKENS_REQUEST_NULL.getLog(), InterfaceName.DELETE.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.DeleteTokensRequestNull.getMessage());
- }
- List tokens = request.getTokens();
- if (tokens == null || tokens.isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_DELETE_TOKENS_DATA.getLog(), InterfaceName.DELETE.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyDeleteTokensData.getMessage());
- }
-
- for (int index = 0; index < tokens.size(); index++) {
- String token = tokens.get(index);
- if (token == null || token.trim().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_OR_NULL_TOKEN_IN_DELETE_TOKENS_DATA.getLog(),
- InterfaceName.DELETE.getName(),
- String.valueOf(index)));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyTokenInDeleteTokensData.getMessage());
- }
- }
- }
+ // ── Bulk (batched/concurrent) request validations ────────────────────────
- public static void validateTokenizeRequest(TokenizeRequest request) throws SkyflowException {
- if (request == null) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.TOKENIZE_REQUEST_NULL.getLog(), InterfaceName.TOKENIZE.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.TokenizeRequestNull.getMessage());
- }
- ArrayList data = request.getData();
- if (data == null || data.isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_TOKENIZE_DATA.getLog(), InterfaceName.TOKENIZE.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyTokenizeData.getMessage());
- }
- for (int index = 0; index < data.size(); index++) {
- TokenizeRecord record = data.get(index);
- if (record == null) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.TOKENIZE_RECORD_NULL.getLog(), InterfaceName.TOKENIZE.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.TokenizeRecordNull.getMessage());
- }
- Object value = record.getValue();
- boolean isInvalidValue = value == null || (value instanceof String && ((String) value).trim().isEmpty());
- if (isInvalidValue) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_VALUE_IN_TOKENIZE_RECORD.getLog(), InterfaceName.TOKENIZE.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyValueInTokenizeRecord.getMessage());
- }
- List tokenGroupNames = record.getTokenGroupNames();
- if (tokenGroupNames == null || tokenGroupNames.isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_TOKEN_GROUP_NAMES_IN_TOKENIZE_RECORD.getLog(), InterfaceName.TOKENIZE.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyTokenGroupNamesInTokenizeRecord.getMessage());
- }
- for (int groupIndex = 0; groupIndex < tokenGroupNames.size(); groupIndex++) {
- String groupName = tokenGroupNames.get(groupIndex);
- if (groupName == null || groupName.trim().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_TOKEN_GROUP_NAME_IN_TOKENIZE_RECORD.getLog(),
- InterfaceName.TOKENIZE.getName(),
- String.valueOf(groupIndex)));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyTokenGroupNameInTokenizeRecord.getMessage());
- }
- }
+ // BulkInsertRequest is an InsertRequest with no extra state, so the field rules are identical.
+ // The one addition: records must be BulkInsertRequestRecord, since BulkInsertResponse hands
+ // them back as such from getRecordsToRetry(). `records` is typed to the parent (it is
+ // inherited), so this is enforced here rather than by the compiler.
+ // The service accepts at most Constants.MAX_BULK_DATA_SIZE items per bulk call; batching
+ // splits the payload but does not lift that ceiling.
+ private static void validateBulkDataSize(
+ int size, ErrorLogs log, ErrorMessage message, InterfaceName interfaceName) throws SkyflowException {
+ if (size > Constants.MAX_BULK_DATA_SIZE) {
+ LogUtil.printErrorLog(Utils.parameterizedString(log.getLog(), interfaceName.getName()));
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), message.getMessage());
}
}
- // ── Bulk (batched/concurrent) request validations ────────────────────────
-
public static void validateBulkInsertRequest(BulkInsertRequest insertRequest) throws SkyflowException {
- if (insertRequest == null) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.INSERT_REQUEST_NULL.getLog(), InterfaceName.INSERT.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InsertRequestNull.getMessage());
- }
- String table = insertRequest.getTable();
- ArrayList records = insertRequest.getRecords();
- if (records == null) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.RECORDS_IS_REQUIRED.getLog(), InterfaceName.INSERT.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.RecordsKeyError.getMessage());
- } else if (records.isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_RECORDS.getLog(), InterfaceName.INSERT.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyRecords.getMessage());
- }
+ validateInsertRequest(insertRequest);
+ validateBulkDataSize(insertRequest.getRecords().size(), ErrorLogs.RECORD_SIZE_EXCEED,
+ ErrorMessage.RecordSizeExceedError, InterfaceName.INSERT);
- for (BulkInsertRecord record : records) {
- if (record == null) {
+ for (InsertRequestRecord record : insertRequest.getRecords()) {
+ if (!(record instanceof BulkInsertRequestRecord)) {
LogUtil.printErrorLog(Utils.parameterizedString(
ErrorLogs.INVALID_RECORD.getLog(), InterfaceName.INSERT.getName()
));
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidRecord.getMessage());
}
}
-
- // table check if specified for both
- if (insertRequest.getTable() != null && !table.trim().isEmpty()) {
- for (BulkInsertRecord record : records) {
- if (record.getTable() != null && !record.getTable().trim().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.TABLE_SPECIFIED_AT_BOTH_PLACE.getLog(), InterfaceName.INSERT.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.TableSpecifiedInRequestAndRecordObject.getMessage());
- }
- }
- }
- // table check if not specified for both or if missing in any object
- if (insertRequest.getTable() == null || table.trim().isEmpty()) {
- for (BulkInsertRecord record : records) {
- if (record.getTable() == null || record.getTable().trim().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.TABLE_NOT_SPECIFIED_AT_BOTH_PLACE.getLog(), InterfaceName.INSERT.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.TableNotSpecifiedInRequestAndRecordObject.getMessage());
- }
- }
- }
- // upsert check 1
- if (insertRequest.getTable() != null && !table.trim().isEmpty()) {
- for (BulkInsertRecord record : records) {
- if (record.getUpsert() != null && record.getUpsert().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_UPSERT_VALUES.getLog(), InterfaceName.INSERT.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyUpsertValues.getMessage());
- }
- if (record.getUpsert() != null && !record.getUpsert().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.UPSERT_TABLE_REQUEST_AT_RECORD_LEVEL.getLog(), InterfaceName.INSERT.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.UpsertTableRequestAtRecordLevel.getMessage());
- }
- }
- }
- // upsert check 2
- if (insertRequest.getTable() == null || table.trim().isEmpty()) {
- if (insertRequest.getUpsert() != null && !insertRequest.getUpsert().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.UPSERT_TABLE_REQUEST_AT_REQUEST_LEVEL.getLog(), InterfaceName.INSERT.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.UpsertTableRequestAtRequestLevel.getMessage());
- }
- }
-
- if (insertRequest.getUpsert() != null && insertRequest.getUpsert().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_UPSERT_VALUES.getLog(), InterfaceName.INSERT.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyUpsertValues.getMessage());
- }
-
- for (BulkInsertRecord record : records) {
- if (record.getData() != null) {
- for (String key : record.getData().keySet()) {
- if (key == null || key.trim().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_OR_NULL_KEY_IN_VALUES.getLog(), InterfaceName.INSERT.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyKeyInRecords.getMessage());
- } else {
- Object value = record.getData().get(key);
- if (value == null || value.toString().trim().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_OR_NULL_VALUE_IN_VALUES.getLog(),
- InterfaceName.INSERT.getName(), key
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyValueInValues.getMessage());
- }
- }
- }
- }
- }
}
+ // BulkDetokenizeRequest is a DetokenizeRequest with no extra state, so the rules are identical.
public static void validateBulkDetokenizeRequest(BulkDetokenizeRequest request) throws SkyflowException {
- if (request == null) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.DETOKENIZE_REQUEST_NULL.getLog(), InterfaceName.DETOKENIZE.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.DetokenizeRequestNull.getMessage());
- }
- List tokens = request.getTokens();
- if (tokens == null || tokens.isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_DETOKENIZE_DATA.getLog(), InterfaceName.DETOKENIZE.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyDetokenizeData.getMessage());
- }
-
- for (int index = 0; index < tokens.size(); index++) {
- String token = tokens.get(index);
- if (token == null || token.trim().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_OR_NULL_TOKEN_IN_DETOKENIZE_DATA.getLog(),
- InterfaceName.DETOKENIZE.getName(),
- String.valueOf(index)));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyTokenInDetokenizeData.getMessage());
- }
- }
-
- List groupRedactions = request.getTokenGroupRedactions();
- if (groupRedactions != null && !groupRedactions.isEmpty()) {
- for (BulkTokenGroupRedactions group : groupRedactions) {
- if (group == null) {
- LogUtil.printErrorLog(Utils.parameterizedString(ErrorLogs.NULL_TOKEN_REDACTION_GROUP_OBJECT.getLog(), InterfaceName.DETOKENIZE.getName()));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.NullTokenGroupRedactions.getMessage());
- }
- String groupName = group.getTokenGroupName();
- String redaction = group.getRedaction();
- if (groupName == null || groupName.trim().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(ErrorLogs.NULL_TOKEN_GROUP_NAME_IN_TOKEN_GROUP.getLog(), InterfaceName.DETOKENIZE.getName()));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.NullTokenGroupNameInTokenGroup.getMessage());
- }
- if (redaction == null || redaction.trim().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(ErrorLogs.EMPTY_OR_NULL_REDACTION_IN_TOKEN_GROUP.getLog(), InterfaceName.DETOKENIZE.getName()));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.NullRedactionInTokenGroup.getMessage());
- }
- }
- }
+ validateDetokenizeRequest(request);
+ validateBulkDataSize(request.getTokens().size(), ErrorLogs.TOKENS_SIZE_EXCEED,
+ ErrorMessage.TokensSizeExceedError, InterfaceName.DETOKENIZE);
}
public static void validateBulkDeleteTokensRequest(BulkDeleteTokensRequest request) throws SkyflowException {
@@ -559,6 +389,8 @@ public static void validateBulkDeleteTokensRequest(BulkDeleteTokensRequest reque
));
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyDeleteTokensData.getMessage());
}
+ validateBulkDataSize(tokens.size(), ErrorLogs.DELETE_TOKENS_SIZE_EXCEED,
+ ErrorMessage.DeleteTokensSizeExceedError, InterfaceName.DELETE);
for (int index = 0; index < tokens.size(); index++) {
String token = tokens.get(index);
@@ -586,6 +418,8 @@ public static void validateBulkTokenizeRequest(BulkTokenizeRequest request) thro
));
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyTokenizeData.getMessage());
}
+ validateBulkDataSize(data.size(), ErrorLogs.TOKENIZE_DATA_SIZE_EXCEED,
+ ErrorMessage.TokenizeDataSizeExceedError, InterfaceName.TOKENIZE);
for (int i = 0; i < data.size(); i++) {
BulkTokenizeRecord record = data.get(i);
if (record == null) {
@@ -620,165 +454,4 @@ public static void validateBulkTokenizeRequest(BulkTokenizeRequest request) thro
}
}
- public static void validateQueryRequest(QueryRequest queryRequest) throws SkyflowException {
- String query = queryRequest.getQuery();
- if (query == null) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.QUERY_IS_REQUIRED.getLog(), InterfaceName.QUERY.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.QueryKeyError.getMessage());
- } else if (query.trim().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_QUERY.getLog(), InterfaceName.QUERY.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyQuery.getMessage());
- }
- }
-
- public static void validateGetRequest(GetRequest getRequest) throws SkyflowException {
- String table = getRequest.getTable();
- ArrayList ids = getRequest.getIds();
- ArrayList fields = getRequest.getFields();
- List> uniqueValues = getRequest.getUniqueValues();
- List columnRedactions = getRequest.getColumnRedactions();
- List records = getRequest.getRecords();
-
- boolean hasSingleTableFields = table != null || ids != null || fields != null
- || uniqueValues != null || columnRedactions != null;
- boolean hasRecords = records != null && !records.isEmpty();
-
- if (hasRecords) {
- if (hasSingleTableFields) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.BOTH_SINGLE_TABLE_FIELDS_AND_RECORDS_PASSED.getLog(), InterfaceName.GET.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.BothSingleTableFieldsAndRecordsSpecified.getMessage());
- }
- for (GetRecordRequest record : records) {
- if (record == null) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.NULL_GET_RECORD_REQUEST_OBJECT.getLog(), InterfaceName.GET.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.NullGetRecordRequest.getMessage());
- }
- validateSingleTableLookup(record.getTable(), record.getIds(), record.getFields(),
- record.getUniqueValues(), record.getColumnRedactions());
- }
- } else {
- validateSingleTableLookup(table, ids, fields, uniqueValues, columnRedactions);
- }
- }
-
- private static void validateSingleTableLookup(
- String table, ArrayList ids, ArrayList fields,
- List> uniqueValues, List columnRedactions
- ) throws SkyflowException {
- if (table == null) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.TABLE_IS_REQUIRED.getLog(), InterfaceName.GET.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.TableKeyError.getMessage());
- } else if (table.trim().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_TABLE_NAME.getLog(), InterfaceName.GET.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyTable.getMessage());
- }
-
- if (ids != null) {
- if (ids.isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_IDS.getLog(), InterfaceName.GET.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyIds.getMessage());
- } else {
- for (int index = 0; index < ids.size(); index++) {
- String id = ids.get(index);
- if (id == null || id.trim().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_OR_NULL_ID_IN_IDS.getLog(),
- InterfaceName.GET.getName(), String.valueOf(index)
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyIdInIds.getMessage());
- }
- }
- }
- }
-
- if (fields != null) {
- if (fields.isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_FIELDS.getLog(), InterfaceName.GET.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyFields.getMessage());
- } else {
- for (int index = 0; index < fields.size(); index++) {
- String field = fields.get(index);
- if (field == null || field.trim().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_OR_NULL_FIELD_IN_FIELDS.getLog(),
- InterfaceName.GET.getName(), String.valueOf(index)
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyFieldInFields.getMessage());
- }
- }
- }
- }
-
- if (ids == null && uniqueValues == null) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.NEITHER_IDS_NOR_UNIQUE_VALUES_PASSED.getLog(), InterfaceName.GET.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.IdsOrUniqueValuesKeyError.getMessage());
- } else if (ids != null && uniqueValues != null) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.BOTH_IDS_AND_UNIQUE_VALUES_PASSED.getLog(), InterfaceName.GET.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.BothIdsAndUniqueValuesSpecified.getMessage());
- } else if (uniqueValues != null) {
- if (uniqueValues.isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_UNIQUE_VALUES.getLog(), InterfaceName.GET.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyUniqueValues.getMessage());
- } else {
- for (int index = 0; index < uniqueValues.size(); index++) {
- Map uniqueValue = uniqueValues.get(index);
- if (uniqueValue == null || uniqueValue.isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_OR_NULL_UNIQUE_VALUE_IN_UNIQUE_VALUES.getLog(),
- InterfaceName.GET.getName(), String.valueOf(index)
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyUniqueValueInUniqueValues.getMessage());
- }
- }
- }
- }
-
- if (columnRedactions != null && !columnRedactions.isEmpty()) {
- for (ColumnRedaction columnRedaction : columnRedactions) {
- if (columnRedaction == null) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.NULL_COLUMN_REDACTION_OBJECT.getLog(), InterfaceName.GET.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.NullColumnRedactions.getMessage());
- }
- String columnName = columnRedaction.getColumnName();
- String redaction = columnRedaction.getRedaction();
- if (columnName == null || columnName.trim().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.NULL_COLUMN_NAME_IN_COLUMN_REDACTION.getLog(), InterfaceName.GET.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.NullColumnNameInColumnRedaction.getMessage());
- }
- if (redaction == null || redaction.trim().isEmpty()) {
- LogUtil.printErrorLog(Utils.parameterizedString(
- ErrorLogs.EMPTY_OR_NULL_REDACTION_IN_COLUMN_REDACTION.getLog(), InterfaceName.GET.getName()
- ));
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.NullRedactionInColumnRedaction.getMessage());
- }
- }
- }
- }
-
}
diff --git a/flowvault/src/main/java/com/skyflow/vault/controller/VaultController.java b/flowvault/src/main/java/com/skyflow/vault/controller/VaultController.java
index 342346e8..cbe697e6 100644
--- a/flowvault/src/main/java/com/skyflow/vault/controller/VaultController.java
+++ b/flowvault/src/main/java/com/skyflow/vault/controller/VaultController.java
@@ -1,5 +1,13 @@
package com.skyflow.vault.controller;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject;
@@ -8,7 +16,6 @@
import com.skyflow.config.VaultConfig;
import com.skyflow.errors.SkyflowException;
import com.skyflow.generated.rest.core.ApiClientApiException;
-import com.skyflow.generated.rest.core.ApiClientException;
import com.skyflow.generated.rest.core.ApiClientHttpResponse;
import com.skyflow.generated.rest.core.RequestOptions;
import com.skyflow.generated.rest.resources.flowservice.requests.V1InsertRequest;
@@ -16,7 +23,6 @@
import com.skyflow.generated.rest.types.V1FlowTokenizeResponse;
import com.skyflow.generated.rest.types.V1InsertRecordData;
import com.skyflow.generated.rest.types.V1InsertResponse;
-import com.skyflow.generated.rest.types.V1Upsert;
import com.skyflow.logs.ErrorLogs;
import com.skyflow.logs.InfoLogs;
import com.skyflow.logs.WarningLogs;
@@ -24,22 +30,32 @@
import com.skyflow.utils.Utils;
import com.skyflow.utils.logger.LogUtil;
import com.skyflow.utils.validations.Validations;
-import com.skyflow.vault.data.*;
+import com.skyflow.vault.data.BulkDeleteTokensRequest;
+import com.skyflow.vault.data.BulkDeleteTokensResponse;
+import com.skyflow.vault.data.BulkDetokenizeRequest;
+import com.skyflow.vault.data.BulkDetokenizeResponse;
+import com.skyflow.vault.data.BulkDetokenizeResponseRecord;
+import com.skyflow.vault.data.BulkInsertRequest;
+import com.skyflow.vault.data.BulkInsertResponse;
+import com.skyflow.vault.data.BulkInsertResponseRecord;
+import com.skyflow.vault.data.BulkTokenizeRecord;
+import com.skyflow.vault.data.BulkTokenizeRequest;
+import com.skyflow.vault.data.BulkTokenizeResponse;
+import com.skyflow.vault.data.DeleteTokensOptions;
+import com.skyflow.vault.data.DeleteTokensSuccess;
+import com.skyflow.vault.data.DetokenizeOptions;
+import com.skyflow.vault.data.ErrorRecord;
+import com.skyflow.vault.data.InsertOptions;
+import com.skyflow.vault.data.InsertRequestRecord;
+import com.skyflow.vault.data.RequestContext;
+import com.skyflow.vault.data.RequestInterceptor;
+import com.skyflow.vault.data.TokenizeOptions;
+import com.skyflow.vault.data.TokenizeSuccess;
+
import io.github.cdimascio.dotenv.Dotenv;
import io.github.cdimascio.dotenv.DotenvException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import static com.skyflow.utils.Utils.*;
-
-public final class VaultController extends VaultClient
- implements IVaultController {
+public final class VaultController extends VaultClient {
private static final Gson gson = new GsonBuilder().serializeNulls().create();
private JsonObject metrics = Utils.getMetrics();
@@ -70,190 +86,6 @@ private RequestOptions buildRequestOptions(RequestContext context) {
return builder.build();
}
- @Override
- public InsertResponse insert(InsertRequest request) throws SkyflowException {
- return insert(request, null);
- }
-
- public InsertResponse insert(InsertRequest request, InsertOptions options) throws SkyflowException {
- try {
- LogUtil.printInfoLog(InfoLogs.INSERT_TRIGGERED.getLog());
- LogUtil.printInfoLog(InfoLogs.VALIDATE_INSERT_REQUEST.getLog());
- Validations.validateInsertRequest(request);
- setBearerToken();
- V1InsertRequest insertRequest = getBulkInsertRequestBody(request, super.getVaultConfig());
- RequestInterceptor interceptor = options != null ? options.getInterceptor() : null;
- RequestContext ctx = new RequestContext("INSERT");
- if (interceptor != null) interceptor.intercept(ctx);
- V1InsertResponse response = this.getRecordsApi().withRawResponse().insert(insertRequest, buildRequestOptions(ctx)).body();
- return buildInsertResponse(response);
- } catch (ApiClientApiException e) {
- String bodyString = gson.toJson(e.body());
- LogUtil.printErrorLog(ErrorLogs.INSERT_RECORDS_REJECTED.getLog());
- throw new SkyflowException(e.statusCode(), e, e.headers(), bodyString);
- } catch (ApiClientException e) {
- LogUtil.printErrorLog(ErrorLogs.INSERT_RECORDS_REJECTED.getLog());
- throw new SkyflowException(e.getMessage());
- }
- }
-
- @Override
- public DetokenizeResponse detokenize(DetokenizeRequest request) throws SkyflowException {
- return detokenize(request, null);
- }
-
- public DetokenizeResponse detokenize(DetokenizeRequest request, DetokenizeOptions options) throws SkyflowException {
- try {
- LogUtil.printInfoLog(InfoLogs.DETOKENIZE_TRIGGERED.getLog());
- LogUtil.printInfoLog(InfoLogs.VALIDATE_DETOKENIZE_REQUEST.getLog());
- Validations.validateDetokenizeRequest(request);
- setBearerToken();
-
- com.skyflow.generated.rest.resources.flowservice.requests.V1FlowDetokenizeRequest requestDetokenize = getDetokenizeRequestBody(request, this.getVaultConfig().getVaultId());
- RequestInterceptor interceptor = options != null ? options.getInterceptor() : null;
- RequestContext ctx = new RequestContext("DETOKENIZE");
- if (interceptor != null) interceptor.intercept(ctx);
- com.skyflow.generated.rest.types.V1FlowDetokenizeResponse response = this.getRecordsApi().withRawResponse().detokenize(requestDetokenize, buildRequestOptions(ctx)).body();
-
- return buildDetokenizeResponse(response);
- } catch (ApiClientApiException e) {
- String bodyString = gson.toJson(e.body());
- LogUtil.printErrorLog(ErrorLogs.DETOKENIZE_REQUEST_REJECTED.getLog());
- throw new SkyflowException(e.statusCode(), e, e.headers(), bodyString);
- } catch (ApiClientException e) {
- LogUtil.printErrorLog(ErrorLogs.DETOKENIZE_REQUEST_REJECTED.getLog());
- throw new SkyflowException(e.getMessage());
- }
- }
-
- public TokenizeResponse tokenize(TokenizeRequest request) throws SkyflowException {
- return tokenize(request, null);
- }
-
- public TokenizeResponse tokenize(TokenizeRequest request, TokenizeOptions options) throws SkyflowException {
- try {
- LogUtil.printInfoLog(InfoLogs.TOKENIZE_TRIGGERED.getLog());
- LogUtil.printInfoLog(InfoLogs.VALIDATING_TOKENIZE_REQUEST.getLog());
- Validations.validateTokenizeRequest(request);
- setBearerToken();
-
- com.skyflow.generated.rest.resources.flowservice.requests.V1FlowTokenizeRequest requestTokenize = getTokenizeRequestBody(request, this.getVaultConfig().getVaultId());
- RequestInterceptor interceptor = options != null ? options.getInterceptor() : null;
- RequestContext ctx = new RequestContext("TOKENIZE");
- if (interceptor != null) interceptor.intercept(ctx);
- ApiClientHttpResponse response = this.getRecordsApi().withRawResponse().tokenize(requestTokenize, buildRequestOptions(ctx));
- LogUtil.printInfoLog(InfoLogs.TOKENIZE_REQUEST_RESOLVED.getLog());
-
- TokenizeResponse tokenizeResponse = buildTokenizeResponse(response.body(), response.headers(), request.getData().size());
- LogUtil.printInfoLog(InfoLogs.TOKENIZE_SUCCESS.getLog());
- return tokenizeResponse;
- } catch (ApiClientApiException e) {
- String bodyString = gson.toJson(e.body());
- LogUtil.printErrorLog(ErrorLogs.TOKENIZE_REQUEST_REJECTED.getLog());
- throw new SkyflowException(e.statusCode(), e, e.headers(), bodyString);
- } catch (ApiClientException e) {
- LogUtil.printErrorLog(ErrorLogs.TOKENIZE_REQUEST_REJECTED.getLog());
- throw new SkyflowException(e.getMessage());
- }
- }
-
- public DeleteTokensResponse deleteTokens(DeleteTokensRequest request) throws SkyflowException {
- return deleteTokens(request, null);
- }
-
- public DeleteTokensResponse deleteTokens(DeleteTokensRequest request, DeleteTokensOptions options) throws SkyflowException {
- try {
- LogUtil.printInfoLog(InfoLogs.DELETE_TOKENS_TRIGGERED.getLog());
- LogUtil.printInfoLog(InfoLogs.VALIDATE_DELETE_TOKENS_REQUEST.getLog());
- Validations.validateDeleteTokensRequest(request);
- setBearerToken();
-
- com.skyflow.generated.rest.resources.flowservice.requests.V1FlowDeleteTokenRequest requestDeleteTokens = getDeleteTokensRequestBody(request, this.getVaultConfig().getVaultId());
- RequestInterceptor interceptor = options != null ? options.getInterceptor() : null;
- RequestContext ctx = new RequestContext("DELETE_TOKENS");
- if (interceptor != null) interceptor.intercept(ctx);
- ApiClientHttpResponse response = this.getRecordsApi().withRawResponse().deletetoken(requestDeleteTokens, buildRequestOptions(ctx));
- LogUtil.printInfoLog(InfoLogs.DELETE_TOKENS_REQUEST_RESOLVED.getLog());
-
- DeleteTokensResponse deleteTokensResponse = buildDeleteTokensResponse(response.body(), response.headers(), request.getTokens().size());
- LogUtil.printInfoLog(InfoLogs.DELETE_TOKENS_SUCCESS.getLog());
- return deleteTokensResponse;
- } catch (ApiClientApiException e) {
- String bodyString = gson.toJson(e.body());
- LogUtil.printErrorLog(ErrorLogs.DELETE_TOKENS_REQUEST_REJECTED.getLog());
- throw new SkyflowException(e.statusCode(), e, e.headers(), bodyString);
- } catch (ApiClientException e) {
- LogUtil.printErrorLog(ErrorLogs.DELETE_TOKENS_REQUEST_REJECTED.getLog());
- throw new SkyflowException(e.getMessage());
- }
- }
-
- public QueryResponse query(QueryRequest queryRequest) throws SkyflowException {
- return query(queryRequest, null);
- }
-
- public QueryResponse query(QueryRequest queryRequest, QueryOptions options) throws SkyflowException {
- try {
- LogUtil.printInfoLog(InfoLogs.QUERY_TRIGGERED.getLog());
- LogUtil.printInfoLog(InfoLogs.VALIDATING_QUERY_REQUEST.getLog());
- Validations.validateQueryRequest(queryRequest);
- setBearerToken();
-
- com.skyflow.generated.rest.resources.records.requests.V1ExecuteQueryRequest requestBody =
- getQueryRequestBody(queryRequest, this.getVaultConfig().getVaultId());
- RequestInterceptor interceptor = options != null ? options.getInterceptor() : null;
- RequestContext ctx = new RequestContext("QUERY");
- if (interceptor != null) interceptor.intercept(ctx);
- com.skyflow.generated.rest.types.V1ExecuteQueryResponse response =
- this.getQueryApi().withRawResponse().flowServiceExecuteQuery(requestBody, buildRequestOptions(ctx)).body();
- LogUtil.printInfoLog(InfoLogs.QUERY_REQUEST_RESOLVED.getLog());
-
- QueryResponse queryResponse = buildQueryResponse(response);
- LogUtil.printInfoLog(InfoLogs.QUERY_SUCCESS.getLog());
- return queryResponse;
- } catch (ApiClientApiException e) {
- String bodyString = gson.toJson(e.body());
- LogUtil.printErrorLog(ErrorLogs.QUERY_REQUEST_REJECTED.getLog());
- throw new SkyflowException(e.statusCode(), e, e.headers(), bodyString);
- } catch (ApiClientException e) {
- LogUtil.printErrorLog(ErrorLogs.QUERY_REQUEST_REJECTED.getLog());
- throw new SkyflowException(e.getMessage());
- }
- }
-
- public GetResponse get(GetRequest getRequest) throws SkyflowException {
- return get(getRequest, null);
- }
-
- public GetResponse get(GetRequest getRequest, GetOptions options) throws SkyflowException {
- try {
- LogUtil.printInfoLog(InfoLogs.GET_TRIGGERED.getLog());
- LogUtil.printInfoLog(InfoLogs.VALIDATE_GET_REQUEST.getLog());
- Validations.validateGetRequest(getRequest);
- setBearerToken();
-
- com.skyflow.generated.rest.resources.flowservice.requests.V1GetRequest requestBody =
- getGetRequestBody(getRequest, this.getVaultConfig().getVaultId());
- RequestInterceptor interceptor = options != null ? options.getInterceptor() : null;
- RequestContext ctx = new RequestContext("GET");
- if (interceptor != null) interceptor.intercept(ctx);
- com.skyflow.generated.rest.types.V1GetResponse response =
- this.getRecordsApi().withRawResponse().get(requestBody, buildRequestOptions(ctx)).body();
- LogUtil.printInfoLog(InfoLogs.GET_REQUEST_RESOLVED.getLog());
-
- GetResponse getResponse = buildGetResponse(response);
- LogUtil.printInfoLog(InfoLogs.GET_SUCCESS.getLog());
- return getResponse;
- } catch (ApiClientApiException e) {
- String bodyString = gson.toJson(e.body());
- LogUtil.printErrorLog(ErrorLogs.GET_REQUEST_REJECTED.getLog());
- throw new SkyflowException(e.statusCode(), e, e.headers(), bodyString);
- } catch (ApiClientException e) {
- LogUtil.printErrorLog(ErrorLogs.GET_REQUEST_REJECTED.getLog());
- throw new SkyflowException(e.getMessage());
- }
- }
-
// ── Bulk Insert ───────────────────────────────────────────────────────────
public BulkInsertResponse bulkInsert(BulkInsertRequest insertRequest) throws SkyflowException {
@@ -300,26 +132,20 @@ public CompletableFuture bulkInsertAsync(BulkInsertRequest i
setBearerToken();
V1InsertRequest request = Utils.getBulkInsertRequestBody(insertRequest, this.getVaultConfig());
RequestInterceptor interceptor = options != null ? options.getInterceptor() : null;
- List errorRecords = Collections.synchronizedList(new ArrayList<>());
- List> futures = this.insertBatchFutures(request, errorRecords, interceptor, cfg);
+ List> futures = this.insertBatchFutures(request, interceptor, cfg);
return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
.thenApply(v -> {
- List successRecords = new ArrayList<>();
+ List records = new ArrayList<>();
for (CompletableFuture future : futures) {
BulkInsertResponse futureResponse = future.join();
- if (futureResponse != null) {
- if (futureResponse.getSuccess() != null) {
- successRecords.addAll(futureResponse.getSuccess());
- }
- if (futureResponse.getErrors() != null) {
- errorRecords.addAll(futureResponse.getErrors());
- }
+ if (futureResponse != null && futureResponse.getRecords() != null) {
+ records.addAll(futureResponse.getRecords());
}
}
- return new BulkInsertResponse(successRecords, errorRecords, insertRequest.getRecords());
+ return new BulkInsertResponse(records, insertRequest.getRecords());
});
} catch (ApiClientApiException e) {
String bodyString = gson.toJson(e.body());
@@ -375,29 +201,23 @@ public CompletableFuture bulkDetokenizeAsync(BulkDetoken
LogUtil.printInfoLog(InfoLogs.PROCESSING_BATCHES.getLog());
- List errorTokens = Collections.synchronizedList(new ArrayList<>());
- List successRecords = new ArrayList<>();
+ List records = new ArrayList<>();
List batches =
Utils.createBulkDetokenizeBatches(request, cfg.batchSize);
executor = Executors.newFixedThreadPool(cfg.concurrencyLimit);
- List> futures = this.detokenizeBatchFutures(executor, batches, errorTokens, interceptor, cfg.batchSize);
+ List> futures = this.detokenizeBatchFutures(executor, batches, interceptor, cfg.batchSize);
return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
.thenApply(v -> {
for (CompletableFuture future : futures) {
BulkDetokenizeResponse futureResponse = future.join();
- if (futureResponse != null) {
- if (futureResponse.getSuccess() != null) {
- successRecords.addAll(futureResponse.getSuccess());
- }
- if (futureResponse.getErrors() != null) {
- errorTokens.addAll(futureResponse.getErrors());
- }
+ if (futureResponse != null && futureResponse.getRecords() != null) {
+ records.addAll(futureResponse.getRecords());
}
}
LogUtil.printInfoLog(InfoLogs.DETOKENIZE_REQUEST_RESOLVED.getLog());
- return new BulkDetokenizeResponse(successRecords, errorTokens, detokenizeRequest.getTokens());
+ return new BulkDetokenizeResponse(records, detokenizeRequest.getTokens());
});
} catch (ApiClientApiException e) {
String bodyString = gson.toJson(e.body());
@@ -947,14 +767,13 @@ private BatchConfig configureDetokenizeConcurrencyAndBatchSize(int totalRequests
private BulkInsertResponse processBulkInsertSync(
V1InsertRequest insertRequest,
- ArrayList originalPayload,
+ List originalPayload,
RequestInterceptor interceptor,
BatchConfig cfg
) throws ExecutionException, InterruptedException, SkyflowException {
LogUtil.printInfoLog(InfoLogs.PROCESSING_BATCHES.getLog());
- List successRecords = new ArrayList<>();
- List errorRecords = Collections.synchronizedList(new ArrayList<>());
- List> futures = this.insertBatchFutures(insertRequest, errorRecords, interceptor, cfg);
+ List records = new ArrayList<>();
+ List> futures = this.insertBatchFutures(insertRequest, interceptor, cfg);
try {
CompletableFuture allFutures = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
@@ -965,20 +784,15 @@ private BulkInsertResponse processBulkInsertSync(
}
for (CompletableFuture future : futures) {
BulkInsertResponse futureResponse = future.get();
- if (futureResponse != null) {
- if (futureResponse.getSuccess() != null) {
- successRecords.addAll(futureResponse.getSuccess());
- }
- if (futureResponse.getErrors() != null) {
- errorRecords.addAll(futureResponse.getErrors());
- }
+ if (futureResponse != null && futureResponse.getRecords() != null) {
+ records.addAll(futureResponse.getRecords());
}
}
} catch (Exception e) {
LogUtil.printErrorLog(ErrorLogs.INSERT_RECORDS_REJECTED.getLog());
throw new SkyflowException(e.getMessage());
}
- BulkInsertResponse response = new BulkInsertResponse(successRecords, errorRecords, originalPayload);
+ BulkInsertResponse response = new BulkInsertResponse(records, originalPayload);
LogUtil.printInfoLog(InfoLogs.INSERT_REQUEST_RESOLVED.getLog());
return response;
}
@@ -990,13 +804,12 @@ private BulkDetokenizeResponse processBulkDetokenizeSync(
BatchConfig cfg
) throws ExecutionException, InterruptedException, SkyflowException {
LogUtil.printInfoLog(InfoLogs.PROCESSING_BATCHES.getLog());
- List errorTokens = Collections.synchronizedList(new ArrayList<>());
- List successTokens = new ArrayList<>();
+ List records = new ArrayList<>();
ExecutorService executor = Executors.newFixedThreadPool(cfg.concurrencyLimit);
List batches =
Utils.createBulkDetokenizeBatches(detokenizeRequest, cfg.batchSize);
try {
- List> futures = this.detokenizeBatchFutures(executor, batches, errorTokens, interceptor, cfg.batchSize);
+ List> futures = this.detokenizeBatchFutures(executor, batches, interceptor, cfg.batchSize);
try {
CompletableFuture allFutures = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
allFutures.join();
@@ -1005,13 +818,8 @@ private BulkDetokenizeResponse processBulkDetokenizeSync(
}
for (CompletableFuture future : futures) {
BulkDetokenizeResponse futureResponse = future.get();
- if (futureResponse != null) {
- if (futureResponse.getSuccess() != null) {
- successTokens.addAll(futureResponse.getSuccess());
- }
- if (futureResponse.getErrors() != null) {
- errorTokens.addAll(futureResponse.getErrors());
- }
+ if (futureResponse != null && futureResponse.getRecords() != null) {
+ records.addAll(futureResponse.getRecords());
}
}
} catch (Exception e) {
@@ -1020,7 +828,7 @@ private BulkDetokenizeResponse processBulkDetokenizeSync(
} finally {
executor.shutdown();
}
- BulkDetokenizeResponse response = new BulkDetokenizeResponse(successTokens, errorTokens, originalTokens);
+ BulkDetokenizeResponse response = new BulkDetokenizeResponse(records, originalTokens);
LogUtil.printInfoLog(InfoLogs.DETOKENIZE_REQUEST_RESOLVED.getLog());
return response;
}
@@ -1028,28 +836,20 @@ private BulkDetokenizeResponse processBulkDetokenizeSync(
private List> detokenizeBatchFutures(
ExecutorService executor,
List batches,
- List errorTokens,
RequestInterceptor interceptor,
int batchSize) {
List> futures = new ArrayList<>();
- try {
- for (int batchIndex = 0; batchIndex < batches.size(); batchIndex++) {
- com.skyflow.generated.rest.resources.flowservice.requests.V1FlowDetokenizeRequest batch = batches.get(batchIndex);
- int batchNumber = batchIndex;
- RequestContext ctx = new RequestContext("DETOKENIZE");
- if (interceptor != null) interceptor.intercept(ctx);
- CompletableFuture future = CompletableFuture
- .supplyAsync(() -> processDetokenizeBatch(batch, ctx), executor)
- .thenApply(response -> Utils.formatBulkDetokenizeResponse(response.body(), batchNumber, batchSize, response.headers()))
- .exceptionally(ex -> {
- errorTokens.addAll(Utils.handleBulkDetokenizeBatchException(ex, batch, batchNumber, batchSize));
- return null;
- });
- futures.add(future);
- }
- } catch (Exception e) {
- ErrorRecord errorRecord = new ErrorRecord(0, e.getMessage(), 500);
- errorTokens.add(errorRecord);
+ for (int batchIndex = 0; batchIndex < batches.size(); batchIndex++) {
+ com.skyflow.generated.rest.resources.flowservice.requests.V1FlowDetokenizeRequest batch = batches.get(batchIndex);
+ int batchNumber = batchIndex;
+ RequestContext ctx = new RequestContext("DETOKENIZE");
+ if (interceptor != null) interceptor.intercept(ctx);
+ CompletableFuture future = CompletableFuture
+ .supplyAsync(() -> processDetokenizeBatch(batch, ctx), executor)
+ .thenApply(response -> Utils.formatBulkDetokenizeResponse(response.body(), batchNumber, batchSize, response.headers()))
+ .exceptionally(ex -> new BulkDetokenizeResponse(
+ Utils.handleBulkDetokenizeBatchException(ex, batch, batchNumber, batchSize)));
+ futures.add(future);
}
return futures;
}
@@ -1062,7 +862,6 @@ private ApiClientHttpResponse> insertBatchFutures(
V1InsertRequest insertRequest,
- List errorRecords,
RequestInterceptor interceptor,
BatchConfig cfg) {
List records = insertRequest.getRecords().get();
@@ -1070,7 +869,6 @@ private List> insertBatchFutures(
ExecutorService executor = Executors.newFixedThreadPool(cfg.concurrencyLimit);
List> batches = Utils.createBulkInsertBatches(records, cfg.batchSize);
List> futures = new ArrayList<>();
- V1Upsert upsert = insertRequest.getUpsert().isPresent() ? insertRequest.getUpsert().get() : null;
try {
for (int batchIndex = 0; batchIndex < batches.size(); batchIndex++) {
@@ -1079,12 +877,10 @@ private List> insertBatchFutures(
RequestContext ctx = new RequestContext("INSERT");
if (interceptor != null) interceptor.intercept(ctx);
CompletableFuture future = CompletableFuture
- .supplyAsync(() -> insertBatch(batch, insertRequest.getTableName().isPresent() ? insertRequest.getTableName().get() : null, upsert, ctx), executor)
+ .supplyAsync(() -> insertBatch(batch, insertRequest.getTableName().isPresent() ? insertRequest.getTableName().get() : null, ctx), executor)
.thenApply(response -> Utils.formatBulkInsertResponse(response.body(), batchNumber, cfg.batchSize, response.headers()))
- .exceptionally(ex -> {
- errorRecords.addAll(Utils.handleBulkInsertBatchException(ex, batch, batchNumber, cfg.batchSize));
- return null;
- });
+ .exceptionally(ex -> new BulkInsertResponse(
+ Utils.handleBulkInsertBatchException(ex, batch, batchNumber, cfg.batchSize)));
futures.add(future);
}
} finally {
@@ -1093,11 +889,12 @@ private List> insertBatchFutures(
return futures;
}
- private ApiClientHttpResponse insertBatch(List batch, String tableName, V1Upsert upsert, RequestContext ctx) {
+ // Upsert is not carried at the envelope level: getInsertRequestBody pushes it down onto every
+ // record, so each batch already has it.
+ private ApiClientHttpResponse insertBatch(List batch, String tableName, RequestContext ctx) {
V1InsertRequest.Builder req = V1InsertRequest.builder()
.vaultId(this.getVaultConfig().getVaultId())
- .records(batch)
- .upsert(upsert);
+ .records(batch);
if (tableName != null && !tableName.isEmpty()) {
req.tableName(tableName);
}
diff --git a/flowvault/src/main/java/com/skyflow/vault/data/BulkDetokenizeRequest.java b/flowvault/src/main/java/com/skyflow/vault/data/BulkDetokenizeRequest.java
index a7a842b5..dd2c9366 100644
--- a/flowvault/src/main/java/com/skyflow/vault/data/BulkDetokenizeRequest.java
+++ b/flowvault/src/main/java/com/skyflow/vault/data/BulkDetokenizeRequest.java
@@ -2,40 +2,38 @@
import java.util.List;
-public class BulkDetokenizeRequest {
- private final BulkDetokenizeRequestBuilder builder;
- private BulkDetokenizeRequest(BulkDetokenizeRequestBuilder builder){
- this.builder = builder;
+// Bulk counterpart of DetokenizeRequest. Carries no extra state today; all fields
+// (tokens, tokenGroupRedactions) are inherited.
+public class BulkDetokenizeRequest extends DetokenizeRequest {
+
+ protected BulkDetokenizeRequest(BulkDetokenizeRequestBuilder builder) {
+ super(builder);
}
- public static BulkDetokenizeRequestBuilder builder(){
+ public static BulkDetokenizeRequestBuilder builder() {
return new BulkDetokenizeRequestBuilder();
}
- public List getTokens(){
- return this.builder.tokens;
- }
- public List getTokenGroupRedactions(){
- return this.builder.tokenGroupRedactions;
- }
- public static final class BulkDetokenizeRequestBuilder{
- private List tokens;
+ public static final class BulkDetokenizeRequestBuilder extends DetokenizeRequestBuilder {
- private List tokenGroupRedactions;
+ private BulkDetokenizeRequestBuilder() {
+ }
- public BulkDetokenizeRequestBuilder tokens(List tokens){
- this.tokens = tokens;
+ @Override
+ public BulkDetokenizeRequestBuilder tokens(List tokens) {
+ super.tokens(tokens);
return this;
}
- public BulkDetokenizeRequestBuilder tokenGroupRedactions(List tokenGroupRedactions){
- this.tokenGroupRedactions = tokenGroupRedactions;
+
+ @Override
+ public BulkDetokenizeRequestBuilder tokenGroupRedactions(List tokenGroupRedactions) {
+ super.tokenGroupRedactions(tokenGroupRedactions);
return this;
}
- public BulkDetokenizeRequest build(){
+
+ @Override
+ public BulkDetokenizeRequest build() {
return new BulkDetokenizeRequest(this);
}
-
-
}
-
}
diff --git a/flowvault/src/main/java/com/skyflow/vault/data/BulkDetokenizeResponse.java b/flowvault/src/main/java/com/skyflow/vault/data/BulkDetokenizeResponse.java
index a1ad1ee7..279e1dc6 100644
--- a/flowvault/src/main/java/com/skyflow/vault/data/BulkDetokenizeResponse.java
+++ b/flowvault/src/main/java/com/skyflow/vault/data/BulkDetokenizeResponse.java
@@ -1,63 +1,59 @@
package com.skyflow.vault.data;
import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.annotations.Expose;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
public class BulkDetokenizeResponse {
- @Expose(serialize = true)
private DetokenizeSummary summary;
+ private List records;
- @Expose(serialize = true)
- private List success;
+ // Internal fields. transient keeps them out of the toString() output.
+ private transient List originalPayload;
+ private transient List tokensToRetry;
- @Expose(serialize = true)
- private List errors;
+ public BulkDetokenizeResponse(List records) {
+ this.records = records;
+ }
- private List originalPayload;
- private List tokensToRetry;
+ public BulkDetokenizeResponse(
+ List records,
+ List originalPayload
+ ) {
+ this.records = records;
+ this.originalPayload = originalPayload;
+ int totalFailed = (int) records.stream().filter(record -> record.getError() != null).count();
+ this.summary = new DetokenizeSummary(originalPayload.size(), records.size() - totalFailed, totalFailed);
+ }
- public BulkDetokenizeResponse(List success, List errors) {
- this.success = success;
- this.errors = errors;
+ public DetokenizeSummary getSummary() {
+ return this.summary;
}
- public BulkDetokenizeResponse(List success, List errors, List originalPayload) {
- this.success = success;
- this.errors = errors;
- this.originalPayload = originalPayload;
- this.summary = new DetokenizeSummary(this.originalPayload.size(), this.success.size(), this.errors.size());
+ public List getRecords() {
+ return this.records;
}
public List getTokensToRetry() {
if (tokensToRetry == null) {
- tokensToRetry = new ArrayList<>();
- tokensToRetry = errors.stream()
- .filter(error -> (error.getCode() >= 500 && error.getCode() <= 599) && error.getCode() != 529)
- .map(errorRecord -> originalPayload.get(errorRecord.getIndex()))
- .collect(Collectors.toList());
+ // Per-batch responses are built without the original payload; nothing to retry from.
+ if (originalPayload == null) {
+ return new ArrayList<>();
+ }
+ tokensToRetry = records.stream()
+ .filter(record -> record.getHttpCode() >= 500 && record.getHttpCode() <= 599
+ && record.getHttpCode() != 529)
+ .map(record -> originalPayload.get(record.getIndex()))
+ .collect(Collectors.toCollection(ArrayList::new));
}
return tokensToRetry;
}
- public List getSuccess() {
- return success;
- }
- public DetokenizeSummary getSummary() {
- return this.summary;
- }
-
- public List getErrors() {
- return this.errors;
- }
@Override
public String toString() {
- Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+ Gson gson = new Gson().newBuilder().serializeNulls().create();
return gson.toJson(this);
}
-
}
diff --git a/flowvault/src/main/java/com/skyflow/vault/data/BulkDetokenizeResponseRecord.java b/flowvault/src/main/java/com/skyflow/vault/data/BulkDetokenizeResponseRecord.java
new file mode 100644
index 00000000..e38c20d7
--- /dev/null
+++ b/flowvault/src/main/java/com/skyflow/vault/data/BulkDetokenizeResponseRecord.java
@@ -0,0 +1,34 @@
+package com.skyflow.vault.data;
+
+import com.google.gson.Gson;
+
+import java.util.Map;
+
+// Bulk counterpart of DetokenizeResponseRecord. Adds the caller-facing position of the token
+// in the submitted payload; all other fields are inherited.
+public class BulkDetokenizeResponseRecord extends DetokenizeResponseRecord {
+ private final int index;
+ private final String requestId;
+
+ public BulkDetokenizeResponseRecord(int index, String token, Object value, String tokenGroupName,
+ Map metadata, int httpCode, String error,
+ String requestId) {
+ super(token, value, tokenGroupName, metadata, httpCode, error);
+ this.index = index;
+ this.requestId = requestId;
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public String getRequestId() {
+ return requestId;
+ }
+
+ @Override
+ public String toString() {
+ Gson gson = new Gson().newBuilder().serializeNulls().create();
+ return gson.toJson(this);
+ }
+}
diff --git a/flowvault/src/main/java/com/skyflow/vault/data/BulkInsertRecord.java b/flowvault/src/main/java/com/skyflow/vault/data/BulkInsertRecord.java
deleted file mode 100644
index 3aeae875..00000000
--- a/flowvault/src/main/java/com/skyflow/vault/data/BulkInsertRecord.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.skyflow.vault.data;
-
-import com.skyflow.enums.UpsertType;
-
-import java.util.List;
-import java.util.Map;
-
-public class BulkInsertRecord {
- private final BulkInsertRecordBuilder builder;
-
- private BulkInsertRecord(BulkInsertRecordBuilder builder) {
- this.builder = builder;
- }
-
- // Getters
- public String getTable() {
- return this.builder.table;
- }
-
- public Map getData() {
- return this.builder.data;
- }
-
- public List getUpsert() {
- return this.builder.upsert;
- }
-
- public UpsertType getUpsertType() {
- return this.builder.upsertType;
- }
-
- // Builder Class
- public static final class BulkInsertRecordBuilder {
- private String table;
- private Map data;
- private List upsert;
- private UpsertType upsertType;
-
- public BulkInsertRecordBuilder table(String table) {
- this.table = table;
- return this;
- }
-
- public BulkInsertRecordBuilder data(Map data) {
- this.data = data;
- return this;
- }
-
- public BulkInsertRecordBuilder upsert(List upsert) {
- this.upsert = upsert;
- return this;
- }
-
- public BulkInsertRecordBuilder upsertType(UpsertType upsertType) {
- this.upsertType = upsertType;
- return this;
- }
-
- public BulkInsertRecord build() {
- return new BulkInsertRecord(this);
- }
- }
-
- // Static entry point for builder
- public static BulkInsertRecordBuilder builder() {
- return new BulkInsertRecordBuilder();
- }
-}
diff --git a/flowvault/src/main/java/com/skyflow/vault/data/BulkInsertRequest.java b/flowvault/src/main/java/com/skyflow/vault/data/BulkInsertRequest.java
index 7eda6f93..82ff45ef 100644
--- a/flowvault/src/main/java/com/skyflow/vault/data/BulkInsertRequest.java
+++ b/flowvault/src/main/java/com/skyflow/vault/data/BulkInsertRequest.java
@@ -1,67 +1,43 @@
package com.skyflow.vault.data;
-import com.skyflow.enums.UpsertType;
-
-import java.util.ArrayList;
import java.util.List;
-public class BulkInsertRequest extends BaseInsertRequest {
- private final BulkInsertRequestBuilder builder;
+// Bulk counterpart of InsertRequest. Carries no extra state today; all fields
+// (tableName, records, upsert) are inherited.
+public class BulkInsertRequest extends InsertRequest {
- private BulkInsertRequest(BulkInsertRequestBuilder builder) {
+ protected BulkInsertRequest(BulkInsertRequestBuilder builder) {
super(builder);
- this.builder = builder;
}
-
public static BulkInsertRequestBuilder builder() {
return new BulkInsertRequestBuilder();
}
- public List getUpsert() {
- return this.builder.upsert;
- }
-
- public UpsertType getUpsertType() {
- return this.builder.upsertType;
- }
-
- public ArrayList getRecords(){
- return this.builder.records;
- }
-
- public static final class BulkInsertRequestBuilder extends BaseInsertRequestBuilder {
- private List upsert;
-
- private UpsertType upsertType;
-
- private ArrayList records;
+ public static final class BulkInsertRequestBuilder extends InsertRequestBuilder {
private BulkInsertRequestBuilder() {
- super();
}
@Override
- public BulkInsertRequestBuilder table(String table) {
- super.table(table);
- return this;
- }
-
- public BulkInsertRequestBuilder upsert(List upsert) {
- this.upsert = upsert;
+ public BulkInsertRequestBuilder tableName(String tableName) {
+ super.tableName(tableName);
return this;
}
- public BulkInsertRequestBuilder upsertType(UpsertType upsertType) {
- this.upsertType = upsertType;
+ @Override
+ public BulkInsertRequestBuilder records(List records) {
+ super.records(records);
return this;
}
- public BulkInsertRequestBuilder records(ArrayList records){
- this.records = records;
+ @Override
+ public BulkInsertRequestBuilder upsert(UpsertOptions upsert) {
+ super.upsert(upsert);
return this;
}
+ @Override
public BulkInsertRequest build() {
return new BulkInsertRequest(this);
}
diff --git a/flowvault/src/main/java/com/skyflow/vault/data/BulkInsertRequestRecord.java b/flowvault/src/main/java/com/skyflow/vault/data/BulkInsertRequestRecord.java
new file mode 100644
index 00000000..6cddda6b
--- /dev/null
+++ b/flowvault/src/main/java/com/skyflow/vault/data/BulkInsertRequestRecord.java
@@ -0,0 +1,51 @@
+package com.skyflow.vault.data;
+
+import java.util.Map;
+
+// Bulk counterpart of InsertRequestRecord. Carries no extra state today; it exists so
+// bulk-only fields can be added without touching the unary record.
+public class BulkInsertRequestRecord extends InsertRequestRecord {
+
+ protected BulkInsertRequestRecord(BulkInsertRequestRecordBuilder builder) {
+ super(builder);
+ }
+
+ public static BulkInsertRequestRecordBuilder builder() {
+ return new BulkInsertRequestRecordBuilder();
+ }
+
+ public static final class BulkInsertRequestRecordBuilder extends InsertRequestRecordBuilder {
+
+ private BulkInsertRequestRecordBuilder() {
+ }
+
+ @Override
+ public BulkInsertRequestRecordBuilder tableName(String tableName) {
+ super.tableName(tableName);
+ return this;
+ }
+
+ @Override
+ public BulkInsertRequestRecordBuilder data(Map data) {
+ super.data(data);
+ return this;
+ }
+
+ @Override
+ public BulkInsertRequestRecordBuilder tokens(Map tokens) {
+ super.tokens(tokens);
+ return this;
+ }
+
+ @Override
+ public BulkInsertRequestRecordBuilder upsert(UpsertOptions upsert) {
+ super.upsert(upsert);
+ return this;
+ }
+
+ @Override
+ public BulkInsertRequestRecord build() {
+ return new BulkInsertRequestRecord(this);
+ }
+ }
+}
diff --git a/flowvault/src/main/java/com/skyflow/vault/data/BulkInsertResponse.java b/flowvault/src/main/java/com/skyflow/vault/data/BulkInsertResponse.java
index 72f542d0..b97d2e97 100644
--- a/flowvault/src/main/java/com/skyflow/vault/data/BulkInsertResponse.java
+++ b/flowvault/src/main/java/com/skyflow/vault/data/BulkInsertResponse.java
@@ -1,60 +1,53 @@
package com.skyflow.vault.data;
import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.annotations.Expose;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
public class BulkInsertResponse {
- // These members will be included in the toString() output
- @Expose(serialize = true)
- private Summary summary;
- @Expose(serialize = true)
- private List success;
- @Expose(serialize = true)
- private List errors;
+ private BulkSummary summary;
+ private List records;
- // Internal fields. Should not be included in toString() output
- private ArrayList originalPayload;
- private ArrayList recordsToRetry;
+ // Internal fields. transient keeps them out of the toString() output.
+ private transient List originalPayload;
+ private transient List recordsToRetry;
- public BulkInsertResponse(List successRecords, List errorRecords) {
- this.success = successRecords;
- this.errors = errorRecords;
+ public BulkInsertResponse(List records) {
+ this.records = records;
}
public BulkInsertResponse(
- List successRecords,
- List errorRecords,
- ArrayList originalPayload
+ List records,
+ List originalPayload
) {
- this.success = successRecords;
- this.errors = errorRecords;
+ this.records = records;
this.originalPayload = originalPayload;
- this.summary = new Summary(this.originalPayload.size(), this.success.size(), this.errors.size());
+ int totalFailed = (int) records.stream().filter(record -> record.getError() != null).count();
+ this.summary = new BulkSummary(originalPayload.size(), records.size() - totalFailed, totalFailed);
}
- public Summary getSummary() {
+ public BulkSummary getSummary() {
return this.summary;
}
- public List getSuccess() {
- return this.success;
+ public List getRecords() {
+ return this.records;
}
- public List getErrors() {
- return this.errors;
- }
-
- public ArrayList getRecordsToRetry() {
+ // Records are guaranteed to be BulkInsertRequestRecord: validateBulkInsertRequest rejects
+ // any other InsertRequestRecord subtype before the request is ever sent.
+ public List getRecordsToRetry() {
if (recordsToRetry == null) {
- recordsToRetry = new ArrayList<>();
- recordsToRetry = errors.stream()
- .filter(error -> (error.getCode() >= 500 && error.getCode() <= 599) && error.getCode() != 529)
- .map(errorRecord -> originalPayload.get(errorRecord.getIndex()))
+ // Per-batch responses are built without the original payload; nothing to retry from.
+ if (originalPayload == null) {
+ return new ArrayList<>();
+ }
+ recordsToRetry = records.stream()
+ .filter(record -> record.getHttpCode() >= 500 && record.getHttpCode() <= 599
+ && record.getHttpCode() != 529)
+ .map(record -> (BulkInsertRequestRecord) originalPayload.get(record.getIndex()))
.collect(Collectors.toCollection(ArrayList::new));
}
return recordsToRetry;
@@ -62,7 +55,7 @@ public ArrayList getRecordsToRetry() {
@Override
public String toString() {
- Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+ Gson gson = new Gson().newBuilder().serializeNulls().create();
return gson.toJson(this);
}
}
diff --git a/flowvault/src/main/java/com/skyflow/vault/data/BulkInsertResponseRecord.java b/flowvault/src/main/java/com/skyflow/vault/data/BulkInsertResponseRecord.java
new file mode 100644
index 00000000..1ea6b757
--- /dev/null
+++ b/flowvault/src/main/java/com/skyflow/vault/data/BulkInsertResponseRecord.java
@@ -0,0 +1,34 @@
+package com.skyflow.vault.data;
+
+import com.google.gson.Gson;
+
+import java.util.Map;
+
+// Bulk counterpart of InsertResponseRecord. Adds the caller-facing position of the record
+// in the submitted payload; all other fields are inherited.
+public class BulkInsertResponseRecord extends InsertResponseRecord {
+ private final int index;
+ private final String requestId;
+
+ public BulkInsertResponseRecord(int index, String tableName, String skyflowId,
+ Map fields, Map hashedData,
+ int httpCode, String error, String requestId) {
+ super(tableName, skyflowId, fields, hashedData, httpCode, error);
+ this.index = index;
+ this.requestId = requestId;
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public String getRequestId(){
+ return requestId;
+ }
+
+ @Override
+ public String toString() {
+ Gson gson = new Gson().newBuilder().serializeNulls().create();
+ return gson.toJson(this);
+ }
+}
diff --git a/flowvault/src/main/java/com/skyflow/vault/data/Summary.java b/flowvault/src/main/java/com/skyflow/vault/data/BulkSummary.java
similarity index 85%
rename from flowvault/src/main/java/com/skyflow/vault/data/Summary.java
rename to flowvault/src/main/java/com/skyflow/vault/data/BulkSummary.java
index fb152fb2..f32a14ee 100644
--- a/flowvault/src/main/java/com/skyflow/vault/data/Summary.java
+++ b/flowvault/src/main/java/com/skyflow/vault/data/BulkSummary.java
@@ -3,7 +3,7 @@
import com.google.gson.Gson;
import com.google.gson.annotations.Expose;
-public class Summary {
+public class BulkSummary {
@Expose(serialize = true)
private int totalRecords;
@Expose(serialize = true)
@@ -11,10 +11,10 @@ public class Summary {
@Expose(serialize = true)
private int totalFailed;
- public Summary() {
+ public BulkSummary() {
}
- public Summary(int totalRecords, int totalInserted, int totalFailed) {
+ public BulkSummary(int totalRecords, int totalInserted, int totalFailed) {
this.totalRecords = totalRecords;
this.totalInserted = totalInserted;
this.totalFailed = totalFailed;
@@ -24,7 +24,6 @@ public int getTotalRecords() {
return totalRecords;
}
-
public int getTotalInserted() {
return totalInserted;
}
@@ -33,7 +32,6 @@ public int getTotalFailed() {
return totalFailed;
}
-
@Override
public String toString() {
Gson gson = new Gson();
diff --git a/flowvault/src/main/java/com/skyflow/vault/data/BulkTokenGroupRedactions.java b/flowvault/src/main/java/com/skyflow/vault/data/BulkTokenGroupRedactions.java
deleted file mode 100644
index da894232..00000000
--- a/flowvault/src/main/java/com/skyflow/vault/data/BulkTokenGroupRedactions.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.skyflow.vault.data;
-
-public class BulkTokenGroupRedactions {
- private final BulkTokenGroupRedactionsBuilder builder;
-
- private BulkTokenGroupRedactions(BulkTokenGroupRedactionsBuilder builder) {
- this.builder = builder;
- }
- public String getTokenGroupName() {
- return this.builder.tokenGroupName;
- }
-
- public String getRedaction() {
- return this.builder.redaction;
- }
-
- public static BulkTokenGroupRedactionsBuilder builder() {
- return new BulkTokenGroupRedactionsBuilder();
- }
-
- public static final class BulkTokenGroupRedactionsBuilder {
- private String tokenGroupName;
- private String redaction;
-
- public BulkTokenGroupRedactionsBuilder tokenGroupName(String tokenGroupName) {
- this.tokenGroupName = tokenGroupName;
- return this;
- }
-
- public BulkTokenGroupRedactionsBuilder redaction(String redaction) {
- this.redaction = redaction;
- return this;
- }
-
- public BulkTokenGroupRedactions build() {
- return new BulkTokenGroupRedactions(this);
- }
- }
-}
diff --git a/flowvault/src/main/java/com/skyflow/vault/data/ColumnRedaction.java b/flowvault/src/main/java/com/skyflow/vault/data/ColumnRedaction.java
deleted file mode 100644
index 2325c0ac..00000000
--- a/flowvault/src/main/java/com/skyflow/vault/data/ColumnRedaction.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.skyflow.vault.data;
-
-public class ColumnRedaction {
- private final ColumnRedactionBuilder builder;
-
- private ColumnRedaction(ColumnRedactionBuilder builder) {
- this.builder = builder;
- }
-
- public String getColumnName() {
- return this.builder.columnName;
- }
-
- public String getRedaction() {
- return this.builder.redaction;
- }
-
- public static ColumnRedactionBuilder builder() {
- return new ColumnRedactionBuilder();
- }
-
- public static final class ColumnRedactionBuilder {
- private String columnName;
- private String redaction;
-
- public ColumnRedactionBuilder columnName(String columnName) {
- this.columnName = columnName;
- return this;
- }
-
- public ColumnRedactionBuilder redaction(String redaction) {
- this.redaction = redaction;
- return this;
- }
-
- public ColumnRedaction build() {
- return new ColumnRedaction(this);
- }
- }
-}
diff --git a/flowvault/src/main/java/com/skyflow/vault/data/DeleteTokensRequest.java b/flowvault/src/main/java/com/skyflow/vault/data/DeleteTokensRequest.java
deleted file mode 100644
index ea8e9a7a..00000000
--- a/flowvault/src/main/java/com/skyflow/vault/data/DeleteTokensRequest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.skyflow.vault.data;
-
-import java.util.List;
-
-public class DeleteTokensRequest {
- private final DeleteTokensRequestBuilder builder;
-
- private DeleteTokensRequest(DeleteTokensRequestBuilder builder) {
- this.builder = builder;
- }
-
- public static DeleteTokensRequestBuilder builder() {
- return new DeleteTokensRequestBuilder();
- }
-
- public List getTokens() {
- return this.builder.tokens;
- }
-
- public static final class DeleteTokensRequestBuilder {
- private List tokens;
-
- private DeleteTokensRequestBuilder() {}
-
- public DeleteTokensRequestBuilder tokens(List tokens) {
- this.tokens = tokens;
- return this;
- }
-
- public DeleteTokensRequest build() {
- return new DeleteTokensRequest(this);
- }
- }
-}
diff --git a/flowvault/src/main/java/com/skyflow/vault/data/DeleteTokensResponse.java b/flowvault/src/main/java/com/skyflow/vault/data/DeleteTokensResponse.java
deleted file mode 100644
index 7f621d8d..00000000
--- a/flowvault/src/main/java/com/skyflow/vault/data/DeleteTokensResponse.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.skyflow.vault.data;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-public class DeleteTokensResponse {
- private final List tokens;
- private final ArrayList