From a0ec6c4eab6a9212a5bbd8e948f6521d112d4b20 Mon Sep 17 00:00:00 2001 From: skyflow-bharti Date: Thu, 28 Aug 2025 23:18:34 +0530 Subject: [PATCH 1/3] SK-2258 fix error response records --- .../com/skyflow/serviceaccount/util/Token.java | 3 +++ v3/src/main/java/com/skyflow/VaultClient.java | 5 ++--- .../vault/controller/VaultController.java | 16 ++++++---------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/common/src/main/java/com/skyflow/serviceaccount/util/Token.java b/common/src/main/java/com/skyflow/serviceaccount/util/Token.java index 90da0cf4..acd032e2 100644 --- a/common/src/main/java/com/skyflow/serviceaccount/util/Token.java +++ b/common/src/main/java/com/skyflow/serviceaccount/util/Token.java @@ -31,6 +31,9 @@ public static boolean isExpired(String token) { LogUtil.printErrorLog(ErrorLogs.INVALID_BEARER_TOKEN.getLog()); return true; } + if (currentTime > expiryTime) { + LogUtil.printInfoLog(InfoLogs.BEARER_TOKEN_EXPIRED.getLog()); + } return currentTime > expiryTime; } diff --git a/v3/src/main/java/com/skyflow/VaultClient.java b/v3/src/main/java/com/skyflow/VaultClient.java index 558e2dbd..d789fd4c 100644 --- a/v3/src/main/java/com/skyflow/VaultClient.java +++ b/v3/src/main/java/com/skyflow/VaultClient.java @@ -66,8 +66,7 @@ protected void setBearerToken() throws SkyflowException { if (this.finalCredentials.getApiKey() != null) { LogUtil.printInfoLog(InfoLogs.REUSE_API_KEY.getLog()); token = this.finalCredentials.getApiKey(); - } else if (Token.isExpired(token)) { - LogUtil.printInfoLog(InfoLogs.BEARER_TOKEN_EXPIRED.getLog()); + } else if (token == null || token.isEmpty() || Token.isExpired(token)) { token = Utils.generateBearerToken(this.finalCredentials); } else { LogUtil.printInfoLog(InfoLogs.REUSE_BEARER_TOKEN.getLog()); @@ -118,7 +117,7 @@ protected void updateExecutorInHTTP() { .addInterceptor(chain -> { Request original = chain.request(); Request requestWithAuth = original.newBuilder() - .header("Authorization", "Bearer " + this.vaultConfig.getCredentials().getToken()) + .header("Authorization", "Bearer " + this.token) .build(); return chain.proceed(requestWithAuth); }) diff --git a/v3/src/main/java/com/skyflow/vault/controller/VaultController.java b/v3/src/main/java/com/skyflow/vault/controller/VaultController.java index dfe1b7f0..08d38aba 100644 --- a/v3/src/main/java/com/skyflow/vault/controller/VaultController.java +++ b/v3/src/main/java/com/skyflow/vault/controller/VaultController.java @@ -78,12 +78,12 @@ public CompletableFuture bulkInsertAsync( configureInsertConcurrencyAndBatchSize(insertRequest.getValues().size()); com.skyflow.generated.rest.resources.recordservice.requests.InsertRequest request = super.getBulkInsertRequestBody(insertRequest, super.getVaultConfig()); - List errorRecords = new ArrayList<>(); - List> futures = this.insertBatchFutures(request, errorRecords); + List> futures = this.insertBatchFutures(request); return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])) .thenApply(v -> { List successRecords = new ArrayList<>(); + List errorRecords = new ArrayList<>(); for (CompletableFuture future : futures) { com.skyflow.vault.data.InsertResponse futureResponse = future.join(); @@ -114,7 +114,7 @@ private com.skyflow.vault.data.InsertResponse processSync( List errorRecords = new ArrayList<>(); List successRecords = new ArrayList<>(); - List> futures = this.insertBatchFutures(insertRequest, errorRecords); + List> futures = this.insertBatchFutures(insertRequest); CompletableFuture allFutures = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])); allFutures.join(); @@ -137,7 +137,7 @@ private com.skyflow.vault.data.InsertResponse processSync( private List> insertBatchFutures( - com.skyflow.generated.rest.resources.recordservice.requests.InsertRequest insertRequest, List errorRecords + com.skyflow.generated.rest.resources.recordservice.requests.InsertRequest insertRequest ) { List records = insertRequest.getRecords().get(); @@ -151,12 +151,8 @@ private List> insertBat int batchNumber = batchIndex; CompletableFuture future = CompletableFuture .supplyAsync(() -> insertBatch(batch, insertRequest.getTableName().get()), executor) - .exceptionally(ex -> { - LogUtil.printInfoLog(ErrorLogs.PROCESSING_ERROR_RESPONSE.getLog()); - errorRecords.addAll(handleBatchException(ex, batch, batchNumber, batches)); - return null; - }) - .thenApply(response -> formatResponse(response, batchNumber, insertBatchSize)); + .thenApply(response -> formatResponse(response, batchNumber, insertBatchSize)) + .exceptionally(ex -> new com.skyflow.vault.data.InsertResponse(null, handleBatchException(ex, batch, batchNumber, batches))); futures.add(future); } } finally { From 1f972f6722dc8c9d6a70f6c023b1e8542dae6735 Mon Sep 17 00:00:00 2001 From: skyflow-bharti Date: Fri, 29 Aug 2025 10:59:53 +0530 Subject: [PATCH 2/3] SK-2258 fix error response records --- .../src/main/java/com/skyflow/serviceaccount/util/Token.java | 3 --- v3/src/main/java/com/skyflow/VaultClient.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/common/src/main/java/com/skyflow/serviceaccount/util/Token.java b/common/src/main/java/com/skyflow/serviceaccount/util/Token.java index acd032e2..90da0cf4 100644 --- a/common/src/main/java/com/skyflow/serviceaccount/util/Token.java +++ b/common/src/main/java/com/skyflow/serviceaccount/util/Token.java @@ -31,9 +31,6 @@ public static boolean isExpired(String token) { LogUtil.printErrorLog(ErrorLogs.INVALID_BEARER_TOKEN.getLog()); return true; } - if (currentTime > expiryTime) { - LogUtil.printInfoLog(InfoLogs.BEARER_TOKEN_EXPIRED.getLog()); - } return currentTime > expiryTime; } diff --git a/v3/src/main/java/com/skyflow/VaultClient.java b/v3/src/main/java/com/skyflow/VaultClient.java index d789fd4c..38711d82 100644 --- a/v3/src/main/java/com/skyflow/VaultClient.java +++ b/v3/src/main/java/com/skyflow/VaultClient.java @@ -66,7 +66,7 @@ protected void setBearerToken() throws SkyflowException { if (this.finalCredentials.getApiKey() != null) { LogUtil.printInfoLog(InfoLogs.REUSE_API_KEY.getLog()); token = this.finalCredentials.getApiKey(); - } else if (token == null || token.isEmpty() || Token.isExpired(token)) { + } else if (Token.isExpired(token)) { token = Utils.generateBearerToken(this.finalCredentials); } else { LogUtil.printInfoLog(InfoLogs.REUSE_BEARER_TOKEN.getLog()); From 474e83b7c260418758665b2e4e0a1dfb7e3fbd89 Mon Sep 17 00:00:00 2001 From: skyflow-bharti Date: Fri, 29 Aug 2025 11:03:25 +0530 Subject: [PATCH 3/3] SK-2258 add expired log --- v3/src/main/java/com/skyflow/VaultClient.java | 1 + 1 file changed, 1 insertion(+) diff --git a/v3/src/main/java/com/skyflow/VaultClient.java b/v3/src/main/java/com/skyflow/VaultClient.java index 38711d82..8e1147a6 100644 --- a/v3/src/main/java/com/skyflow/VaultClient.java +++ b/v3/src/main/java/com/skyflow/VaultClient.java @@ -67,6 +67,7 @@ protected void setBearerToken() throws SkyflowException { LogUtil.printInfoLog(InfoLogs.REUSE_API_KEY.getLog()); token = this.finalCredentials.getApiKey(); } else if (Token.isExpired(token)) { + LogUtil.printInfoLog(InfoLogs.BEARER_TOKEN_EXPIRED.getLog()); token = Utils.generateBearerToken(this.finalCredentials); } else { LogUtil.printInfoLog(InfoLogs.REUSE_BEARER_TOKEN.getLog());