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

Author: stainless-app[bot]

finch-java-core/src/main/kotlin/com/tryfinch/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 FinchInvalidDataException("`$name` is invalid, received $this")
         }
 

finch-java-core/src/main/kotlin/com/tryfinch/api/models/AccessTokenCreateParams.kt

@@ -346,21 +346,19 @@ private constructor(
          * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
          *   server responded with an unexpected value).
          */
-        fun clientId(): Optional<String> = Optional.ofNullable(clientId.getNullable("client_id"))
+        fun clientId(): Optional<String> = clientId.getOptional("client_id")
 
         /**
          * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
          *   server responded with an unexpected value).
          */
-        fun clientSecret(): Optional<String> =
-            Optional.ofNullable(clientSecret.getNullable("client_secret"))
+        fun clientSecret(): Optional<String> = clientSecret.getOptional("client_secret")
 
         /**
          * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
          *   server responded with an unexpected value).
          */
-        fun redirectUri(): Optional<String> =
-            Optional.ofNullable(redirectUri.getNullable("redirect_uri"))
+        fun redirectUri(): Optional<String> = redirectUri.getOptional("redirect_uri")
 
         /**
          * Returns the raw JSON value of [code].

finch-java-core/src/main/kotlin/com/tryfinch/api/models/AccountUpdateEvent.kt

@@ -100,8 +100,7 @@ private constructor(
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun connectionId(): Optional<String> =
-        Optional.ofNullable(connectionId.getNullable("connection_id"))
+    fun connectionId(): Optional<String> = connectionId.getOptional("connection_id")
 
     /**
      * Returns the raw JSON value of [accountId].

finch-java-core/src/main/kotlin/com/tryfinch/api/models/AccountUpdateResponse.kt

@@ -71,8 +71,7 @@ private constructor(
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun completedAt(): Optional<OffsetDateTime> =
-        Optional.ofNullable(completedAt.getNullable("completed_at"))
+    fun completedAt(): Optional<OffsetDateTime> = completedAt.getOptional("completed_at")
 
     /**
      * The datetime when the job was created. for scheduled jobs, this will be the initial
@@ -105,7 +104,7 @@ private constructor(
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun params(): Optional<Params> = Optional.ofNullable(params.getNullable("params"))
+    fun params(): Optional<Params> = params.getOptional("params")
 
     /**
      * The datetime a job is scheduled to be run. For scheduled jobs, this datetime can be in the
@@ -114,17 +113,15 @@ private constructor(
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun scheduledAt(): Optional<OffsetDateTime> =
-        Optional.ofNullable(scheduledAt.getNullable("scheduled_at"))
+    fun scheduledAt(): Optional<OffsetDateTime> = scheduledAt.getOptional("scheduled_at")
 
     /**
      * The datetime a job entered into the job queue.
      *
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun startedAt(): Optional<OffsetDateTime> =
-        Optional.ofNullable(startedAt.getNullable("started_at"))
+    fun startedAt(): Optional<OffsetDateTime> = startedAt.getOptional("started_at")
 
     /**
      * @throws FinchInvalidDataException if the JSON field has an unexpected type or is unexpectedly
@@ -520,8 +517,7 @@ private constructor(
          * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
          *   server responded with an unexpected value).
          */
-        fun individualId(): Optional<String> =
-            Optional.ofNullable(individualId.getNullable("individual_id"))
+        fun individualId(): Optional<String> = individualId.getOptional("individual_id")
 
         /**
          * Returns the raw JSON value of [individualId].

finch-java-core/src/main/kotlin/com/tryfinch/api/models/AutomatedAsyncJob.kt

@@ -224,7 +224,7 @@ private constructor(
          * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
          *   server responded with an unexpected value).
          */
-        fun quotas(): Optional<Quotas> = Optional.ofNullable(quotas.getNullable("quotas"))
+        fun quotas(): Optional<Quotas> = quotas.getOptional("quotas")
 
         /**
          * Returns the raw JSON value of [quotas].
@@ -355,8 +355,7 @@ private constructor(
              * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if
              *   the server responded with an unexpected value).
              */
-            fun dataSyncAll(): Optional<DataSyncAll> =
-                Optional.ofNullable(dataSyncAll.getNullable("data_sync_all"))
+            fun dataSyncAll(): Optional<DataSyncAll> = dataSyncAll.getOptional("data_sync_all")
 
             /**
              * Returns the raw JSON value of [dataSyncAll].
@@ -491,14 +490,14 @@ private constructor(
                  *   if the server responded with an unexpected value).
                  */
                 fun allowedRefreshes(): Optional<Long> =
-                    Optional.ofNullable(allowedRefreshes.getNullable("allowed_refreshes"))
+                    allowedRefreshes.getOptional("allowed_refreshes")
 
                 /**
                  * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g.
                  *   if the server responded with an unexpected value).
                  */
                 fun remainingRefreshes(): Optional<Long> =
-                    Optional.ofNullable(remainingRefreshes.getNullable("remaining_refreshes"))
+                    remainingRefreshes.getOptional("remaining_refreshes")
 
                 /**
                  * Returns the raw JSON value of [allowedRefreshes].

finch-java-core/src/main/kotlin/com/tryfinch/api/models/AutomatedListResponse.kt

@@ -57,8 +57,7 @@ private constructor(
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun connectionId(): Optional<String> =
-        Optional.ofNullable(connectionId.getNullable("connection_id"))
+    fun connectionId(): Optional<String> = connectionId.getOptional("connection_id")
 
     /**
      * Returns the raw JSON value of [accountId].

finch-java-core/src/main/kotlin/com/tryfinch/api/models/BaseWebhookEvent.kt

@@ -36,15 +36,15 @@ private constructor(
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun amount(): Optional<Long> = Optional.ofNullable(amount.getNullable("amount"))
+    fun amount(): Optional<Long> = amount.getOptional("amount")
 
     /**
      * Contribution type.
      *
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun type(): Optional<Type> = Optional.ofNullable(type.getNullable("type"))
+    fun type(): Optional<Type> = type.getOptional("type")
 
     /**
      * Returns the raw JSON value of [amount].

finch-java-core/src/main/kotlin/com/tryfinch/api/models/BenefitContribution.kt

@@ -41,14 +41,14 @@ private constructor(
      *   server responded with an unexpected value).
      */
     fun supportedFeatures(): Optional<BenefitFeature> =
-        Optional.ofNullable(supportedFeatures.getNullable("supported_features"))
+        supportedFeatures.getOptional("supported_features")
 
     /**
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
     fun supportedOperations(): Optional<SupportPerBenefitType> =
-        Optional.ofNullable(supportedOperations.getNullable("supported_operations"))
+        supportedOperations.getOptional("supported_operations")
 
     /**
      * Returns the raw JSON value of [supportedFeatures].
@@ -246,8 +246,7 @@ private constructor(
          * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
          *   server responded with an unexpected value).
          */
-        fun annualMaximum(): Optional<Boolean> =
-            Optional.ofNullable(annualMaximum.getNullable("annual_maximum"))
+        fun annualMaximum(): Optional<Boolean> = annualMaximum.getOptional("annual_maximum")
 
         /**
          * Whether the provider supports catch up for this benefit. This field will only be true for
@@ -256,7 +255,7 @@ private constructor(
          * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
          *   server responded with an unexpected value).
          */
-        fun catchUp(): Optional<Boolean> = Optional.ofNullable(catchUp.getNullable("catch_up"))
+        fun catchUp(): Optional<Boolean> = catchUp.getOptional("catch_up")
 
         /**
          * Supported contribution types. An empty array indicates contributions are not supported.
@@ -265,14 +264,13 @@ private constructor(
          *   server responded with an unexpected value).
          */
         fun companyContribution(): Optional<List<CompanyContribution?>> =
-            Optional.ofNullable(companyContribution.getNullable("company_contribution"))
+            companyContribution.getOptional("company_contribution")
 
         /**
          * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
          *   server responded with an unexpected value).
          */
-        fun description(): Optional<String> =
-            Optional.ofNullable(description.getNullable("description"))
+        fun description(): Optional<String> = description.getOptional("description")
 
         /**
          * Supported deduction types. An empty array indicates deductions are not supported.
@@ -281,7 +279,7 @@ private constructor(
          *   server responded with an unexpected value).
          */
         fun employeeDeduction(): Optional<List<EmployeeDeduction?>> =
-            Optional.ofNullable(employeeDeduction.getNullable("employee_deduction"))
+            employeeDeduction.getOptional("employee_deduction")
 
         /**
          * The list of frequencies supported by the provider for this benefit
@@ -290,7 +288,7 @@ private constructor(
          *   server responded with an unexpected value).
          */
         fun frequencies(): Optional<List<BenefitFrequency?>> =
-            Optional.ofNullable(frequencies.getNullable("frequencies"))
+            frequencies.getOptional("frequencies")
 
         /**
          * Whether the provider supports HSA contribution limits. Empty if this feature is not
@@ -300,7 +298,7 @@ private constructor(
          *   server responded with an unexpected value).
          */
         fun hsaContributionLimit(): Optional<List<HsaContributionLimit?>> =
-            Optional.ofNullable(hsaContributionLimit.getNullable("hsa_contribution_limit"))
+            hsaContributionLimit.getOptional("hsa_contribution_limit")
 
         /**
          * Returns the raw JSON value of [annualMaximum].

finch-java-core/src/main/kotlin/com/tryfinch/api/models/BenefitFeaturesAndOperations.kt

@@ -95,85 +95,77 @@ private constructor(
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun commuter(): Optional<BenefitFeaturesAndOperations> =
-        Optional.ofNullable(commuter.getNullable("commuter"))
+    fun commuter(): Optional<BenefitFeaturesAndOperations> = commuter.getOptional("commuter")
 
     /**
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
     fun customPostTax(): Optional<BenefitFeaturesAndOperations> =
-        Optional.ofNullable(customPostTax.getNullable("custom_post_tax"))
+        customPostTax.getOptional("custom_post_tax")
 
     /**
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
     fun customPreTax(): Optional<BenefitFeaturesAndOperations> =
-        Optional.ofNullable(customPreTax.getNullable("custom_pre_tax"))
+        customPreTax.getOptional("custom_pre_tax")
 
     /**
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
     fun fsaDependentCare(): Optional<BenefitFeaturesAndOperations> =
-        Optional.ofNullable(fsaDependentCare.getNullable("fsa_dependent_care"))
+        fsaDependentCare.getOptional("fsa_dependent_care")
 
     /**
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun fsaMedical(): Optional<BenefitFeaturesAndOperations> =
-        Optional.ofNullable(fsaMedical.getNullable("fsa_medical"))
+    fun fsaMedical(): Optional<BenefitFeaturesAndOperations> = fsaMedical.getOptional("fsa_medical")
 
     /**
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun hsaPost(): Optional<BenefitFeaturesAndOperations> =
-        Optional.ofNullable(hsaPost.getNullable("hsa_post"))
+    fun hsaPost(): Optional<BenefitFeaturesAndOperations> = hsaPost.getOptional("hsa_post")
 
     /**
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun hsaPre(): Optional<BenefitFeaturesAndOperations> =
-        Optional.ofNullable(hsaPre.getNullable("hsa_pre"))
+    fun hsaPre(): Optional<BenefitFeaturesAndOperations> = hsaPre.getOptional("hsa_pre")
 
     /**
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun s125Dental(): Optional<BenefitFeaturesAndOperations> =
-        Optional.ofNullable(s125Dental.getNullable("s125_dental"))
+    fun s125Dental(): Optional<BenefitFeaturesAndOperations> = s125Dental.getOptional("s125_dental")
 
     /**
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
     fun s125Medical(): Optional<BenefitFeaturesAndOperations> =
-        Optional.ofNullable(s125Medical.getNullable("s125_medical"))
+        s125Medical.getOptional("s125_medical")
 
     /**
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun s125Vision(): Optional<BenefitFeaturesAndOperations> =
-        Optional.ofNullable(s125Vision.getNullable("s125_vision"))
+    fun s125Vision(): Optional<BenefitFeaturesAndOperations> = s125Vision.getOptional("s125_vision")
 
     /**
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun simple(): Optional<BenefitFeaturesAndOperations> =
-        Optional.ofNullable(simple.getNullable("simple"))
+    fun simple(): Optional<BenefitFeaturesAndOperations> = simple.getOptional("simple")
 
     /**
      * @throws FinchInvalidDataException if the JSON field has an unexpected type (e.g. if the
      *   server responded with an unexpected value).
      */
-    fun simpleIra(): Optional<BenefitFeaturesAndOperations> =
-        Optional.ofNullable(simpleIra.getNullable("simple_ira"))
+    fun simpleIra(): Optional<BenefitFeaturesAndOperations> = simpleIra.getOptional("simple_ira")
 
     /**
      * Returns the raw JSON value of [commuter].