Skip to content

Commit 80e4392

Browse files
feat(api): api update (#152)
1 parent e31d1ed commit 80e4392

File tree

10 files changed

+137
-21
lines changed

10 files changed

+137
-21
lines changed

.stats.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
configured_endpoints: 97
2-
openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/orb%2Forb-16e9b5c2b884f624e9b1f3dddf584353822295512ead0b72ffb574e6b1780570.yml
2+
openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/orb%2Forb-908960f165205e2874dd29322cc974df5ab10c7634ab9a342ab22047013de1b4.yml

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

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,16 @@ import java.util.Optional
1313
class AlertDisableParams
1414
constructor(
1515
private val alertConfigurationId: String,
16+
private val subscriptionId: String?,
1617
private val additionalHeaders: Headers,
1718
private val additionalQueryParams: QueryParams,
1819
private val additionalBodyProperties: Map<String, JsonValue>,
1920
) {
2021

2122
fun alertConfigurationId(): String = alertConfigurationId
2223

24+
fun subscriptionId(): Optional<String> = Optional.ofNullable(subscriptionId)
25+
2326
fun _additionalHeaders(): Headers = additionalHeaders
2427

2528
fun _additionalQueryParams(): QueryParams = additionalQueryParams
@@ -33,7 +36,13 @@ constructor(
3336

3437
@JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders
3538

36-
@JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams
39+
@JvmSynthetic
40+
internal fun getQueryParams(): QueryParams {
41+
val queryParams = QueryParams.builder()
42+
this.subscriptionId?.let { queryParams.put("subscription_id", listOf(it.toString())) }
43+
queryParams.putAll(additionalQueryParams)
44+
return queryParams.build()
45+
}
3746

3847
fun getPathParam(index: Int): String {
3948
return when (index) {
@@ -53,13 +62,15 @@ constructor(
5362
class Builder {
5463

5564
private var alertConfigurationId: String? = null
65+
private var subscriptionId: String? = null
5666
private var additionalHeaders: Headers.Builder = Headers.builder()
5767
private var additionalQueryParams: QueryParams.Builder = QueryParams.builder()
5868
private var additionalBodyProperties: MutableMap<String, JsonValue> = mutableMapOf()
5969

6070
@JvmSynthetic
6171
internal fun from(alertDisableParams: AlertDisableParams) = apply {
6272
alertConfigurationId = alertDisableParams.alertConfigurationId
73+
subscriptionId = alertDisableParams.subscriptionId
6374
additionalHeaders = alertDisableParams.additionalHeaders.toBuilder()
6475
additionalQueryParams = alertDisableParams.additionalQueryParams.toBuilder()
6576
additionalBodyProperties = alertDisableParams.additionalBodyProperties.toMutableMap()
@@ -69,6 +80,9 @@ constructor(
6980
this.alertConfigurationId = alertConfigurationId
7081
}
7182

83+
/** Used to update the status of a plan alert scoped to this subscription_id */
84+
fun subscriptionId(subscriptionId: String) = apply { this.subscriptionId = subscriptionId }
85+
7286
fun additionalHeaders(additionalHeaders: Headers) = apply {
7387
this.additionalHeaders.clear()
7488
putAllAdditionalHeaders(additionalHeaders)
@@ -194,6 +208,7 @@ constructor(
194208
checkNotNull(alertConfigurationId) {
195209
"`alertConfigurationId` is required but was not set"
196210
},
211+
subscriptionId,
197212
additionalHeaders.build(),
198213
additionalQueryParams.build(),
199214
additionalBodyProperties.toImmutable(),
@@ -205,11 +220,11 @@ constructor(
205220
return true
206221
}
207222

208-
return /* spotless:off */ other is AlertDisableParams && alertConfigurationId == other.alertConfigurationId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */
223+
return /* spotless:off */ other is AlertDisableParams && alertConfigurationId == other.alertConfigurationId && subscriptionId == other.subscriptionId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */
209224
}
210225

211-
override fun hashCode(): Int = /* spotless:off */ Objects.hash(alertConfigurationId, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */
226+
override fun hashCode(): Int = /* spotless:off */ Objects.hash(alertConfigurationId, subscriptionId, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */
212227

213228
override fun toString() =
214-
"AlertDisableParams{alertConfigurationId=$alertConfigurationId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}"
229+
"AlertDisableParams{alertConfigurationId=$alertConfigurationId, subscriptionId=$subscriptionId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}"
215230
}

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

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,16 @@ import java.util.Optional
1313
class AlertEnableParams
1414
constructor(
1515
private val alertConfigurationId: String,
16+
private val subscriptionId: String?,
1617
private val additionalHeaders: Headers,
1718
private val additionalQueryParams: QueryParams,
1819
private val additionalBodyProperties: Map<String, JsonValue>,
1920
) {
2021

2122
fun alertConfigurationId(): String = alertConfigurationId
2223

24+
fun subscriptionId(): Optional<String> = Optional.ofNullable(subscriptionId)
25+
2326
fun _additionalHeaders(): Headers = additionalHeaders
2427

2528
fun _additionalQueryParams(): QueryParams = additionalQueryParams
@@ -33,7 +36,13 @@ constructor(
3336

3437
@JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders
3538

36-
@JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams
39+
@JvmSynthetic
40+
internal fun getQueryParams(): QueryParams {
41+
val queryParams = QueryParams.builder()
42+
this.subscriptionId?.let { queryParams.put("subscription_id", listOf(it.toString())) }
43+
queryParams.putAll(additionalQueryParams)
44+
return queryParams.build()
45+
}
3746

3847
fun getPathParam(index: Int): String {
3948
return when (index) {
@@ -53,13 +62,15 @@ constructor(
5362
class Builder {
5463

5564
private var alertConfigurationId: String? = null
65+
private var subscriptionId: String? = null
5666
private var additionalHeaders: Headers.Builder = Headers.builder()
5767
private var additionalQueryParams: QueryParams.Builder = QueryParams.builder()
5868
private var additionalBodyProperties: MutableMap<String, JsonValue> = mutableMapOf()
5969

6070
@JvmSynthetic
6171
internal fun from(alertEnableParams: AlertEnableParams) = apply {
6272
alertConfigurationId = alertEnableParams.alertConfigurationId
73+
subscriptionId = alertEnableParams.subscriptionId
6374
additionalHeaders = alertEnableParams.additionalHeaders.toBuilder()
6475
additionalQueryParams = alertEnableParams.additionalQueryParams.toBuilder()
6576
additionalBodyProperties = alertEnableParams.additionalBodyProperties.toMutableMap()
@@ -69,6 +80,9 @@ constructor(
6980
this.alertConfigurationId = alertConfigurationId
7081
}
7182

83+
/** Used to update the status of a plan alert scoped to this subscription_id */
84+
fun subscriptionId(subscriptionId: String) = apply { this.subscriptionId = subscriptionId }
85+
7286
fun additionalHeaders(additionalHeaders: Headers) = apply {
7387
this.additionalHeaders.clear()
7488
putAllAdditionalHeaders(additionalHeaders)
@@ -194,6 +208,7 @@ constructor(
194208
checkNotNull(alertConfigurationId) {
195209
"`alertConfigurationId` is required but was not set"
196210
},
211+
subscriptionId,
197212
additionalHeaders.build(),
198213
additionalQueryParams.build(),
199214
additionalBodyProperties.toImmutable(),
@@ -205,11 +220,11 @@ constructor(
205220
return true
206221
}
207222

208-
return /* spotless:off */ other is AlertEnableParams && alertConfigurationId == other.alertConfigurationId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */
223+
return /* spotless:off */ other is AlertEnableParams && alertConfigurationId == other.alertConfigurationId && subscriptionId == other.subscriptionId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */
209224
}
210225

211-
override fun hashCode(): Int = /* spotless:off */ Objects.hash(alertConfigurationId, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */
226+
override fun hashCode(): Int = /* spotless:off */ Objects.hash(alertConfigurationId, subscriptionId, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */
212227

213228
override fun toString() =
214-
"AlertEnableParams{alertConfigurationId=$alertConfigurationId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}"
229+
"AlertEnableParams{alertConfigurationId=$alertConfigurationId, subscriptionId=$subscriptionId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}"
215230
}

orb-java-core/src/main/kotlin/com/withorb/api/services/async/AlertServiceAsync.kt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,22 @@ interface AlertServiceAsync {
9898
requestOptions: RequestOptions = RequestOptions.none()
9999
): CompletableFuture<Alert>
100100

101-
/** This endpoint can be used to disable an alert. */
101+
/**
102+
* This endpoint allows you to disable an alert. To disable a plan-level alert for a specific
103+
* subscription, you must include the `subscription_id`. The `subscription_id` is not required
104+
* for customer or subscription level alerts.
105+
*/
102106
@JvmOverloads
103107
fun disable(
104108
params: AlertDisableParams,
105109
requestOptions: RequestOptions = RequestOptions.none()
106110
): CompletableFuture<Alert>
107111

108-
/** This endpoint can be used to enable an alert. */
112+
/**
113+
* This endpoint allows you to enable an alert. To enable a plan-level alert for a specific
114+
* subscription, you must include the `subscription_id`. The `subscription_id` is not required
115+
* for customer or subscription level alerts.
116+
*/
109117
@JvmOverloads
110118
fun enable(
111119
params: AlertEnableParams,

orb-java-core/src/main/kotlin/com/withorb/api/services/async/AlertServiceAsyncImpl.kt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,11 @@ constructor(
251251
private val disableHandler: Handler<Alert> =
252252
jsonHandler<Alert>(clientOptions.jsonMapper).withErrorHandler(errorHandler)
253253

254-
/** This endpoint can be used to disable an alert. */
254+
/**
255+
* This endpoint allows you to disable an alert. To disable a plan-level alert for a specific
256+
* subscription, you must include the `subscription_id`. The `subscription_id` is not required
257+
* for customer or subscription level alerts.
258+
*/
255259
override fun disable(
256260
params: AlertDisableParams,
257261
requestOptions: RequestOptions
@@ -281,7 +285,11 @@ constructor(
281285
private val enableHandler: Handler<Alert> =
282286
jsonHandler<Alert>(clientOptions.jsonMapper).withErrorHandler(errorHandler)
283287

284-
/** This endpoint can be used to enable an alert. */
288+
/**
289+
* This endpoint allows you to enable an alert. To enable a plan-level alert for a specific
290+
* subscription, you must include the `subscription_id`. The `subscription_id` is not required
291+
* for customer or subscription level alerts.
292+
*/
285293
override fun enable(
286294
params: AlertEnableParams,
287295
requestOptions: RequestOptions

orb-java-core/src/main/kotlin/com/withorb/api/services/blocking/AlertService.kt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,22 @@ interface AlertService {
9797
requestOptions: RequestOptions = RequestOptions.none()
9898
): Alert
9999

100-
/** This endpoint can be used to disable an alert. */
100+
/**
101+
* This endpoint allows you to disable an alert. To disable a plan-level alert for a specific
102+
* subscription, you must include the `subscription_id`. The `subscription_id` is not required
103+
* for customer or subscription level alerts.
104+
*/
101105
@JvmOverloads
102106
fun disable(
103107
params: AlertDisableParams,
104108
requestOptions: RequestOptions = RequestOptions.none()
105109
): Alert
106110

107-
/** This endpoint can be used to enable an alert. */
111+
/**
112+
* This endpoint allows you to enable an alert. To enable a plan-level alert for a specific
113+
* subscription, you must include the `subscription_id`. The `subscription_id` is not required
114+
* for customer or subscription level alerts.
115+
*/
108116
@JvmOverloads
109117
fun enable(
110118
params: AlertEnableParams,

orb-java-core/src/main/kotlin/com/withorb/api/services/blocking/AlertServiceImpl.kt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,11 @@ constructor(
234234
private val disableHandler: Handler<Alert> =
235235
jsonHandler<Alert>(clientOptions.jsonMapper).withErrorHandler(errorHandler)
236236

237-
/** This endpoint can be used to disable an alert. */
237+
/**
238+
* This endpoint allows you to disable an alert. To disable a plan-level alert for a specific
239+
* subscription, you must include the `subscription_id`. The `subscription_id` is not required
240+
* for customer or subscription level alerts.
241+
*/
238242
override fun disable(params: AlertDisableParams, requestOptions: RequestOptions): Alert {
239243
val request =
240244
HttpRequest.builder()
@@ -260,7 +264,11 @@ constructor(
260264
private val enableHandler: Handler<Alert> =
261265
jsonHandler<Alert>(clientOptions.jsonMapper).withErrorHandler(errorHandler)
262266

263-
/** This endpoint can be used to enable an alert. */
267+
/**
268+
* This endpoint allows you to enable an alert. To enable a plan-level alert for a specific
269+
* subscription, you must include the `subscription_id`. The `subscription_id` is not required
270+
* for customer or subscription level alerts.
271+
*/
264272
override fun enable(params: AlertEnableParams, requestOptions: RequestOptions): Alert {
265273
val request =
266274
HttpRequest.builder()

orb-java-core/src/test/kotlin/com/withorb/api/models/AlertDisableParamsTest.kt

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,38 @@
22

33
package com.withorb.api.models
44

5+
import com.withorb.api.core.http.QueryParams
56
import org.assertj.core.api.Assertions.assertThat
67
import org.junit.jupiter.api.Test
78

89
class AlertDisableParamsTest {
910

1011
@Test
1112
fun createAlertDisableParams() {
12-
AlertDisableParams.builder().alertConfigurationId("alert_configuration_id").build()
13+
AlertDisableParams.builder()
14+
.alertConfigurationId("alert_configuration_id")
15+
.subscriptionId("subscription_id")
16+
.build()
17+
}
18+
19+
@Test
20+
fun getQueryParams() {
21+
val params =
22+
AlertDisableParams.builder()
23+
.alertConfigurationId("alert_configuration_id")
24+
.subscriptionId("subscription_id")
25+
.build()
26+
val expected = QueryParams.builder()
27+
expected.put("subscription_id", "subscription_id")
28+
assertThat(params.getQueryParams()).isEqualTo(expected.build())
29+
}
30+
31+
@Test
32+
fun getQueryParamsWithoutOptionalFields() {
33+
val params =
34+
AlertDisableParams.builder().alertConfigurationId("alert_configuration_id").build()
35+
val expected = QueryParams.builder()
36+
assertThat(params.getQueryParams()).isEqualTo(expected.build())
1337
}
1438

1539
@Test

orb-java-core/src/test/kotlin/com/withorb/api/models/AlertEnableParamsTest.kt

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,38 @@
22

33
package com.withorb.api.models
44

5+
import com.withorb.api.core.http.QueryParams
56
import org.assertj.core.api.Assertions.assertThat
67
import org.junit.jupiter.api.Test
78

89
class AlertEnableParamsTest {
910

1011
@Test
1112
fun createAlertEnableParams() {
12-
AlertEnableParams.builder().alertConfigurationId("alert_configuration_id").build()
13+
AlertEnableParams.builder()
14+
.alertConfigurationId("alert_configuration_id")
15+
.subscriptionId("subscription_id")
16+
.build()
17+
}
18+
19+
@Test
20+
fun getQueryParams() {
21+
val params =
22+
AlertEnableParams.builder()
23+
.alertConfigurationId("alert_configuration_id")
24+
.subscriptionId("subscription_id")
25+
.build()
26+
val expected = QueryParams.builder()
27+
expected.put("subscription_id", "subscription_id")
28+
assertThat(params.getQueryParams()).isEqualTo(expected.build())
29+
}
30+
31+
@Test
32+
fun getQueryParamsWithoutOptionalFields() {
33+
val params =
34+
AlertEnableParams.builder().alertConfigurationId("alert_configuration_id").build()
35+
val expected = QueryParams.builder()
36+
assertThat(params.getQueryParams()).isEqualTo(expected.build())
1337
}
1438

1539
@Test

orb-java-core/src/test/kotlin/com/withorb/api/services/blocking/AlertServiceTest.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,10 @@ class AlertServiceTest {
150150
val alertService = client.alerts()
151151
val alert =
152152
alertService.disable(
153-
AlertDisableParams.builder().alertConfigurationId("alert_configuration_id").build()
153+
AlertDisableParams.builder()
154+
.alertConfigurationId("alert_configuration_id")
155+
.subscriptionId("subscription_id")
156+
.build()
154157
)
155158
println(alert)
156159
alert.validate()
@@ -166,7 +169,10 @@ class AlertServiceTest {
166169
val alertService = client.alerts()
167170
val alert =
168171
alertService.enable(
169-
AlertEnableParams.builder().alertConfigurationId("alert_configuration_id").build()
172+
AlertEnableParams.builder()
173+
.alertConfigurationId("alert_configuration_id")
174+
.subscriptionId("subscription_id")
175+
.build()
170176
)
171177
println(alert)
172178
alert.validate()

0 commit comments

Comments
 (0)