feat: script to add version header to java dsdk on generation, some test fixes that are already merged in java sdk

Author: YegorZh

.gitignore

@@ -76,4 +76,7 @@ target/
 node_modules
 
 #macOS
-.DS_Store
+.DS_Store
+
+#local env
+.env

package-lock.json

@@ -2,7 +2,8 @@
     "scripts": {
         "bundle": "redocly bundle openapi.json -o dist/bundledSchema.json",
         "fix-java-file-get-requests": "ts-node ./scripts/java/fixFileRelatedGetRequests.ts",
-        "generate-java": "rm -rf ./dist/java-sdk && npm run bundle && npx mkdirp dist/java-sdk/src/test/java/unit/java/sdk && cp -a ./unit/e2e_tests/java/. ./dist/java-sdk/src/test/java/unit/java/sdk && openapi-generator-cli generate -g java -i ./dist/bundledSchema.json -o ./dist/java-sdk -p hideGenerationTimestamp=true -p packageName=unit.java.sdk -p modelPackage=unit.java.sdk.model -p apiPackage=unit.java.sdk.api --library native -p useJakartaEe=true --openapi-normalizer REFACTOR_ALLOF_WITH_PROPERTIES_ONLY=true && npm run fix-java-file-get-requests -- --path=./dist/java-sdk/src/main/java/unit/java/sdk/api/UnitApi.java",
+        "add-version-header-to-java": "ts-node ./scripts/java/addVersionHeaderToApiClient.ts",
+        "generate-java": "rm -rf ./dist/java-sdk && npm run bundle && npx mkdirp dist/java-sdk/src/test/java/unit/java/sdk && cp -a ./unit/e2e_tests/java/. ./dist/java-sdk/src/test/java/unit/java/sdk && openapi-generator-cli generate -g java -i ./dist/bundledSchema.json -o ./dist/java-sdk -p hideGenerationTimestamp=true -p packageName=unit.java.sdk -p modelPackage=unit.java.sdk.model -p apiPackage=unit.java.sdk.api --library native -p useJakartaEe=true --openapi-normalizer REFACTOR_ALLOF_WITH_PROPERTIES_ONLY=true && npm run fix-java-file-get-requests -- --path=./dist/java-sdk/src/main/java/unit/java/sdk/api/UnitApi.java && npm run add-version-header-to-java -- --path=./dist/java-sdk/src/main/java/unit/java/sdk/ApiClient.java",
         "generate-ruby": "rm -rf ./dist/ruby-sdk && npm run bundle && cp -r unit ./dist/ruby-sdk && openapi-generator-cli generate -g ruby -i ./dist/bundledSchema.json -o ./dist/ruby-sdk",
         "generate-node": "rm -rf ./dist/node-sdk && npm run bundle && openapi-generator-cli generate -g typescript-axios -i ./dist/bundledSchema.json -o ./dist/node-sdk",
         "lint": "redocly lint --config .redocly.yaml openapi.json",
@@ -11,6 +12,7 @@
     "dependencies": {
         "@openapitools/openapi-generator-cli": "^2.14.0",
         "@redocly/cli": "^1.13.0",
+        "dotenv": "^16.4.5",
         "prettier": "^3.2.5",
         "ts-node": "^10.9.2"
     }

package.json

@@ -0,0 +1,36 @@
+import { getPathCmdParameter, loadDotenv, openJavaFile } from "./utils";
+import fs from "fs";
+
+function addVersionHeadersToApiClient(data: string): string {
+    const interceptorRegex = /interceptor = null;/gm;
+
+    var processedData = data;
+    console.log("API VERSION: " + process.env.API_VERSION);
+    const interceptorWithVersionHeader = `interceptor = (req) -> {
+      req.setHeader("X-UNIT-SDK", "unit-node-sdk@v${process.env.API_VERSION}");
+    };`;
+    processedData = processedData.replaceAll(
+        interceptorRegex,
+        interceptorWithVersionHeader
+    );
+
+    return processedData;
+}
+
+function execute() {
+    loadDotenv();
+
+    try {
+        console.log("Adding version header to ApiClient...");
+        const path = getPathCmdParameter();
+        const data = openJavaFile(path);
+        const processedData = addVersionHeadersToApiClient(data);
+        console.log("Added version header to ApiClient!");
+
+        fs.writeFileSync(path, processedData);
+    } catch (e) {
+        console.error(e);
+    }
+}
+
+execute();

scripts/java/addVersionHeaderToApiClient.ts

@@ -1,6 +1,7 @@
 import fs from "fs";
+import { getPathCmdParameter, openJavaFile } from "./utils";
 
-function processData(data: string): string {
+function fixFileRelatedGetRequests(data: string): string {
     const mainFunctionNameRegex = /(File )(get|download)/gm;
     const mainFunctionHttpInfoReturnRegex =
         /(ApiResponse<)(File)(> localVarResponse)/gm;
@@ -73,26 +74,14 @@ import java.net.URI;`
 }
 
 function execute() {
-    const pathArg = process.argv.find((val) => val.includes("--path="));
-    if (pathArg == null) {
-        console.error(
-            `Undefined path! Don't forget to specify the path, e.g. "...fixFileRelatedGetRequests.ts ./TargetFile.java"`
-        );
-        return;
-    }
-
-    const path = pathArg?.replace("--path=", "");
-    if (!path.includes(".java")) {
-        console.error("Path must lead to a java file!");
-        return;
-    }
-
     try {
         console.log("Fixing file related get requests...");
-        const data = fs.readFileSync(path, "utf-8");
-        const processedData = processData(data);
-        fs.writeFileSync(path, processedData);
+        const path = getPathCmdParameter();
+        const data = openJavaFile(path);
+        const processedData = fixFileRelatedGetRequests(data);
         console.log("Fixed file related get requests!");
+
+        fs.writeFileSync(path, processedData);
     } catch (e) {
         console.error(e);
     }

scripts/java/fixFileRelatedGetRequests.ts

@@ -0,0 +1,31 @@
+import fs from "fs";
+import dotenv from "dotenv";
+
+export function loadDotenv() {
+    dotenv.config();
+}
+
+export function openJavaFile(path: string): string {
+    if (!path.includes(".java")) {
+        throw new Error("Path must lead to a java file!");
+    }
+
+    return fs.readFileSync(path, "utf-8");
+}
+
+export function getPathCmdParameter(): string {
+    const pathArg = process.argv.find((val) => val.includes("--path="));
+
+    if (pathArg == null) {
+        throw new Error(
+            `Undefined path! Don't forget to specify the path, e.g. "...fixFileRelatedGetRequests.ts ./TargetFile.java"`
+        );
+    }
+
+    const path = pathArg?.replace("--path=", "");
+    if (!path.includes(".java")) {
+        throw new Error("Path must lead to a java file!");
+    }
+
+    return path;
+}

scripts/java/utils.ts

@@ -414,7 +414,7 @@ WalletAccount CreateAndCloseWalletAccount() throws ApiException {
         CloseAccountRequestDataAttributes closeAccountRequestAttributes = new CloseAccountRequestDataAttributes();
         closeAccountRequestAttributes.setReason(CloseAccountRequestDataAttributes.ReasonEnum.BY_CUSTOMER);
         closeAccountRequestData.setAttributes(closeAccountRequestAttributes);
-        closeAccountRequestData.setType(CloseAccountRequestData.TypeEnum.DEPOSIT_ACCOUNT_CLOSE);
+        closeAccountRequestData.setType(CloseAccountRequestData.TypeEnum.WALLET_ACCOUNT_CLOSE);
         closeAccountRequest.setData(closeAccountRequestData);
 
         UnitAccountResponse res = unitApi.closeAccount(walletAccount.getId(), closeAccountRequest);
@@ -436,7 +436,7 @@ public void ReopenWalletAccountApiTest() throws ApiException {
     }
 
     WalletAccount CreateAndFreezeWalletAccount() throws ApiException {
-        DepositAccount walletAccount = CreateDepositAccount(unitApi, CreateIndividualCustomer(unitApi));
+        WalletAccount walletAccount = CreateWalletAccount();
         FreezeAccountRequest freezeAccountRequest = new FreezeAccountRequest();
         FreezeAccountRequestData freezeAccountRequestData = new FreezeAccountRequestData();
         FreezeAccountRequestDataAttributes freezeAccountRequestDataAttributes = new FreezeAccountRequestDataAttributes();
@@ -464,8 +464,8 @@ public void UnfreezeWalletAccountApiTest() throws ApiException {
 
     @Test
     public void GetWalletAccountLimitsApiTest() throws ApiException {
-        DepositAccount depositAccount = CreateDepositAccount(unitApi, CreateIndividualCustomer(unitApi));
-        UnitGetAccountLimitsResponse res = unitApi.getAccountLimits(depositAccount.getId());
+        WalletAccount walletAccount = CreateWalletAccount();
+        UnitGetAccountLimitsResponse res = unitApi.getAccountLimits(walletAccount.getId());
         assert res.getData().getType().equals(Limits.TypeEnum.WALLET_LIMITS);
     }
 

unit/e2e_tests/java/AccountTests.java

@@ -7,7 +7,6 @@
 import static unit.java.sdk.TestHelpers.CreateWirePaymentCounterparty;
 import static unit.java.sdk.TestHelpers.GenerateUnitApiClient;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 import static unit.java.sdk.CustomerTests.CreateIndividualCustomer;
@@ -19,7 +18,6 @@
 import unit.java.sdk.model.AchPayment;
 import unit.java.sdk.model.BookPayment;
 import unit.java.sdk.model.CashDepositBarcode;
-import unit.java.sdk.model.Coordinates;
 import unit.java.sdk.model.Counterparty;
 import unit.java.sdk.model.CounterpartyAccountRelationship;
 import unit.java.sdk.model.CounterpartyAccountRelationshipData;
@@ -54,7 +52,6 @@
 import unit.java.sdk.model.GenerateBarcodeRequestDataAttributes;
 import unit.java.sdk.model.GenerateBarcodeRequestRelationships;
 import unit.java.sdk.model.GetCashDepositStoreLocationsListFilterParameter;
-import unit.java.sdk.model.GetCheckDepositsListFilterParameter;
 import unit.java.sdk.model.IndividualCustomer;
 import unit.java.sdk.model.IndividualDebitCard;
 import unit.java.sdk.model.ListPageParameters;
@@ -301,7 +298,7 @@ public void UpdateAchPaymentApiTest() throws ApiException {
     @Test
     public void CancelAchPaymentTest() throws ApiException {
         AchPayment payment = CreateAchPayment();
-        System.err.println(payment.getAttributes().getStatus());
+
         UnitPaymentResponse res = unitApi.cancelPayment(payment.getId(), new Object());
         assert res.getData().getType().equals(Payment.TypeEnum.ACH_PAYMENT);
     }

unit/e2e_tests/java/PaymentTests.java

@@ -135,7 +135,7 @@ public void ReprocessReceivedPaymentApiTest() throws ApiException {
         UnitReceivedPaymentResponse res = unitApi.createIncomingAchPaymentSimulation(req);
         ReceivedPayment payment = res.getData();
         assert payment.getType().equals(ReceivedPayment.TypeEnum.ACH_RECEIVED_PAYMENT);
-        System.err.println(payment.toString());
+        
         UnitReceivedPaymentResponse reprocessRes = unitApi.reprocessReceivedPayment(payment.getId());
         assert reprocessRes.getData().getType().equals(ReceivedPayment.TypeEnum.ACH_RECEIVED_PAYMENT);
     }

unit/e2e_tests/java/ReceivedPaymentTests.java

@@ -1,8 +1,10 @@
 package unit.java.sdk;
 
+import java.net.http.HttpRequest;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -44,7 +46,12 @@ static UnitApi GenerateUnitApiClient() {
         ObjectMapper mapper = cl.getObjectMapper();
         mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
         cl.setObjectMapper(mapper);
-        cl.setRequestInterceptor(r -> r.header("Authorization", "Bearer " + access_token));
+        Consumer<HttpRequest.Builder> defaultInterceptor = cl.getRequestInterceptor();
+        cl.setRequestInterceptor(r -> {
+            r.header("Authorization", "Bearer " + access_token);
+            System.err.println(r.build().headers().toString());
+            System.err.println("println test");
+        });
         unitApi = new UnitApi(cl);
         }