Merge pull request #305 from skyflowapi/v3-release/26.5.1

SK-2824 release/26.5.1

Author: skyflow-bharti

v3/pom.xml

@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>skyflow-java</artifactId>
-    <version>3.0.0-beta.9-dev.e40880f</version>
+    <version>2.0.4-dev.a98436e</version>
     <packaging>jar</packaging>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Skyflow V3 SDK for the Java programming language</description>

v3/src/main/java/com/skyflow/enums/CustomHeaderKey.java

@@ -0,0 +1,18 @@
+package com.skyflow.enums;
+
+public enum CustomHeaderKey {
+    SkyflowAccountID("x-skyflow-account-id"),
+    SkyflowAccountName("x-skyflow-account-name"),
+    RequestIDHeader("x-request-id");
+
+    private final String value;
+
+    CustomHeaderKey(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}

v3/src/main/java/com/skyflow/utils/Utils.java

@@ -140,15 +140,15 @@ public static void validateDetokenizeRequest(DetokenizeRequest request) throws S
             throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.DetokenizeRequestNull.getMessage());
         }
         List<String> tokens = request.getTokens();
-        if (tokens.size() > 10000) {
-            LogUtil.printErrorLog(ErrorLogs.TOKENS_SIZE_EXCEED.getLog());
-            throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.TokensSizeExceedError.getMessage());
-        }
         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());
+            ));
+            throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyDetokenizeData.getMessage());
+        }
+        if (tokens.size() > 10000) {
+            LogUtil.printErrorLog(ErrorLogs.TOKENS_SIZE_EXCEED.getLog());
+            throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.TokensSizeExceedError.getMessage());
         }
         for (int index = 0; index < tokens.size(); index++) {
             String token = tokens.get(index);

v3/src/main/java/com/skyflow/utils/validations/Validations.java

@@ -0,0 +1,30 @@
+package com.skyflow.vault.data;
+
+public final class DeleteTokensOptions {
+    private final RequestInterceptor interceptor;
+
+    private DeleteTokensOptions(Builder builder) {
+        this.interceptor = builder.interceptor;
+    }
+
+    public RequestInterceptor getInterceptor() {
+        return interceptor;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static final class Builder {
+        private RequestInterceptor interceptor;
+
+        public Builder interceptor(RequestInterceptor interceptor) {
+            this.interceptor = interceptor;
+            return this;
+        }
+
+        public DeleteTokensOptions build() {
+            return new DeleteTokensOptions(this);
+        }
+    }
+}

v3/src/main/java/com/skyflow/vault/controller/VaultController.java

@@ -0,0 +1,30 @@
+package com.skyflow.vault.data;
+
+public final class DetokenizeOptions {
+    private final RequestInterceptor interceptor;
+
+    private DetokenizeOptions(Builder builder) {
+        this.interceptor = builder.interceptor;
+    }
+
+    public RequestInterceptor getInterceptor() {
+        return interceptor;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static final class Builder {
+        private RequestInterceptor interceptor;
+
+        public Builder interceptor(RequestInterceptor interceptor) {
+            this.interceptor = interceptor;
+            return this;
+        }
+
+        public DetokenizeOptions build() {
+            return new DetokenizeOptions(this);
+        }
+    }
+}

v3/src/main/java/com/skyflow/vault/data/DeleteTokensOptions.java

@@ -10,14 +10,22 @@ public class ErrorRecord {
     private String error;
     @Expose(serialize = true)
     private int code;
-//    public ErrorRecord() {
-//    }
+    @Expose(serialize = true)
+    private String requestId;
 
     public ErrorRecord(int index, String error, int code) {
         this.index = index;
         this.error = error;
         this.code = code;
     }
+
+    public ErrorRecord(int index, String error, int code, String requestId) {
+        this.index = index;
+        this.error = error;
+        this.code = code;
+        this.requestId = requestId;
+    }
+
     public String getError() {
         return error;
     }
@@ -30,6 +38,10 @@ public int getIndex() {
         return index;
     }
 
+    public String getRequestId() {
+        return requestId;
+    }
+
 
     @Override
     public String toString() {

v3/src/main/java/com/skyflow/vault/data/DetokenizeOptions.java

@@ -0,0 +1,30 @@
+package com.skyflow.vault.data;
+
+public final class InsertOptions {
+    private final RequestInterceptor interceptor;
+
+    private InsertOptions(Builder builder) {
+        this.interceptor = builder.interceptor;
+    }
+
+    public RequestInterceptor getInterceptor() {
+        return interceptor;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static final class Builder {
+        private RequestInterceptor interceptor;
+
+        public Builder interceptor(RequestInterceptor interceptor) {
+            this.interceptor = interceptor;
+            return this;
+        }
+
+        public InsertOptions build() {
+            return new InsertOptions(this);
+        }
+    }
+}

v3/src/main/java/com/skyflow/vault/data/ErrorRecord.java

@@ -0,0 +1,32 @@
+package com.skyflow.vault.data;
+
+import com.skyflow.enums.CustomHeaderKey;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public final class RequestContext {
+    private final String operation;
+    private final int batchIndex;
+    private final int totalBatches;
+    private final Map<CustomHeaderKey, String> headers = new HashMap<>();
+
+    public RequestContext(String operation, int batchIndex, int totalBatches) {
+        this.operation = operation;
+        this.batchIndex = batchIndex;
+        this.totalBatches = totalBatches;
+    }
+
+    public String getOperation() { return operation; }
+    public int getBatchIndex() { return batchIndex; }
+    public int getTotalBatches() { return totalBatches; }
+
+    public void addHeader(CustomHeaderKey key, String value) {
+        headers.put(key, value);
+    }
+
+    public Map<CustomHeaderKey, String> getHeaders() {
+        return Collections.unmodifiableMap(headers);
+    }
+}