diff --git a/v3/src/main/java/com/skyflow/VaultClient.java b/v3/src/main/java/com/skyflow/VaultClient.java index 558e2dbd..8e1147a6 100644 --- a/v3/src/main/java/com/skyflow/VaultClient.java +++ b/v3/src/main/java/com/skyflow/VaultClient.java @@ -118,7 +118,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 {