fix(client): add some missing validate() calls (#306)

chore(internal): refactor `validate` methods
Modern-Treasury · Jan 14, 2025 · 9fe1b97 · 9fe1b97
1 parent 0e08d79
commit 9fe1b97
Show file tree

Hide file tree

Showing 186 changed files with 4,996 additions and 3,864 deletions.
diff --git a/...treasury-java-core/src/main/kotlin/com/moderntreasury/api/models/AccountCollectionFlow.kt b/...treasury-java-core/src/main/kotlin/com/moderntreasury/api/models/AccountCollectionFlow.kt
@@ -161,20 +161,22 @@ private constructor(
     private var validated: Boolean = false
 
     fun validate(): AccountCollectionFlow = apply {
-        if (!validated) {
-            counterpartyId()
-            paymentTypes()
-            id()
-            clientToken()
-            createdAt()
-            externalAccountId()
-            liveMode()
-            object_()
-            receivingCountries()
-            status()
-            updatedAt()
-            validated = true
+        if (validated) {
+            return@apply
         }
+
+        counterpartyId()
+        paymentTypes()
+        id()
+        clientToken()
+        createdAt()
+        externalAccountId()
+        liveMode()
+        object_()
+        receivingCountries()
+        status()
+        updatedAt()
+        validated = true
     }
 
     fun toBuilder() = Builder().from(this)

diff --git a/...a-core/src/main/kotlin/com/moderntreasury/api/models/AccountCollectionFlowCreateParams.kt b/...a-core/src/main/kotlin/com/moderntreasury/api/models/AccountCollectionFlowCreateParams.kt
@@ -99,12 +99,14 @@ constructor(
         private var validated: Boolean = false
 
         fun validate(): AccountCollectionFlowCreateBody = apply {
-            if (!validated) {
-                counterpartyId()
-                paymentTypes()
-                receivingCountries()
-                validated = true
+            if (validated) {
+                return@apply
             }
+
+            counterpartyId()
+            paymentTypes()
+            receivingCountries()
+            validated = true
         }
 
         fun toBuilder() = Builder().from(this)

diff --git a/...-java-core/src/main/kotlin/com/moderntreasury/api/models/AccountCollectionFlowListPage.kt b/...-java-core/src/main/kotlin/com/moderntreasury/api/models/AccountCollectionFlowListPage.kt
@@ -97,8 +97,6 @@ private constructor(
         private val additionalProperties: Map<String, JsonValue> = immutableEmptyMap(),
     ) {
 
-        private var validated: Boolean = false
-
         fun items(): List<AccountCollectionFlow> = items.getNullable("items") ?: listOf()
 
         fun perPage(): String = perPage
@@ -112,11 +110,15 @@ private constructor(
         @ExcludeMissing
         fun _additionalProperties(): Map<String, JsonValue> = additionalProperties
 
+        private var validated: Boolean = false
+
         fun validate(): Response = apply {
-            if (!validated) {
-                items().map { it.validate() }
-                validated = true
+            if (validated) {
+                return@apply
             }
+
+            items().map { it.validate() }
+            validated = true
         }
 
         fun toBuilder() = Builder().from(this)

diff --git a/...-core/src/main/kotlin/com/moderntreasury/api/models/AccountCollectionFlowListPageAsync.kt b/...-core/src/main/kotlin/com/moderntreasury/api/models/AccountCollectionFlowListPageAsync.kt
@@ -100,8 +100,6 @@ private constructor(
         private val additionalProperties: Map<String, JsonValue> = immutableEmptyMap(),
     ) {
 
-        private var validated: Boolean = false
-
         fun items(): List<AccountCollectionFlow> = items.getNullable("items") ?: listOf()
 
         fun perPage(): String = perPage
@@ -115,11 +113,15 @@ private constructor(
         @ExcludeMissing
         fun _additionalProperties(): Map<String, JsonValue> = additionalProperties
 
+        private var validated: Boolean = false
+
         fun validate(): Response = apply {
-            if (!validated) {
-                items().map { it.validate() }
-                validated = true
+            if (validated) {
+                return@apply
             }
+
+            items().map { it.validate() }
+            validated = true
         }
 
         fun toBuilder() = Builder().from(this)

diff --git a/...a-core/src/main/kotlin/com/moderntreasury/api/models/AccountCollectionFlowUpdateParams.kt b/...a-core/src/main/kotlin/com/moderntreasury/api/models/AccountCollectionFlowUpdateParams.kt
@@ -91,10 +91,12 @@ constructor(
         private var validated: Boolean = false
 
         fun validate(): AccountCollectionFlowUpdateBody = apply {
-            if (!validated) {
-                status()
-                validated = true
+            if (validated) {
+                return@apply
             }
+
+            status()
+            validated = true
         }
 
         fun toBuilder() = Builder().from(this)

diff --git a/modern-treasury-java-core/src/main/kotlin/com/moderntreasury/api/models/AccountDetail.kt b/modern-treasury-java-core/src/main/kotlin/com/moderntreasury/api/models/AccountDetail.kt
@@ -129,18 +129,20 @@ private constructor(
     private var validated: Boolean = false
 
     fun validate(): AccountDetail = apply {
-        if (!validated) {
-            id()
-            accountNumberSafe()
-            accountNumberType()
-            createdAt()
-            discardedAt()
-            liveMode()
-            object_()
-            updatedAt()
-            accountNumber()
-            validated = true
+        if (validated) {
+            return@apply
         }
+
+        id()
+        accountNumberSafe()
+        accountNumberType()
+        createdAt()
+        discardedAt()
+        liveMode()
+        object_()
+        updatedAt()
+        accountNumber()
+        validated = true
     }
 
     fun toBuilder() = Builder().from(this)

diff --git a/...sury-java-core/src/main/kotlin/com/moderntreasury/api/models/AccountDetailCreateParams.kt b/...sury-java-core/src/main/kotlin/com/moderntreasury/api/models/AccountDetailCreateParams.kt
@@ -116,11 +116,13 @@ constructor(
         private var validated: Boolean = false
 
         fun validate(): AccountDetailCreateBody = apply {
-            if (!validated) {
-                accountNumber()
-                accountNumberType()
-                validated = true
+            if (validated) {
+                return@apply
             }
+
+            accountNumber()
+            accountNumberType()
+            validated = true
         }
 
         fun toBuilder() = Builder().from(this)

diff --git a/...treasury-java-core/src/main/kotlin/com/moderntreasury/api/models/AccountDetailListPage.kt b/...treasury-java-core/src/main/kotlin/com/moderntreasury/api/models/AccountDetailListPage.kt
@@ -93,8 +93,6 @@ private constructor(
         private val additionalProperties: Map<String, JsonValue> = immutableEmptyMap(),
     ) {
 
-        private var validated: Boolean = false
-
         fun items(): List<AccountDetail> = items.getNullable("items") ?: listOf()
 
         fun perPage(): String = perPage
@@ -108,11 +106,15 @@ private constructor(
         @ExcludeMissing
         fun _additionalProperties(): Map<String, JsonValue> = additionalProperties
 
+        private var validated: Boolean = false
+
         fun validate(): Response = apply {
-            if (!validated) {
-                items().map { it.validate() }
-                validated = true
+            if (validated) {
+                return@apply
             }
+
+            items().map { it.validate() }
+            validated = true
         }
 
         fun toBuilder() = Builder().from(this)

diff --git a/...ury-java-core/src/main/kotlin/com/moderntreasury/api/models/AccountDetailListPageAsync.kt b/...ury-java-core/src/main/kotlin/com/moderntreasury/api/models/AccountDetailListPageAsync.kt
@@ -96,8 +96,6 @@ private constructor(
         private val additionalProperties: Map<String, JsonValue> = immutableEmptyMap(),
     ) {
 
-        private var validated: Boolean = false
-
         fun items(): List<AccountDetail> = items.getNullable("items") ?: listOf()
 
         fun perPage(): String = perPage
@@ -111,11 +109,15 @@ private constructor(
         @ExcludeMissing
         fun _additionalProperties(): Map<String, JsonValue> = additionalProperties
 
+        private var validated: Boolean = false
+
         fun validate(): Response = apply {
-            if (!validated) {
-                items().map { it.validate() }
-                validated = true
+            if (validated) {
+                return@apply
             }
+
+            items().map { it.validate() }
+            validated = true
         }
 
         fun toBuilder() = Builder().from(this)

diff --git a/modern-treasury-java-core/src/main/kotlin/com/moderntreasury/api/models/AsyncResponse.kt b/modern-treasury-java-core/src/main/kotlin/com/moderntreasury/api/models/AsyncResponse.kt
@@ -41,11 +41,13 @@ private constructor(
     private var validated: Boolean = false
 
     fun validate(): AsyncResponse = apply {
-        if (!validated) {
-            id()
-            object_()
-            validated = true
+        if (validated) {
+            return@apply
         }
+
+        id()
+        object_()
+        validated = true
     }
 
     fun toBuilder() = Builder().from(this)

diff --git a/modern-treasury-java-core/src/main/kotlin/com/moderntreasury/api/models/BalanceReport.kt b/modern-treasury-java-core/src/main/kotlin/com/moderntreasury/api/models/BalanceReport.kt
@@ -135,19 +135,21 @@ private constructor(
     private var validated: Boolean = false
 
     fun validate(): BalanceReport = apply {
-        if (!validated) {
-            id()
-            asOfDate()
-            asOfTime()
-            balanceReportType()
-            balances().forEach { it.validate() }
-            createdAt()
-            internalAccountId()
-            liveMode()
-            object_()
-            updatedAt()
-            validated = true
+        if (validated) {
+            return@apply
         }
+
+        id()
+        asOfDate()
+        asOfTime()
+        balanceReportType()
+        balances().forEach { it.validate() }
+        createdAt()
+        internalAccountId()
+        liveMode()
+        object_()
+        updatedAt()
+        validated = true
     }
 
     fun toBuilder() = Builder().from(this)
@@ -544,22 +546,24 @@ private constructor(
         private var validated: Boolean = false
 
         fun validate(): Balance = apply {
-            if (!validated) {
-                id()
-                amount()
-                asOfDate()
-                asOfTime()
-                balanceType()
-                createdAt()
-                currency()
-                liveMode()
-                object_()
-                updatedAt()
-                valueDate()
-                vendorCode()
-                vendorCodeType()
-                validated = true
+            if (validated) {
+                return@apply
             }
+
+            id()
+            amount()
+            asOfDate()
+            asOfTime()
+            balanceType()
+            createdAt()
+            currency()
+            liveMode()
+            object_()
+            updatedAt()
+            valueDate()
+            vendorCode()
+            vendorCodeType()
+            validated = true
         }
 
         fun toBuilder() = Builder().from(this)

diff --git a/...sury-java-core/src/main/kotlin/com/moderntreasury/api/models/BalanceReportCreateParams.kt b/...sury-java-core/src/main/kotlin/com/moderntreasury/api/models/BalanceReportCreateParams.kt
@@ -143,13 +143,15 @@ constructor(
         private var validated: Boolean = false
 
         fun validate(): BalanceReportCreateBody = apply {
-            if (!validated) {
-                asOfDate()
-                asOfTime()
-                balanceReportType()
-                balances().forEach { it.validate() }
-                validated = true
+            if (validated) {
+                return@apply
             }
+
+            asOfDate()
+            asOfTime()
+            balanceReportType()
+            balances().forEach { it.validate() }
+            validated = true
         }
 
         fun toBuilder() = Builder().from(this)
@@ -613,13 +615,15 @@ constructor(
         private var validated: Boolean = false
 
         fun validate(): BalanceCreateRequest = apply {
-            if (!validated) {
-                amount()
-                balanceType()
-                vendorCode()
-                vendorCodeType()
-                validated = true
+            if (validated) {
+                return@apply
             }
+
+            amount()
+            balanceType()
+            vendorCode()
+            vendorCodeType()
+            validated = true
         }
 
         fun toBuilder() = Builder().from(this)

diff --git a/...treasury-java-core/src/main/kotlin/com/moderntreasury/api/models/BalanceReportListPage.kt b/...treasury-java-core/src/main/kotlin/com/moderntreasury/api/models/BalanceReportListPage.kt
@@ -93,8 +93,6 @@ private constructor(
         private val additionalProperties: Map<String, JsonValue> = immutableEmptyMap(),
     ) {
 
-        private var validated: Boolean = false
-
         fun items(): List<BalanceReport> = items.getNullable("items") ?: listOf()
 
         fun perPage(): String = perPage
@@ -108,11 +106,15 @@ private constructor(
         @ExcludeMissing
         fun _additionalProperties(): Map<String, JsonValue> = additionalProperties
 
+        private var validated: Boolean = false
+
         fun validate(): Response = apply {
-            if (!validated) {
-                items().map { it.validate() }
-                validated = true
+            if (validated) {
+                return@apply
             }
+
+            items().map { it.validate() }
+            validated = true
         }
 
         fun toBuilder() = Builder().from(this)