chore(internal): use getOrNull instead of orElse(null) (#324)

Author: stainless-app[bot]

orb-java-client-okhttp/src/main/kotlin/com/withorb/api/client/okhttp/OrbOkHttpClient.kt

@@ -13,6 +13,7 @@ import java.net.Proxy
 import java.time.Clock
 import java.time.Duration
 import java.util.Optional
+import kotlin.jvm.optionals.getOrNull
 
 class OrbOkHttpClient private constructor() {
 
@@ -150,7 +151,7 @@ class OrbOkHttpClient private constructor() {
         }
 
         fun webhookSecret(webhookSecret: Optional<String>) =
-            webhookSecret(webhookSecret.orElse(null))
+            webhookSecret(webhookSecret.getOrNull())
 
         fun fromEnv() = apply { clientOptions.fromEnv() }
 

orb-java-client-okhttp/src/main/kotlin/com/withorb/api/client/okhttp/OrbOkHttpClientAsync.kt

@@ -13,6 +13,7 @@ import java.net.Proxy
 import java.time.Clock
 import java.time.Duration
 import java.util.Optional
+import kotlin.jvm.optionals.getOrNull
 
 class OrbOkHttpClientAsync private constructor() {
 
@@ -150,7 +151,7 @@ class OrbOkHttpClientAsync private constructor() {
         }
 
         fun webhookSecret(webhookSecret: Optional<String>) =
-            webhookSecret(webhookSecret.orElse(null))
+            webhookSecret(webhookSecret.getOrNull())
 
         fun fromEnv() = apply { clientOptions.fromEnv() }
 

orb-java-core/src/main/kotlin/com/withorb/api/core/ClientOptions.kt

@@ -10,6 +10,7 @@ import com.withorb.api.core.http.QueryParams
 import com.withorb.api.core.http.RetryingHttpClient
 import java.time.Clock
 import java.util.Optional
+import kotlin.jvm.optionals.getOrNull
 
 class ClientOptions
 private constructor(
@@ -100,7 +101,7 @@ private constructor(
         fun webhookSecret(webhookSecret: String?) = apply { this.webhookSecret = webhookSecret }
 
         fun webhookSecret(webhookSecret: Optional<String>) =
-            webhookSecret(webhookSecret.orElse(null))
+            webhookSecret(webhookSecret.getOrNull())
 
         fun headers(headers: Headers) = apply {
             this.headers.clear()

orb-java-core/src/main/kotlin/com/withorb/api/core/Timeout.kt

@@ -5,6 +5,7 @@ package com.withorb.api.core
 import java.time.Duration
 import java.util.Objects
 import java.util.Optional
+import kotlin.jvm.optionals.getOrNull
 
 /** A class containing timeouts for various processing phases of a request. */
 class Timeout
@@ -96,7 +97,7 @@ private constructor(
          *
          * Defaults to `Duration.ofMinutes(1)`.
          */
-        fun connect(connect: Optional<Duration>) = connect(connect.orElse(null))
+        fun connect(connect: Optional<Duration>) = connect(connect.getOrNull())
 
         /**
          * The maximum time allowed between two data packets when waiting for the server’s response.
@@ -114,7 +115,7 @@ private constructor(
          *
          * Defaults to `request()`.
          */
-        fun read(read: Optional<Duration>) = read(read.orElse(null))
+        fun read(read: Optional<Duration>) = read(read.getOrNull())
 
         /**
          * The maximum time allowed between two data packets when sending the request to the server.
@@ -132,7 +133,7 @@ private constructor(
          *
          * Defaults to `request()`.
          */
-        fun write(write: Optional<Duration>) = write(write.orElse(null))
+        fun write(write: Optional<Duration>) = write(write.getOrNull())
 
         /**
          * The maximum time allowed for a complete HTTP call, not including retries.
@@ -156,7 +157,7 @@ private constructor(
          *
          * Defaults to `Duration.ofMinutes(1)`.
          */
-        fun request(request: Optional<Duration>) = request(request.orElse(null))
+        fun request(request: Optional<Duration>) = request(request.getOrNull())
 
         fun build(): Timeout = Timeout(connect, read, write, request)
     }

orb-java-core/src/main/kotlin/com/withorb/api/models/Alert.kt

@@ -20,6 +20,7 @@ import com.withorb.api.errors.OrbInvalidDataException
 import java.time.OffsetDateTime
 import java.util.Objects
 import java.util.Optional
+import kotlin.jvm.optionals.getOrNull
 
 /**
  * [Alerts within Orb](/product-catalog/configuring-alerts) monitor spending, usage, or credit
@@ -220,7 +221,7 @@ private constructor(
         fun currency(currency: String?) = currency(JsonField.ofNullable(currency))
 
         /** The name of the currency the credit balance or invoice cost is denominated in. */
-        fun currency(currency: Optional<String>) = currency(currency.orElse(null))
+        fun currency(currency: Optional<String>) = currency(currency.getOrNull())
 
         /** The name of the currency the credit balance or invoice cost is denominated in. */
         fun currency(currency: JsonField<String>) = apply { this.currency = currency }
@@ -229,7 +230,7 @@ private constructor(
         fun customer(customer: Customer?) = customer(JsonField.ofNullable(customer))
 
         /** The customer the alert applies to. */
-        fun customer(customer: Optional<Customer>) = customer(customer.orElse(null))
+        fun customer(customer: Optional<Customer>) = customer(customer.getOrNull())
 
         /** The customer the alert applies to. */
         fun customer(customer: JsonField<Customer>) = apply { this.customer = customer }
@@ -244,7 +245,7 @@ private constructor(
         fun metric(metric: Metric?) = metric(JsonField.ofNullable(metric))
 
         /** The metric the alert applies to. */
-        fun metric(metric: Optional<Metric>) = metric(metric.orElse(null))
+        fun metric(metric: Optional<Metric>) = metric(metric.getOrNull())
 
         /** The metric the alert applies to. */
         fun metric(metric: JsonField<Metric>) = apply { this.metric = metric }
@@ -253,7 +254,7 @@ private constructor(
         fun plan(plan: Plan?) = plan(JsonField.ofNullable(plan))
 
         /** The plan the alert applies to. */
-        fun plan(plan: Optional<Plan>) = plan(plan.orElse(null))
+        fun plan(plan: Optional<Plan>) = plan(plan.getOrNull())
 
         /** The plan the alert applies to. */
         fun plan(plan: JsonField<Plan>) = apply { this.plan = plan }
@@ -264,7 +265,7 @@ private constructor(
 
         /** The subscription the alert applies to. */
         fun subscription(subscription: Optional<Subscription>) =
-            subscription(subscription.orElse(null))
+            subscription(subscription.getOrNull())
 
         /** The subscription the alert applies to. */
         fun subscription(subscription: JsonField<Subscription>) = apply {
@@ -275,7 +276,7 @@ private constructor(
         fun thresholds(thresholds: List<Threshold>?) = thresholds(JsonField.ofNullable(thresholds))
 
         /** The thresholds that define the conditions under which the alert will be triggered. */
-        fun thresholds(thresholds: Optional<List<Threshold>>) = thresholds(thresholds.orElse(null))
+        fun thresholds(thresholds: Optional<List<Threshold>>) = thresholds(thresholds.getOrNull())
 
         /** The thresholds that define the conditions under which the alert will be triggered. */
         fun thresholds(thresholds: JsonField<List<Threshold>>) = apply {
@@ -409,7 +410,7 @@ private constructor(
                 externalCustomerId(JsonField.ofNullable(externalCustomerId))
 
             fun externalCustomerId(externalCustomerId: Optional<String>) =
-                externalCustomerId(externalCustomerId.orElse(null))
+                externalCustomerId(externalCustomerId.getOrNull())
 
             fun externalCustomerId(externalCustomerId: JsonField<String>) = apply {
                 this.externalCustomerId = externalCustomerId
@@ -666,7 +667,7 @@ private constructor(
 
             fun id(id: String?) = id(JsonField.ofNullable(id))
 
-            fun id(id: Optional<String>) = id(id.orElse(null))
+            fun id(id: Optional<String>) = id(id.getOrNull())
 
             fun id(id: JsonField<String>) = apply { this.id = id }
 
@@ -684,7 +685,7 @@ private constructor(
              * your system.
              */
             fun externalPlanId(externalPlanId: Optional<String>) =
-                externalPlanId(externalPlanId.orElse(null))
+                externalPlanId(externalPlanId.getOrNull())
 
             /**
              * An optional user-defined ID for this plan resource, used throughout the system as an
@@ -697,7 +698,7 @@ private constructor(
 
             fun name(name: String?) = name(JsonField.ofNullable(name))
 
-            fun name(name: Optional<String>) = name(name.orElse(null))
+            fun name(name: Optional<String>) = name(name.getOrNull())
 
             fun name(name: JsonField<String>) = apply { this.name = name }
 

orb-java-core/src/main/kotlin/com/withorb/api/models/AlertCreateForCustomerParams.kt

@@ -22,6 +22,7 @@ import com.withorb.api.core.toImmutable
 import com.withorb.api.errors.OrbInvalidDataException
 import java.util.Objects
 import java.util.Optional
+import kotlin.jvm.optionals.getOrNull
 
 /**
  * This endpoint creates a new alert to monitor a customer's credit balance. There are three types
@@ -181,7 +182,7 @@ private constructor(
 
             /** The thresholds that define the values at which the alert will be triggered. */
             fun thresholds(thresholds: Optional<List<Threshold>>) =
-                thresholds(thresholds.orElse(null))
+                thresholds(thresholds.getOrNull())
 
             /** The thresholds that define the values at which the alert will be triggered. */
             fun thresholds(thresholds: JsonField<List<Threshold>>) = apply {
@@ -294,7 +295,7 @@ private constructor(
         fun thresholds(thresholds: List<Threshold>?) = apply { body.thresholds(thresholds) }
 
         /** The thresholds that define the values at which the alert will be triggered. */
-        fun thresholds(thresholds: Optional<List<Threshold>>) = thresholds(thresholds.orElse(null))
+        fun thresholds(thresholds: Optional<List<Threshold>>) = thresholds(thresholds.getOrNull())
 
         /** The thresholds that define the values at which the alert will be triggered. */
         fun thresholds(thresholds: JsonField<List<Threshold>>) = apply {

orb-java-core/src/main/kotlin/com/withorb/api/models/AlertCreateForExternalCustomerParams.kt

@@ -22,6 +22,7 @@ import com.withorb.api.core.toImmutable
 import com.withorb.api.errors.OrbInvalidDataException
 import java.util.Objects
 import java.util.Optional
+import kotlin.jvm.optionals.getOrNull
 
 /**
  * This endpoint creates a new alert to monitor a customer's credit balance. There are three types
@@ -181,7 +182,7 @@ private constructor(
 
             /** The thresholds that define the values at which the alert will be triggered. */
             fun thresholds(thresholds: Optional<List<Threshold>>) =
-                thresholds(thresholds.orElse(null))
+                thresholds(thresholds.getOrNull())
 
             /** The thresholds that define the values at which the alert will be triggered. */
             fun thresholds(thresholds: JsonField<List<Threshold>>) = apply {
@@ -300,7 +301,7 @@ private constructor(
         fun thresholds(thresholds: List<Threshold>?) = apply { body.thresholds(thresholds) }
 
         /** The thresholds that define the values at which the alert will be triggered. */
-        fun thresholds(thresholds: Optional<List<Threshold>>) = thresholds(thresholds.orElse(null))
+        fun thresholds(thresholds: Optional<List<Threshold>>) = thresholds(thresholds.getOrNull())
 
         /** The thresholds that define the values at which the alert will be triggered. */
         fun thresholds(thresholds: JsonField<List<Threshold>>) = apply {

orb-java-core/src/main/kotlin/com/withorb/api/models/AlertCreateForSubscriptionParams.kt

@@ -22,6 +22,7 @@ import com.withorb.api.core.toImmutable
 import com.withorb.api.errors.OrbInvalidDataException
 import java.util.Objects
 import java.util.Optional
+import kotlin.jvm.optionals.getOrNull
 
 /**
  * This endpoint is used to create alerts at the subscription level.
@@ -192,7 +193,7 @@ private constructor(
             fun metricId(metricId: String?) = metricId(JsonField.ofNullable(metricId))
 
             /** The metric to track usage for. */
-            fun metricId(metricId: Optional<String>) = metricId(metricId.orElse(null))
+            fun metricId(metricId: Optional<String>) = metricId(metricId.getOrNull())
 
             /** The metric to track usage for. */
             fun metricId(metricId: JsonField<String>) = apply { this.metricId = metricId }
@@ -303,7 +304,7 @@ private constructor(
         fun metricId(metricId: String?) = apply { body.metricId(metricId) }
 
         /** The metric to track usage for. */
-        fun metricId(metricId: Optional<String>) = metricId(metricId.orElse(null))
+        fun metricId(metricId: Optional<String>) = metricId(metricId.getOrNull())
 
         /** The metric to track usage for. */
         fun metricId(metricId: JsonField<String>) = apply { body.metricId(metricId) }

orb-java-core/src/main/kotlin/com/withorb/api/models/AlertDisableParams.kt

@@ -11,6 +11,7 @@ import com.withorb.api.core.http.QueryParams
 import com.withorb.api.core.toImmutable
 import java.util.Objects
 import java.util.Optional
+import kotlin.jvm.optionals.getOrNull
 
 /**
  * This endpoint allows you to disable an alert. To disable a plan-level alert for a specific
@@ -100,7 +101,7 @@ private constructor(
 
         /** Used to update the status of a plan alert scoped to this subscription_id */
         fun subscriptionId(subscriptionId: Optional<String>) =
-            subscriptionId(subscriptionId.orElse(null))
+            subscriptionId(subscriptionId.getOrNull())
 
         fun additionalHeaders(additionalHeaders: Headers) = apply {
             this.additionalHeaders.clear()

orb-java-core/src/main/kotlin/com/withorb/api/models/AlertEnableParams.kt

@@ -11,6 +11,7 @@ import com.withorb.api.core.http.QueryParams
 import com.withorb.api.core.toImmutable
 import java.util.Objects
 import java.util.Optional
+import kotlin.jvm.optionals.getOrNull
 
 /**
  * This endpoint allows you to enable an alert. To enable a plan-level alert for a specific
@@ -100,7 +101,7 @@ private constructor(
 
         /** Used to update the status of a plan alert scoped to this subscription_id */
         fun subscriptionId(subscriptionId: Optional<String>) =
-            subscriptionId(subscriptionId.orElse(null))
+            subscriptionId(subscriptionId.getOrNull())
 
         fun additionalHeaders(additionalHeaders: Headers) = apply {
             this.additionalHeaders.clear()