chore(internal): swap from getNullable to getOptional (#581)

Author: stainless-app[bot]

lithic-java-core/src/main/kotlin/com/lithic/api/core/Values.kt

@@ -132,11 +132,11 @@ sealed class JsonField<out T : Any> {
         }
 
     @JvmSynthetic
-    internal fun getNullable(name: String): T? =
+    internal fun getOptional(name: String): Optional<@UnsafeVariance T> =
         when (this) {
-            is KnownValue -> value
-            is JsonMissing -> null
-            is JsonNull -> null
+            is KnownValue -> Optional.of(value)
+            is JsonMissing,
+            is JsonNull -> Optional.empty()
             else -> throw LithicInvalidDataException("`$name` is invalid, received $this")
         }
 

lithic-java-core/src/main/kotlin/com/lithic/api/models/Account.kt

@@ -84,7 +84,7 @@ private constructor(
      * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun created(): Optional<OffsetDateTime> = Optional.ofNullable(created.getNullable("created"))
+    fun created(): Optional<OffsetDateTime> = created.getOptional("created")
 
     /**
      * Spend limit information for the user containing the daily, monthly, and lifetime spend limit
@@ -116,8 +116,7 @@ private constructor(
      * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun accountHolder(): Optional<AccountHolder> =
-        Optional.ofNullable(accountHolder.getNullable("account_holder"))
+    fun accountHolder(): Optional<AccountHolder> = accountHolder.getOptional("account_holder")
 
     /**
      * List of identifiers for the Auth Rule(s) that are applied on the account. This field is
@@ -129,8 +128,7 @@ private constructor(
      *   server responded with an unexpected value).
      */
     @Deprecated("deprecated")
-    fun authRuleTokens(): Optional<List<String>> =
-        Optional.ofNullable(authRuleTokens.getNullable("auth_rule_tokens"))
+    fun authRuleTokens(): Optional<List<String>> = authRuleTokens.getOptional("auth_rule_tokens")
 
     /**
      * 3-character alphabetic ISO 4217 code for the currency of the cardholder.
@@ -139,15 +137,15 @@ private constructor(
      *   server responded with an unexpected value).
      */
     fun cardholderCurrency(): Optional<String> =
-        Optional.ofNullable(cardholderCurrency.getNullable("cardholder_currency"))
+        cardholderCurrency.getOptional("cardholder_currency")
 
     /**
      * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
     @Deprecated("deprecated")
     fun verificationAddress(): Optional<VerificationAddress> =
-        Optional.ofNullable(verificationAddress.getNullable("verification_address"))
+        verificationAddress.getOptional("verification_address")
 
     /**
      * Returns the raw JSON value of [token].
@@ -1254,7 +1252,7 @@ private constructor(
          * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
          *   server responded with an unexpected value).
          */
-        fun address2(): Optional<String> = Optional.ofNullable(address2.getNullable("address2"))
+        fun address2(): Optional<String> = address2.getOptional("address2")
 
         /**
          * Returns the raw JSON value of [address1].

lithic-java-core/src/main/kotlin/com/lithic/api/models/AccountHolder.kt

@@ -147,8 +147,7 @@ private constructor(
      * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun accountToken(): Optional<String> =
-        Optional.ofNullable(accountToken.getNullable("account_token"))
+    fun accountToken(): Optional<String> = accountToken.getOptional("account_token")
 
     /**
      * Only present when user_type == "BUSINESS". List of all entities with >25% ownership in the
@@ -158,7 +157,7 @@ private constructor(
      *   server responded with an unexpected value).
      */
     fun beneficialOwnerEntities(): Optional<List<AccountHolderBusinessResponse>> =
-        Optional.ofNullable(beneficialOwnerEntities.getNullable("beneficial_owner_entities"))
+        beneficialOwnerEntities.getOptional("beneficial_owner_entities")
 
     /**
      * Only present when user_type == "BUSINESS". List of all individuals with >25% ownership in the
@@ -168,7 +167,7 @@ private constructor(
      *   server responded with an unexpected value).
      */
     fun beneficialOwnerIndividuals(): Optional<List<AccountHolderIndividualResponse>> =
-        Optional.ofNullable(beneficialOwnerIndividuals.getNullable("beneficial_owner_individuals"))
+        beneficialOwnerIndividuals.getOptional("beneficial_owner_individuals")
 
     /**
      * Only applicable for customers using the KYC-Exempt workflow to enroll authorized users of
@@ -179,7 +178,7 @@ private constructor(
      *   server responded with an unexpected value).
      */
     fun businessAccountToken(): Optional<String> =
-        Optional.ofNullable(businessAccountToken.getNullable("business_account_token"))
+        businessAccountToken.getOptional("business_account_token")
 
     /**
      * Only present when user_type == "BUSINESS". Information about the business for which the
@@ -189,7 +188,7 @@ private constructor(
      *   server responded with an unexpected value).
      */
     fun businessEntity(): Optional<AccountHolderBusinessResponse> =
-        Optional.ofNullable(businessEntity.getNullable("business_entity"))
+        businessEntity.getOptional("business_entity")
 
     /**
      * Only present when user_type == "BUSINESS". An individual with significant responsibility for
@@ -203,7 +202,7 @@ private constructor(
      *   server responded with an unexpected value).
      */
     fun controlPerson(): Optional<AccountHolderIndividualResponse> =
-        Optional.ofNullable(controlPerson.getNullable("control_person"))
+        controlPerson.getOptional("control_person")
 
     /**
      * < Deprecated. Use control_person.email when user_type == "BUSINESS". Use
@@ -213,16 +212,15 @@ private constructor(
      * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun email(): Optional<String> = Optional.ofNullable(email.getNullable("email"))
+    fun email(): Optional<String> = email.getOptional("email")
 
     /**
      * The type of KYC exemption for a KYC-Exempt Account Holder.
      *
      * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun exemptionType(): Optional<ExemptionType> =
-        Optional.ofNullable(exemptionType.getNullable("exemption_type"))
+    fun exemptionType(): Optional<ExemptionType> = exemptionType.getOptional("exemption_type")
 
     /**
      * Customer-provided token that indicates a relationship with an object outside of the Lithic
@@ -231,7 +229,7 @@ private constructor(
      * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun externalId(): Optional<String> = Optional.ofNullable(externalId.getNullable("external_id"))
+    fun externalId(): Optional<String> = externalId.getOptional("external_id")
 
     /**
      * Only present when user_type == "INDIVIDUAL". Information about the individual for which the
@@ -241,16 +239,15 @@ private constructor(
      *   server responded with an unexpected value).
      */
     fun individual(): Optional<AccountHolderIndividualResponse> =
-        Optional.ofNullable(individual.getNullable("individual"))
+        individual.getOptional("individual")
 
     /**
      * Only present when user_type == "BUSINESS". User-submitted description of the business.
      *
      * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun natureOfBusiness(): Optional<String> =
-        Optional.ofNullable(natureOfBusiness.getNullable("nature_of_business"))
+    fun natureOfBusiness(): Optional<String> = natureOfBusiness.getOptional("nature_of_business")
 
     /**
      * < Deprecated. Use control_person.phone_number when user_type == "BUSINESS". Use
@@ -260,8 +257,7 @@ private constructor(
      * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun phoneNumber(): Optional<String> =
-        Optional.ofNullable(phoneNumber.getNullable("phone_number"))
+    fun phoneNumber(): Optional<String> = phoneNumber.getOptional("phone_number")
 
     /**
      * Only present for "KYB_BASIC" workflow. A list of documents required for the account holder to
@@ -271,7 +267,7 @@ private constructor(
      *   server responded with an unexpected value).
      */
     fun requiredDocuments(): Optional<List<RequiredDocument>> =
-        Optional.ofNullable(requiredDocuments.getNullable("required_documents"))
+        requiredDocuments.getOptional("required_documents")
 
     /**
      * <Deprecated. Use verification_application.status instead>
@@ -284,16 +280,15 @@ private constructor(
      * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun status(): Optional<Status> = Optional.ofNullable(status.getNullable("status"))
+    fun status(): Optional<Status> = status.getOptional("status")
 
     /**
      * <Deprecated. Use verification_application.status_reasons> Reason for the evaluation status.
      *
      * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun statusReasons(): Optional<List<StatusReason>> =
-        Optional.ofNullable(statusReasons.getNullable("status_reasons"))
+    fun statusReasons(): Optional<List<StatusReason>> = statusReasons.getOptional("status_reasons")
 
     /**
      * The type of Account Holder. If the type is "INDIVIDUAL", the "individual" attribute will be
@@ -304,7 +299,7 @@ private constructor(
      * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun userType(): Optional<UserType> = Optional.ofNullable(userType.getNullable("user_type"))
+    fun userType(): Optional<UserType> = userType.getOptional("user_type")
 
     /**
      * Information about the most recent identity verification attempt
@@ -313,15 +308,15 @@ private constructor(
      *   server responded with an unexpected value).
      */
     fun verificationApplication(): Optional<AccountHolderVerificationApplication> =
-        Optional.ofNullable(verificationApplication.getNullable("verification_application"))
+        verificationApplication.getOptional("verification_application")
 
     /**
      * Only present when user_type == "BUSINESS". Business's primary website.
      *
      * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun websiteUrl(): Optional<String> = Optional.ofNullable(websiteUrl.getNullable("website_url"))
+    fun websiteUrl(): Optional<String> = websiteUrl.getOptional("website_url")
 
     /**
      * Returns the raw JSON value of [token].
@@ -1187,8 +1182,7 @@ private constructor(
          * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
          *   server responded with an unexpected value).
          */
-        fun parentCompany(): Optional<String> =
-            Optional.ofNullable(parentCompany.getNullable("parent_company"))
+        fun parentCompany(): Optional<String> = parentCompany.getOptional("parent_company")
 
         /**
          * Returns the raw JSON value of [address].
@@ -2564,8 +2558,7 @@ private constructor(
          * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
          *   server responded with an unexpected value).
          */
-        fun created(): Optional<OffsetDateTime> =
-            Optional.ofNullable(created.getNullable("created"))
+        fun created(): Optional<OffsetDateTime> = created.getOptional("created")
 
         /**
          * KYC and KYB evaluation states.
@@ -2576,7 +2569,7 @@ private constructor(
          * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
          *   server responded with an unexpected value).
          */
-        fun status(): Optional<Status> = Optional.ofNullable(status.getNullable("status"))
+        fun status(): Optional<Status> = status.getOptional("status")
 
         /**
          * Reason for the evaluation status.
@@ -2585,16 +2578,15 @@ private constructor(
          *   server responded with an unexpected value).
          */
         fun statusReasons(): Optional<List<StatusReason>> =
-            Optional.ofNullable(statusReasons.getNullable("status_reasons"))
+            statusReasons.getOptional("status_reasons")
 
         /**
          * Timestamp of when the application was last updated.
          *
          * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
          *   server responded with an unexpected value).
          */
-        fun updated(): Optional<OffsetDateTime> =
-            Optional.ofNullable(updated.getNullable("updated"))
+        fun updated(): Optional<OffsetDateTime> = updated.getOptional("updated")
 
         /**
          * Returns the raw JSON value of [created].

lithic-java-core/src/main/kotlin/com/lithic/api/models/AccountHolderCreateResponse.kt

@@ -104,7 +104,7 @@ private constructor(
      * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun created(): Optional<OffsetDateTime> = Optional.ofNullable(created.getNullable("created"))
+    fun created(): Optional<OffsetDateTime> = created.getOptional("created")
 
     /**
      * Customer-provided token that indicates a relationship with an object outside of the Lithic
@@ -113,7 +113,7 @@ private constructor(
      * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun externalId(): Optional<String> = Optional.ofNullable(externalId.getNullable("external_id"))
+    fun externalId(): Optional<String> = externalId.getOptional("external_id")
 
     /**
      * Only present for "KYB_BASIC" workflow. A list of documents required for the account holder to
@@ -123,7 +123,7 @@ private constructor(
      *   server responded with an unexpected value).
      */
     fun requiredDocuments(): Optional<List<RequiredDocument>> =
-        Optional.ofNullable(requiredDocuments.getNullable("required_documents"))
+        requiredDocuments.getOptional("required_documents")
 
     /**
      * Returns the raw JSON value of [token].

lithic-java-core/src/main/kotlin/com/lithic/api/models/AccountHolderListDocumentsResponse.kt

@@ -33,7 +33,7 @@ private constructor(
      * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun data(): Optional<List<Document>> = Optional.ofNullable(data.getNullable("data"))
+    fun data(): Optional<List<Document>> = data.getOptional("data")
 
     /**
      * Returns the raw JSON value of [data].

lithic-java-core/src/main/kotlin/com/lithic/api/models/AccountHolderListPage.kt

@@ -82,7 +82,7 @@ private constructor(
             @JsonProperty("has_more") hasMore: JsonField<Boolean> = JsonMissing.of(),
         ) : this(data, hasMore, mutableMapOf())
 
-        fun data(): List<AccountHolder> = data.getNullable("data") ?: listOf()
+        fun data(): List<AccountHolder> = data.getOptional("data").getOrNull() ?: listOf()
 
         fun hasMore(): Boolean = hasMore.getRequired("has_more")
 

lithic-java-core/src/main/kotlin/com/lithic/api/models/AccountHolderListPageAsync.kt

@@ -18,6 +18,7 @@ import java.util.Optional
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.Executor
 import java.util.function.Predicate
+import kotlin.jvm.optionals.getOrNull
 
 /** Get a list of individual or business account holders and their KYC or KYB evaluation status. */
 class AccountHolderListPageAsync
@@ -84,7 +85,7 @@ private constructor(
             @JsonProperty("has_more") hasMore: JsonField<Boolean> = JsonMissing.of(),
         ) : this(data, hasMore, mutableMapOf())
 
-        fun data(): List<AccountHolder> = data.getNullable("data") ?: listOf()
+        fun data(): List<AccountHolder> = data.getOptional("data").getOrNull() ?: listOf()
 
         fun hasMore(): Boolean = hasMore.getRequired("has_more")
 

lithic-java-core/src/main/kotlin/com/lithic/api/models/AccountHolderSimulateEnrollmentDocumentReviewParams.kt

@@ -421,9 +421,7 @@ private constructor(
          *   server responded with an unexpected value).
          */
         fun acceptedEntityStatusReasons(): Optional<List<String>> =
-            Optional.ofNullable(
-                acceptedEntityStatusReasons.getNullable("accepted_entity_status_reasons")
-            )
+            acceptedEntityStatusReasons.getOptional("accepted_entity_status_reasons")
 
         /**
          * Status reason that will be associated with the simulated account holder status. Only
@@ -433,7 +431,7 @@ private constructor(
          *   server responded with an unexpected value).
          */
         fun statusReason(): Optional<DocumentUploadStatusReasons> =
-            Optional.ofNullable(statusReason.getNullable("status_reason"))
+            statusReason.getOptional("status_reason")
 
         /**
          * Returns the raw JSON value of [documentUploadToken].

lithic-java-core/src/main/kotlin/com/lithic/api/models/AccountHolderSimulateEnrollmentReviewParams.kt

@@ -346,15 +346,15 @@ private constructor(
          *   server responded with an unexpected value).
          */
         fun accountHolderToken(): Optional<String> =
-            Optional.ofNullable(accountHolderToken.getNullable("account_holder_token"))
+            accountHolderToken.getOptional("account_holder_token")
 
         /**
          * An account holder's status for use within the simulation.
          *
          * @throws LithicInvalidDataException if the JSON field has an unexpected type (e.g. if the
          *   server responded with an unexpected value).
          */
-        fun status(): Optional<Status> = Optional.ofNullable(status.getNullable("status"))
+        fun status(): Optional<Status> = status.getOptional("status")
 
         /**
          * Status reason that will be associated with the simulated account holder status. Only
@@ -364,7 +364,7 @@ private constructor(
          *   server responded with an unexpected value).
          */
         fun statusReasons(): Optional<List<StatusReason>> =
-            Optional.ofNullable(statusReasons.getNullable("status_reasons"))
+            statusReasons.getOptional("status_reasons")
 
         /**
          * Returns the raw JSON value of [accountHolderToken].