Merge pull request #60 from orbcorp/release-please--branches--main--changes--next

release: 0.1.0-alpha.7

Author: KiserEvan

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.1.0-alpha.6"
+  ".": "0.1.0-alpha.7"
 }

.stats.yml

@@ -1,2 +1,2 @@
 configured_endpoints: 93
-openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/orb%2Forb-5b28e83c3230be7d858ce20741c7b5debdad3e7720e2fa6e3a2d1774ca02a337.yml
+openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/orb%2Forb-2909e111b2e1a19626356bae22b7ef7ed276e7e33b939a2b8e164ccb1ec1bf40.yml

CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## 0.1.0-alpha.7 (2024-09-26)
+
+Full Changelog: [v0.1.0-alpha.6...v0.1.0-alpha.7](https://github.com/orbcorp/orb-java/compare/v0.1.0-alpha.6...v0.1.0-alpha.7)
+
+### Features
+
+* **api:** OpenAPI spec update via Stainless API ([#59](https://github.com/orbcorp/orb-java/issues/59)) ([8e8574c](https://github.com/orbcorp/orb-java/commit/8e8574cb159e45ab036088048a1362a6a8c32cc2))
+* **api:** OpenAPI spec update via Stainless API ([#61](https://github.com/orbcorp/orb-java/issues/61)) ([b48f9fe](https://github.com/orbcorp/orb-java/commit/b48f9fe87aae83b2bb028a4c8216a66f26af8801))
+* **api:** OpenAPI spec update via Stainless API ([#63](https://github.com/orbcorp/orb-java/issues/63)) ([fd13223](https://github.com/orbcorp/orb-java/commit/fd13223cd190ecee0312f5d64d74522db567d864))
+* **api:** OpenAPI spec update via Stainless API ([#67](https://github.com/orbcorp/orb-java/issues/67)) ([afffd96](https://github.com/orbcorp/orb-java/commit/afffd968e135d74d899c0377b0f6e5bf1787ae33))
+* **api:** OpenAPI spec update via Stainless API ([#68](https://github.com/orbcorp/orb-java/issues/68)) ([bd66065](https://github.com/orbcorp/orb-java/commit/bd6606510bf4dad9be78d019b9130542d0a9a532))
+* **api:** OpenAPI spec update via Stainless API ([#70](https://github.com/orbcorp/orb-java/issues/70)) ([8ab0aab](https://github.com/orbcorp/orb-java/commit/8ab0aab0ebea8a4d147a9c93b0e30917192743a6))
+* **api:** OpenAPI spec update via Stainless API ([#76](https://github.com/orbcorp/orb-java/issues/76)) ([5013205](https://github.com/orbcorp/orb-java/commit/50132057be8af15e443e6c6ee6a3828d24b888c0))
+* **client:** added structured fields to errors ([#65](https://github.com/orbcorp/orb-java/issues/65)) ([e6226f9](https://github.com/orbcorp/orb-java/commit/e6226f9a57e42c1786353757aca5b32744a24ffb))
+
+
+### Chores
+
+* **api:** rename `void` to `void_invoice` in Java SDK ([#72](https://github.com/orbcorp/orb-java/issues/72)) ([61d300a](https://github.com/orbcorp/orb-java/commit/61d300a474bca6fc47658bb3daa9dc7f1de44a16))
+* **docs:** internal update ([#74](https://github.com/orbcorp/orb-java/issues/74)) ([577588d](https://github.com/orbcorp/orb-java/commit/577588daa262f51547de5eb6785226fdca41be2b))
+* **docs:** internal update ([#75](https://github.com/orbcorp/orb-java/issues/75)) ([6905912](https://github.com/orbcorp/orb-java/commit/69059129d10672b1806b2288e044ff986c53d0c8))
+* **internal:** codegen related update ([#71](https://github.com/orbcorp/orb-java/issues/71)) ([99ddc03](https://github.com/orbcorp/orb-java/commit/99ddc031f02c7fe5648bfad4b6de0481864707cc))
+* **internal:** codegen related update ([#73](https://github.com/orbcorp/orb-java/issues/73)) ([5021325](https://github.com/orbcorp/orb-java/commit/50213258784197ba307bfe34f7c82a8ee821439a))
+* **internal:** fix lint warning for isPresent ([#66](https://github.com/orbcorp/orb-java/issues/66)) ([ff81eb6](https://github.com/orbcorp/orb-java/commit/ff81eb6ab227a308b45b0fa961ce3a8759826fdf))
+
+
+### Documentation
+
+* adjust additional properties example ([#64](https://github.com/orbcorp/orb-java/issues/64)) ([f200314](https://github.com/orbcorp/orb-java/commit/f20031470e553f4e414375e536e1366c2316dfb2))
+
 ## 0.1.0-alpha.6 (2024-09-06)
 
 Full Changelog: [v0.1.0-alpha.5...v0.1.0-alpha.6](https://github.com/orbcorp/orb-java/compare/v0.1.0-alpha.5...v0.1.0-alpha.6)

README.md

@@ -2,7 +2,7 @@
 
 <!-- x-release-please-start-version -->
 
-[![Maven Central](https://img.shields.io/maven-central/v/com.withorb.api/orb-java)](https://central.sonatype.com/artifact/com.withorb.api/orb-java/0.1.0-alpha.6)
+[![Maven Central](https://img.shields.io/maven-central/v/com.withorb.api/orb-java)](https://central.sonatype.com/artifact/com.withorb.api/orb-java/0.1.0-alpha.7)
 
 <!-- x-release-please-end -->
 
@@ -25,7 +25,7 @@ The REST API documentation can be found on [docs.withorb.com](https://docs.with
 <!-- x-release-please-start-version -->
 
 ```kotlin
-implementation("com.withorb.api:orb-java:0.1.0-alpha.6")
+implementation("com.withorb.api:orb-java:0.1.0-alpha.7")
 ```
 
 #### Maven
@@ -34,7 +34,7 @@ implementation("com.withorb.api:orb-java:0.1.0-alpha.6")
 <dependency>
     <groupId>com.withorb.api</groupId>
     <artifactId>orb-java</artifactId>
-    <version>0.1.0-alpha.6</version>
+    <version>0.1.0-alpha.7</version>
 </dependency>
 ```
 
@@ -166,7 +166,7 @@ if (field.isMissing()) {
 Sometimes, the server response may include additional properties that are not yet available in this library's types. You can access them using the model's `_additionalProperties` method:
 
 ```java
-JsonValue secret = customer._additionalProperties().get("secret_field");
+JsonValue secret = amountDiscount._additionalProperties().get("secret_field");
 ```
 
 ---

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 allprojects {
     group = "com.withorb.api"
-    version = "0.1.0-alpha.6" // x-release-please-version
+    version = "0.1.0-alpha.7" // x-release-please-version
 }
 
 

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

@@ -40,9 +40,16 @@ private constructor(
 
         maybeAddIdempotencyHeader(request)
 
+        // Don't send the current retry count in the headers if the caller set their own value.
+        val shouldSendRetryCount = !request.headers.containsKey("x-stainless-retry-count")
+
         var retries = 0
 
         while (true) {
+            if (shouldSendRetryCount) {
+                setRetryCountHeader(request, retries)
+            }
+
             val response =
                 try {
                     val response = httpClient.execute(request, requestOptions)
@@ -74,10 +81,21 @@ private constructor(
 
         maybeAddIdempotencyHeader(request)
 
+        // Don't send the current retry count in the headers if the caller set their own value.
+        val shouldSendRetryCount = !request.headers.containsKey("x-stainless-retry-count")
+
         var retries = 0
 
-        fun wrap(future: CompletableFuture<HttpResponse>): CompletableFuture<HttpResponse> {
-            return future
+        fun executeWithRetries(
+            request: HttpRequest,
+            requestOptions: RequestOptions,
+        ): CompletableFuture<HttpResponse> {
+            if (shouldSendRetryCount) {
+                setRetryCountHeader(request, retries)
+            }
+
+            return httpClient
+                .executeAsync(request, requestOptions)
                 .handleAsync(
                     fun(
                         response: HttpResponse?,
@@ -97,15 +115,15 @@ private constructor(
 
                         val backoffMillis = getRetryBackoffMillis(retries, response)
                         return sleepAsync(backoffMillis.toMillis()).thenCompose {
-                            wrap(httpClient.executeAsync(request, requestOptions))
+                            executeWithRetries(request, requestOptions)
                         }
                     },
                     MoreExecutors.directExecutor()
                 )
                 .thenCompose(Function.identity())
         }
 
-        return wrap(httpClient.executeAsync(request, requestOptions))
+        return executeWithRetries(request, requestOptions)
     }
 
     override fun close() {
@@ -118,6 +136,11 @@ private constructor(
         return request.body?.repeatable() ?: true
     }
 
+    private fun setRetryCountHeader(request: HttpRequest, retries: Int) {
+        request.headers.removeAll("x-stainless-retry-count")
+        request.headers.put("x-stainless-retry-count", retries.toString())
+    }
+
     private fun idempotencyKey(): String = "stainless-java-retry-${UUID.randomUUID()}"
 
     private fun maybeAddIdempotencyHeader(request: HttpRequest) {

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

@@ -2,12 +2,8 @@ package com.withorb.api.errors
 
 import com.google.common.collect.ListMultimap
 
-class BadRequestException
-constructor(
+class BadRequestException(
     headers: ListMultimap<String, String>,
-    private val error: OrbError,
-) : OrbServiceException(headers, "${error}") {
-    override fun statusCode(): Int = 400
-
-    fun error(): OrbError = error
-}
+    body: String,
+    error: OrbError,
+) : OrbServiceException(400, headers, body, error)

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

@@ -2,13 +2,9 @@ package com.withorb.api.errors
 
 import com.google.common.collect.ListMultimap
 
-class InternalServerException
-constructor(
-    private val statusCode: Int,
+class InternalServerException(
+    statusCode: Int,
     headers: ListMultimap<String, String>,
-    private val error: OrbError,
-) : OrbServiceException(headers, "${error}") {
-    override fun statusCode(): Int = statusCode
-
-    fun error(): OrbError = error
-}
+    body: String,
+    error: OrbError,
+) : OrbServiceException(statusCode, headers, body, error)

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

@@ -2,12 +2,8 @@ package com.withorb.api.errors
 
 import com.google.common.collect.ListMultimap
 
-class NotFoundException
-constructor(
+class NotFoundException(
     headers: ListMultimap<String, String>,
-    private val error: OrbError,
-) : OrbServiceException(headers, "${error}") {
-    override fun statusCode(): Int = 404
-
-    fun error(): OrbError = error
-}
+    body: String,
+    error: OrbError,
+) : OrbServiceException(404, headers, body, error)

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

@@ -5,11 +5,19 @@ import com.google.common.collect.ListMultimap
 abstract class OrbServiceException
 @JvmOverloads
 constructor(
+    private val statusCode: Int,
     private val headers: ListMultimap<String, String>,
-    message: String? = null,
+    private val body: String,
+    private val error: OrbError,
+    message: String = "$statusCode: $error",
     cause: Throwable? = null
 ) : OrbException(message, cause) {
-    abstract fun statusCode(): Int
+
+    fun statusCode(): Int = statusCode
 
     fun headers(): ListMultimap<String, String> = headers
+
+    fun body(): String = body
+
+    fun error(): OrbError = error
 }