Merge pull request #363 from skyflowapi/SK-2967-java-sdk-add-flow-db-vault-api-support-using-modular-build-approach

SK-2967 java sdk add flow db vault api support using modular build approach

Author: skyflow-bharti

common/src/main/java/com/skyflow/BaseSkyflow.java

@@ -117,7 +117,7 @@ protected final void addVaultConfigTemplate(V vaultConfig) throws SkyflowExcepti
             validateVaultConfig(vaultConfig);
             V vaultConfigCopy = cloneVaultConfig(vaultConfig);
             String vaultId = extractVaultId(vaultConfigCopy);
-            if (this.vaultConfigMap.containsKey(vaultId)) {
+            if (hasVaultClient(vaultId)) {
                 LogUtil.printErrorLog(BaseUtils.parameterizedString(
                         ErrorLogs.VAULT_CONFIG_EXISTS.getLog(), vaultId
                 ));
@@ -132,7 +132,7 @@ protected final void updateVaultConfigTemplate(V vaultConfig) throws SkyflowExce
             LogUtil.printInfoLog(InfoLogs.VALIDATING_VAULT_CONFIG.getLog());
             validateVaultConfig(vaultConfig);
             String vaultId = extractVaultId(vaultConfig);
-            if (!this.vaultConfigMap.containsKey(vaultId)) {
+            if (!hasVaultClient(vaultId)) {
                 LogUtil.printErrorLog(BaseUtils.parameterizedString(
                         ErrorLogs.VAULT_CONFIG_DOES_NOT_EXIST.getLog(), vaultId
                 ));
@@ -144,7 +144,7 @@ protected final void updateVaultConfigTemplate(V vaultConfig) throws SkyflowExce
         }
 
         protected final void removeVaultConfigTemplate(String vaultId) throws SkyflowException {
-            if (!this.vaultConfigMap.containsKey(vaultId)) {
+            if (!hasVaultClient(vaultId)) {
                 LogUtil.printErrorLog(BaseUtils.parameterizedString(ErrorLogs.VAULT_CONFIG_DOES_NOT_EXIST.getLog(), vaultId));
                 throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.VaultIdNotInConfigList.getMessage());
             }
@@ -166,6 +166,8 @@ protected final void addSkyflowCredentialsTemplate(Credentials credentials) thro
 
         protected abstract void validateVaultConfig(V vaultConfig) throws SkyflowException;
 
+        protected abstract boolean hasVaultClient(String vaultId);
+
         @SuppressWarnings("unchecked")
         protected final V cloneVaultConfig(V vaultConfig) {
             try {

common/src/test/java/com/skyflow/BaseSkyflowTests.java

@@ -312,6 +312,11 @@ protected void onVaultConfigRemoved(String vaultId) {
                 this.vaultClientsMap.remove(vaultId);
             }
 
+            @Override
+            protected boolean hasVaultClient(String vaultId) {
+                return this.vaultClientsMap.containsKey(vaultId);
+            }
+
             @Override
             protected void onCredentialsUpdated(Credentials credentials) {
                 // no-op: this test double only exercises template orchestration, not propagation

flowvault/src/main/java/com/skyflow/Skyflow.java

@@ -68,6 +68,11 @@ protected void onVaultConfigRemoved(String vaultId) throws SkyflowException {
             this.vaultClientsMap.remove(vaultId);
         }
 
+        @Override
+        protected boolean hasVaultClient(String vaultId) {
+            return this.vaultClientsMap.containsKey(vaultId);
+        }
+
         @Override
         protected void onCredentialsUpdated(Credentials credentials) throws SkyflowException {
             for (VaultController vault : this.vaultClientsMap.values()) {

v2/src/main/java/com/skyflow/Skyflow.java

@@ -114,6 +114,11 @@ protected void onVaultConfigRemoved(String vaultId) throws SkyflowException {
             this.vaultClientsMap.remove(vaultId);
         }
 
+        @Override
+        protected boolean hasVaultClient(String vaultId) {
+            return this.vaultClientsMap.containsKey(vaultId);
+        }
+
         @Override
         protected void onCredentialsUpdated(Credentials credentials) throws SkyflowException {
             for (VaultController vault : this.vaultClientsMap.values()) {

v2/src/main/java/com/skyflow/generated/rest/ApiClient.java

@@ -13,6 +13,7 @@
 import com.skyflow.generated.rest.resources.records.RecordsClient;
 import com.skyflow.generated.rest.resources.strings.StringsClient;
 import com.skyflow.generated.rest.resources.tokens.TokensClient;
+
 import java.util.function.Supplier;
 
 public class ApiClient {

v2/src/main/java/com/skyflow/generated/rest/AsyncApiClient.java

@@ -13,6 +13,7 @@
 import com.skyflow.generated.rest.resources.records.AsyncRecordsClient;
 import com.skyflow.generated.rest.resources.strings.AsyncStringsClient;
 import com.skyflow.generated.rest.resources.tokens.AsyncTokensClient;
+
 import java.util.function.Supplier;
 
 public class AsyncApiClient {

v2/src/main/java/com/skyflow/generated/rest/core/ClientOptions.java

@@ -35,7 +35,7 @@ private ClientOptions(
             {
                 put("X-Fern-Language", "JAVA");
                 put("X-Fern-SDK-Name", "com.skyflow.fern:api-sdk");
-                put("X-Fern-SDK-Version", "0.0.98");
+                put("X-Fern-SDK-Version", "0.0.385");
             }
         });
         this.headerSuppliers = headerSuppliers;

v2/src/main/java/com/skyflow/generated/rest/core/FileStream.java

@@ -3,12 +3,13 @@
  */
 package com.skyflow.generated.rest.core;
 
-import java.io.InputStream;
-import java.util.Objects;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.InputStream;
+import java.util.Objects;
+
 /**
  * Represents a file stream with associated metadata for file uploads.
  */

v2/src/main/java/com/skyflow/generated/rest/core/InputStreamRequestBody.java

@@ -3,9 +3,6 @@
  */
 package com.skyflow.generated.rest.core;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Objects;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 import okhttp3.internal.Util;
@@ -14,6 +11,10 @@
 import okio.Source;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Objects;
+
 /**
  * A custom implementation of OkHttp's RequestBody that wraps an InputStream.
  * This class allows streaming of data from an InputStream directly to an HTTP request body,

v2/src/main/java/com/skyflow/generated/rest/core/ObjectMappers.java

@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
 import java.io.IOException;
 
 public final class ObjectMappers {