SK-1910: Migrate Java SDK from openapi generator to Fern SDK generator

pom.xml

@@ -45,6 +45,30 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.12.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.17.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jdk8</artifactId>
+            <version>2.17.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.17.2</version>
+            <scope>compile</scope>
+        </dependency>
         <!-- newly added v2 dependencies -->
         <dependency>
             <groupId>io.github.cdimascio</groupId>

src/main/java/com/skyflow/VaultClient.java

@@ -6,11 +6,16 @@
 import com.skyflow.errors.ErrorMessage;
 import com.skyflow.errors.SkyflowException;
 import com.skyflow.generated.rest.ApiClient;
-import com.skyflow.generated.rest.api.QueryApi;
-import com.skyflow.generated.rest.api.RecordsApi;
-import com.skyflow.generated.rest.api.TokensApi;
-import com.skyflow.generated.rest.auth.HttpBearerAuth;
-import com.skyflow.generated.rest.models.*;
+import com.skyflow.generated.rest.ApiClientBuilder;
+import com.skyflow.generated.rest.resources.query.QueryClient;
+import com.skyflow.generated.rest.resources.records.RecordsClient;
+import com.skyflow.generated.rest.resources.records.requests.RecordServiceBatchOperationBody;
+import com.skyflow.generated.rest.resources.records.requests.RecordServiceInsertRecordBody;
+import com.skyflow.generated.rest.resources.records.requests.RecordServiceUpdateRecordBody;
+import com.skyflow.generated.rest.resources.tokens.TokensClient;
+import com.skyflow.generated.rest.resources.tokens.requests.V1DetokenizePayload;
+import com.skyflow.generated.rest.resources.tokens.requests.V1TokenizePayload;
+import com.skyflow.generated.rest.types.*;
 import com.skyflow.logs.InfoLogs;
 import com.skyflow.serviceaccount.util.Token;
 import com.skyflow.utils.Constants;
@@ -31,11 +36,9 @@
 import java.util.List;
 
 public class VaultClient {
-    private final RecordsApi recordsApi;
-    private final TokensApi tokensApi;
-    private final QueryApi queryApi;
-    private final ApiClient apiClient;
     private final VaultConfig vaultConfig;
+    private final ApiClientBuilder apiClientBuilder;
+    private ApiClient apiClient;
     private Credentials commonCredentials;
     private Credentials finalCredentials;
     private String token;
@@ -45,28 +48,21 @@ protected VaultClient(VaultConfig vaultConfig, Credentials credentials) {
         super();
         this.vaultConfig = vaultConfig;
         this.commonCredentials = credentials;
-        this.apiClient = new ApiClient();
-        apiClient.addDefaultHeader(Constants.SDK_METRICS_HEADER_KEY, Utils.getMetrics().toString());
-        this.recordsApi = new RecordsApi(this.apiClient);
-        this.tokensApi = new TokensApi(this.apiClient);
-        this.queryApi = new QueryApi(this.apiClient);
+        this.apiClientBuilder = new ApiClientBuilder();
+        this.apiClient = null;
         updateVaultURL();
     }
 
-    protected RecordsApi getRecordsApi() {
-        return recordsApi;
+    protected RecordsClient getRecordsApi() {
+        return this.apiClient.records();
     }
 
-    protected TokensApi getTokensApi() {
-        return tokensApi;
+    protected TokensClient getTokensApi() {
+        return this.apiClient.tokens();
     }
 
-    protected QueryApi getQueryApi() {
-        return queryApi;
-    }
-
-    protected ApiClient getApiClient() {
-        return apiClient;
+    protected QueryClient getQueryApi() {
+        return this.apiClient.query();
     }
 
     protected VaultConfig getVaultConfig() {
@@ -84,90 +80,117 @@ protected void updateVaultConfig() throws SkyflowException {
     }
 
     protected V1DetokenizePayload getDetokenizePayload(DetokenizeRequest request) {
-        V1DetokenizePayload payload = new V1DetokenizePayload();
-        payload.setContinueOnError(request.getContinueOnError());
-        payload.setDownloadURL(request.getDownloadURL());
+        List<V1DetokenizeRecordRequest> recordRequests = new ArrayList<>();
+
         for (DetokenizeData detokenizeDataRecord : request.getDetokenizeData()) {
-            V1DetokenizeRecordRequest recordRequest = new V1DetokenizeRecordRequest();
-            recordRequest.setToken(detokenizeDataRecord.getToken());
-            recordRequest.setRedaction(detokenizeDataRecord.getRedactionType().getRedaction());
-            payload.addDetokenizationParametersItem(recordRequest);
+            V1DetokenizeRecordRequest recordRequest = V1DetokenizeRecordRequest.builder()
+                    .token(detokenizeDataRecord.getToken())
+                    .redaction(detokenizeDataRecord.getRedactionType().getRedaction())
+                    .build();
+            recordRequests.add(recordRequest);
         }
-        return payload;
+
+        return V1DetokenizePayload.builder()
+                .continueOnError(request.getContinueOnError())
+                .downloadUrl(request.getDownloadURL())
+                .detokenizationParameters(recordRequests)
+                .build();
     }
 
     protected RecordServiceInsertRecordBody getBulkInsertRequestBody(InsertRequest request) {
-        RecordServiceInsertRecordBody insertRecordBody = new RecordServiceInsertRecordBody();
-        insertRecordBody.setTokenization(request.getReturnTokens());
-        insertRecordBody.setHomogeneous(request.getHomogeneous());
-        insertRecordBody.setUpsert(request.getUpsert());
-        insertRecordBody.setByot(request.getTokenMode().getBYOT());
-
         List<HashMap<String, Object>> values = request.getValues();
         List<HashMap<String, Object>> tokens = request.getTokens();
         List<V1FieldRecords> records = new ArrayList<>();
+
         for (int index = 0; index < values.size(); index++) {
-            V1FieldRecords record = new V1FieldRecords();
-            record.setFields(values.get(index));
+            V1FieldRecords.Builder recordBuilder = V1FieldRecords.builder().fields(values.get(index));
             if (tokens != null && index < tokens.size()) {
-                record.setTokens(tokens.get(index));
+                recordBuilder.tokens(tokens.get(index));
             }
-            records.add(record);
+            records.add(recordBuilder.build());
         }
-        insertRecordBody.setRecords(records);
-        return insertRecordBody;
+
+        return RecordServiceInsertRecordBody.builder()
+                .tokenization(request.getReturnTokens())
+                .homogeneous(request.getHomogeneous())
+                .upsert(request.getUpsert())
+                .byot(request.getTokenMode().getBYOT())
+                .records(records)
+                .build();
     }
 
     protected RecordServiceBatchOperationBody getBatchInsertRequestBody(InsertRequest request) {
-        RecordServiceBatchOperationBody insertRequestBody = new RecordServiceBatchOperationBody();
-        insertRequestBody.setContinueOnError(true);
-        insertRequestBody.setByot(request.getTokenMode().getBYOT());
-
         ArrayList<HashMap<String, Object>> values = request.getValues();
         ArrayList<HashMap<String, Object>> tokens = request.getTokens();
         List<V1BatchRecord> records = new ArrayList<>();
 
         for (int index = 0; index < values.size(); index++) {
-            V1BatchRecord record = new V1BatchRecord();
-            record.setMethod(BatchRecordMethod.POST);
-            record.setTableName(request.getTable());
-            record.setUpsert(request.getUpsert());
-            record.setTokenization(request.getReturnTokens());
-            record.setFields(values.get(index));
+            V1BatchRecord.Builder recordBuilder = V1BatchRecord.builder()
+                    .method(BatchRecordMethod.POST)
+                    .tableName(request.getTable())
+                    .upsert(request.getUpsert())
+                    .tokenization(request.getReturnTokens())
+                    .fields(values.get(index));
+
             if (tokens != null && index < tokens.size()) {
-                record.setTokens(tokens.get(index));
+                recordBuilder.tokens(tokens.get(index));
             }
-            records.add(record);
+
+            records.add(recordBuilder.build());
         }
 
-        insertRequestBody.setRecords(records);
-        return insertRequestBody;
+        return RecordServiceBatchOperationBody.builder()
+                .continueOnError(true)
+                .byot(request.getTokenMode().getBYOT())
+                .records(records)
+                .build();
     }
 
     protected RecordServiceUpdateRecordBody getUpdateRequestBody(UpdateRequest request) {
-        RecordServiceUpdateRecordBody updateRequestBody = new RecordServiceUpdateRecordBody();
-        updateRequestBody.byot(request.getTokenMode().getBYOT());
-        updateRequestBody.setTokenization(request.getReturnTokens());
+        RecordServiceUpdateRecordBody.Builder updateRequestBodyBuilder = RecordServiceUpdateRecordBody.builder();
+        updateRequestBodyBuilder.byot(request.getTokenMode().getBYOT());
+        updateRequestBodyBuilder.tokenization(request.getReturnTokens());
+        V1FieldRecords.Builder recordBuilder = V1FieldRecords.builder();
         HashMap<String, Object> values = request.getData();
+
+        if (values != null) {
+            recordBuilder.fields(values);
+        }
+
         HashMap<String, Object> tokens = request.getTokens();
-        V1FieldRecords record = new V1FieldRecords();
-        record.setFields(values);
         if (tokens != null) {
-            record.setTokens(tokens);
+            recordBuilder.tokens(tokens);
         }
-        updateRequestBody.setRecord(record);
-        return updateRequestBody;
+
+        updateRequestBodyBuilder.record(recordBuilder.build());
+
+        return updateRequestBodyBuilder.build();
     }
 
     protected V1TokenizePayload getTokenizePayload(TokenizeRequest request) {
-        V1TokenizePayload payload = new V1TokenizePayload();
+        List<V1TokenizeRecordRequest> tokenizationParameters = new ArrayList<>();
+
         for (ColumnValue columnValue : request.getColumnValues()) {
-            V1TokenizeRecordRequest recordRequest = new V1TokenizeRecordRequest();
-            recordRequest.setValue(columnValue.getValue());
-            recordRequest.setColumnGroup(columnValue.getColumnGroup());
-            payload.addTokenizationParametersItem(recordRequest);
+            V1TokenizeRecordRequest.Builder recordBuilder = V1TokenizeRecordRequest.builder();
+            String value = columnValue.getValue();
+            if (value != null) {
+                recordBuilder.value(value);
+            }
+            String columnGroup = columnValue.getColumnGroup();
+            if (columnGroup != null) {
+                recordBuilder.columnGroup(columnGroup);
+            }
+
+            tokenizationParameters.add(recordBuilder.build());
         }
-        return payload;
+
+        V1TokenizePayload.Builder payloadBuilder = V1TokenizePayload.builder();
+
+        if (!tokenizationParameters.isEmpty()) {
+            payloadBuilder.tokenizationParameters(tokenizationParameters);
+        }
+
+        return payloadBuilder.build();
     }
 
     protected void setBearerToken() throws SkyflowException {
@@ -182,8 +205,8 @@ protected void setBearerToken() throws SkyflowException {
         } else {
             LogUtil.printInfoLog(InfoLogs.REUSE_BEARER_TOKEN.getLog());
         }
-        HttpBearerAuth Bearer = (HttpBearerAuth) this.apiClient.getAuthentication("Bearer");
-        Bearer.setBearerToken(token);
+        this.apiClientBuilder.token(token);
+        this.apiClient = this.apiClientBuilder.build();
     }
 
     private void setApiKey() {
@@ -192,13 +215,12 @@ private void setApiKey() {
         } else {
             LogUtil.printInfoLog(InfoLogs.REUSE_API_KEY.getLog());
         }
-        HttpBearerAuth Bearer = (HttpBearerAuth) this.apiClient.getAuthentication("Bearer");
-        Bearer.setBearerToken(apiKey);
+        this.apiClientBuilder.token(token);
     }
 
     private void updateVaultURL() {
         String vaultURL = Utils.getVaultURL(this.vaultConfig.getClusterId(), this.vaultConfig.getEnv());
-        this.apiClient.setBasePath(vaultURL);
+        this.apiClientBuilder.url(vaultURL);
     }
 
     private void prioritiseCredentials() throws SkyflowException {

src/main/java/com/skyflow/enums/RedactionType.java

@@ -1,20 +1,21 @@
 package com.skyflow.enums;
 
-import com.skyflow.generated.rest.models.RedactionEnumREDACTION;
+
+import com.skyflow.generated.rest.types.RedactionEnumRedaction;
 
 public enum RedactionType {
-    PLAIN_TEXT(RedactionEnumREDACTION.PLAIN_TEXT),
-    MASKED(RedactionEnumREDACTION.MASKED),
-    DEFAULT(RedactionEnumREDACTION.DEFAULT),
-    REDACTED(RedactionEnumREDACTION.REDACTED);
+    PLAIN_TEXT(RedactionEnumRedaction.PLAIN_TEXT),
+    MASKED(RedactionEnumRedaction.MASKED),
+    DEFAULT(RedactionEnumRedaction.DEFAULT),
+    REDACTED(RedactionEnumRedaction.REDACTED);
 
-    private final RedactionEnumREDACTION redaction;
+    private final RedactionEnumRedaction redaction;
 
-    RedactionType(RedactionEnumREDACTION redaction) {
+    RedactionType(RedactionEnumRedaction redaction) {
         this.redaction = redaction;
     }
 
-    public RedactionEnumREDACTION getRedaction() {
+    public RedactionEnumRedaction getRedaction() {
         return redaction;
     }
 

src/main/java/com/skyflow/enums/TokenMode.java

@@ -1,24 +1,24 @@
 package com.skyflow.enums;
 
-import com.skyflow.generated.rest.models.V1BYOT;
+import com.skyflow.generated.rest.types.V1Byot;
 
 public enum TokenMode {
-    DISABLE(V1BYOT.DISABLE),
-    ENABLE(V1BYOT.ENABLE),
-    ENABLE_STRICT(V1BYOT.ENABLE_STRICT);
+    DISABLE(V1Byot.DISABLE),
+    ENABLE(V1Byot.ENABLE),
+    ENABLE_STRICT(V1Byot.ENABLE_STRICT);
 
-    private final V1BYOT byot;
+    private final V1Byot byot;
 
-    TokenMode(V1BYOT byot) {
+    TokenMode(V1Byot byot) {
         this.byot = byot;
     }
 
-    public V1BYOT getBYOT() {
+    public V1Byot getBYOT() {
         return byot;
     }
 
     @Override
     public String toString() {
-        return String.valueOf(byot);
+        return byot.toString();
     }
 }