feat: regenerate client from corrected OpenAPI spec

scripts/generate.sh

@@ -50,4 +50,11 @@ for pkg in api client models; do
     "src/main/java/com/getconvoy/$pkg/"
 done
 
+# Post-process: the stock generator template only reinitializes a JsonNullable
+# map when the wrapper is undefined. After setX(null) or deserializing JSON
+# null the wrapper is present with a null map and put*Item NPEs on get().put().
+# Extend the guard to also recreate the map when the present value is null.
+perl -pi -e 's/if \(this\.(\w+) == null \|\| !this\.\1\.isPresent\(\)\) \{/if (this.$1 == null || !this.$1.isPresent() || this.$1.get() == null) {/' \
+  src/main/java/com/getconvoy/models/*.java
+
 echo "Generated client synced into src/main/java/com/getconvoy/{api,client,models}"

src/main/java/com/getconvoy/api/OnboardApi.java

@@ -20,8 +20,8 @@
 
 import com.getconvoy.models.BulkOnboard200Response;
 import com.getconvoy.models.BulkOnboard202Response;
-import java.io.File;
 import com.getconvoy.models.GetProjects400Response;
+import com.getconvoy.models.ModelsBulkOnboardRequest;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -170,26 +170,26 @@ private File prepareDownloadFile(HttpResponse<InputStream> response) throws IOEx
    * This endpoint accepts a CSV file or JSON body to bulk-create endpoints with subscriptions
    * @param projectID Project ID (required)
    * @param dryRun Validate without creating (optional)
-   * @param body Onboard Details (JSON) (optional)
+   * @param modelsBulkOnboardRequest Onboard Details (JSON) (optional)
    * @return BulkOnboard200Response
    * @throws ApiException if fails to make API call
    */
-  public BulkOnboard200Response bulkOnboard(@jakarta.annotation.Nonnull String projectID, @jakarta.annotation.Nullable Boolean dryRun, @jakarta.annotation.Nullable File body) throws ApiException {
-    return bulkOnboard(projectID, dryRun, body, null);
+  public BulkOnboard200Response bulkOnboard(@jakarta.annotation.Nonnull String projectID, @jakarta.annotation.Nullable Boolean dryRun, @jakarta.annotation.Nullable ModelsBulkOnboardRequest modelsBulkOnboardRequest) throws ApiException {
+    return bulkOnboard(projectID, dryRun, modelsBulkOnboardRequest, null);
   }
 
   /**
    * Bulk onboard endpoints with subscriptions
    * This endpoint accepts a CSV file or JSON body to bulk-create endpoints with subscriptions
    * @param projectID Project ID (required)
    * @param dryRun Validate without creating (optional)
-   * @param body Onboard Details (JSON) (optional)
+   * @param modelsBulkOnboardRequest Onboard Details (JSON) (optional)
    * @param headers Optional headers to include in the request
    * @return BulkOnboard200Response
    * @throws ApiException if fails to make API call
    */
-  public BulkOnboard200Response bulkOnboard(@jakarta.annotation.Nonnull String projectID, @jakarta.annotation.Nullable Boolean dryRun, @jakarta.annotation.Nullable File body, Map<String, String> headers) throws ApiException {
-    ApiResponse<BulkOnboard200Response> localVarResponse = bulkOnboardWithHttpInfo(projectID, dryRun, body, headers);
+  public BulkOnboard200Response bulkOnboard(@jakarta.annotation.Nonnull String projectID, @jakarta.annotation.Nullable Boolean dryRun, @jakarta.annotation.Nullable ModelsBulkOnboardRequest modelsBulkOnboardRequest, Map<String, String> headers) throws ApiException {
+    ApiResponse<BulkOnboard200Response> localVarResponse = bulkOnboardWithHttpInfo(projectID, dryRun, modelsBulkOnboardRequest, headers);
     return localVarResponse.getData();
   }
 
@@ -198,26 +198,26 @@ public BulkOnboard200Response bulkOnboard(@jakarta.annotation.Nonnull String pro
    * This endpoint accepts a CSV file or JSON body to bulk-create endpoints with subscriptions
    * @param projectID Project ID (required)
    * @param dryRun Validate without creating (optional)
-   * @param body Onboard Details (JSON) (optional)
+   * @param modelsBulkOnboardRequest Onboard Details (JSON) (optional)
    * @return ApiResponse&lt;BulkOnboard200Response&gt;
    * @throws ApiException if fails to make API call
    */
-  public ApiResponse<BulkOnboard200Response> bulkOnboardWithHttpInfo(@jakarta.annotation.Nonnull String projectID, @jakarta.annotation.Nullable Boolean dryRun, @jakarta.annotation.Nullable File body) throws ApiException {
-    return bulkOnboardWithHttpInfo(projectID, dryRun, body, null);
+  public ApiResponse<BulkOnboard200Response> bulkOnboardWithHttpInfo(@jakarta.annotation.Nonnull String projectID, @jakarta.annotation.Nullable Boolean dryRun, @jakarta.annotation.Nullable ModelsBulkOnboardRequest modelsBulkOnboardRequest) throws ApiException {
+    return bulkOnboardWithHttpInfo(projectID, dryRun, modelsBulkOnboardRequest, null);
   }
 
   /**
    * Bulk onboard endpoints with subscriptions
    * This endpoint accepts a CSV file or JSON body to bulk-create endpoints with subscriptions
    * @param projectID Project ID (required)
    * @param dryRun Validate without creating (optional)
-   * @param body Onboard Details (JSON) (optional)
+   * @param modelsBulkOnboardRequest Onboard Details (JSON) (optional)
    * @param headers Optional headers to include in the request
    * @return ApiResponse&lt;BulkOnboard200Response&gt;
    * @throws ApiException if fails to make API call
    */
-  public ApiResponse<BulkOnboard200Response> bulkOnboardWithHttpInfo(@jakarta.annotation.Nonnull String projectID, @jakarta.annotation.Nullable Boolean dryRun, @jakarta.annotation.Nullable File body, Map<String, String> headers) throws ApiException {
-    HttpRequest.Builder localVarRequestBuilder = bulkOnboardRequestBuilder(projectID, dryRun, body, headers);
+  public ApiResponse<BulkOnboard200Response> bulkOnboardWithHttpInfo(@jakarta.annotation.Nonnull String projectID, @jakarta.annotation.Nullable Boolean dryRun, @jakarta.annotation.Nullable ModelsBulkOnboardRequest modelsBulkOnboardRequest, Map<String, String> headers) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = bulkOnboardRequestBuilder(projectID, dryRun, modelsBulkOnboardRequest, headers);
     try {
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
           localVarRequestBuilder.build(),
@@ -264,7 +264,7 @@ public ApiResponse<BulkOnboard200Response> bulkOnboardWithHttpInfo(@jakarta.anno
     }
   }
 
-  private HttpRequest.Builder bulkOnboardRequestBuilder(@jakarta.annotation.Nonnull String projectID, @jakarta.annotation.Nullable Boolean dryRun, @jakarta.annotation.Nullable File body, Map<String, String> headers) throws ApiException {
+  private HttpRequest.Builder bulkOnboardRequestBuilder(@jakarta.annotation.Nonnull String projectID, @jakarta.annotation.Nullable Boolean dryRun, @jakarta.annotation.Nullable ModelsBulkOnboardRequest modelsBulkOnboardRequest, Map<String, String> headers) throws ApiException {
     // verify the required parameter 'projectID' is set
     if (projectID == null) {
       throw new ApiException(400, "Missing the required parameter 'projectID' when calling bulkOnboard");
@@ -292,11 +292,11 @@ private HttpRequest.Builder bulkOnboardRequestBuilder(@jakarta.annotation.Nonnul
       localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
     }
 
-    localVarRequestBuilder.header("Content-Type", "application/octet-stream");
+    localVarRequestBuilder.header("Content-Type", "application/json");
     localVarRequestBuilder.header("Accept", "application/json");
 
     try {
-      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(modelsBulkOnboardRequest);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
     } catch (IOException e) {
       throw new ApiException(e);

src/main/java/com/getconvoy/models/AuthRoleType.java

@@ -58,7 +58,9 @@ public enum AuthRoleType {
   /**
    * 
    */
-  RoleAPI("api");
+  RoleAPI("api"),
+
+  EMPTY("");
 
   private String value;
 

src/main/java/com/getconvoy/models/ConfigRequestIDHeaderProvider.java

@@ -30,7 +30,9 @@
  */
 public enum ConfigRequestIDHeaderProvider {
 
-  DefaultRequestIDHeader("X-Convoy-Idempotency-Key");
+  DefaultRequestIDHeader("X-Convoy-Idempotency-Key"),
+
+  EMPTY("");
 
   private String value;
 

src/main/java/com/getconvoy/models/ConfigSignatureHeaderProvider.java

@@ -30,7 +30,9 @@
  */
 public enum ConfigSignatureHeaderProvider {
 
-  DefaultSignatureHeader("X-Convoy-Signature");
+  DefaultSignatureHeader("X-Convoy-Signature"),
+
+  EMPTY("");
 
   private String value;
 

src/main/java/com/getconvoy/models/DatastoreAPIKeyResponse.java

@@ -26,6 +26,10 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.getconvoy.models.DatastoreRole;
 import java.util.Arrays;
+import org.openapitools.jackson.nullable.JsonNullable;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.NoSuchElementException;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 
@@ -50,8 +54,7 @@ public class DatastoreAPIKeyResponse {
   private String createdAt;
 
   public static final String JSON_PROPERTY_EXPIRES_AT = "expires_at";
-  @jakarta.annotation.Nullable
-  private String expiresAt;
+  private JsonNullable<String> expiresAt = JsonNullable.<String>undefined();
 
   public static final String JSON_PROPERTY_KEY = "key";
   @jakarta.annotation.Nullable
@@ -105,7 +108,7 @@ public void setCreatedAt(@jakarta.annotation.Nullable String createdAt) {
 
 
   public DatastoreAPIKeyResponse expiresAt(@jakarta.annotation.Nullable String expiresAt) {
-    this.expiresAt = expiresAt;
+    this.expiresAt = JsonNullable.<String>of(expiresAt);
     return this;
   }
 
@@ -114,19 +117,27 @@ public DatastoreAPIKeyResponse expiresAt(@jakarta.annotation.Nullable String exp
    * @return expiresAt
    */
   @jakarta.annotation.Nullable
-  @JsonProperty(value = JSON_PROPERTY_EXPIRES_AT, required = false)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JsonIgnore
   public String getExpiresAt() {
-    return expiresAt;
+        return expiresAt.orElse(null);
   }
 
-
   @JsonProperty(value = JSON_PROPERTY_EXPIRES_AT, required = false)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setExpiresAt(@jakarta.annotation.Nullable String expiresAt) {
+
+  public JsonNullable<String> getExpiresAt_JsonNullable() {
+    return expiresAt;
+  }
+
+  @JsonProperty(JSON_PROPERTY_EXPIRES_AT)
+  public void setExpiresAt_JsonNullable(JsonNullable<String> expiresAt) {
     this.expiresAt = expiresAt;
   }
 
+  public void setExpiresAt(@jakarta.annotation.Nullable String expiresAt) {
+    this.expiresAt = JsonNullable.<String>of(expiresAt);
+  }
+
 
   public DatastoreAPIKeyResponse key(@jakarta.annotation.Nullable String key) {
     this.key = key;
@@ -285,7 +296,7 @@ public boolean equals(Object o) {
     }
     DatastoreAPIKeyResponse datastoreAPIKeyResponse = (DatastoreAPIKeyResponse) o;
     return Objects.equals(this.createdAt, datastoreAPIKeyResponse.createdAt) &&
-        Objects.equals(this.expiresAt, datastoreAPIKeyResponse.expiresAt) &&
+        equalsNullable(this.expiresAt, datastoreAPIKeyResponse.expiresAt) &&
         Objects.equals(this.key, datastoreAPIKeyResponse.key) &&
         Objects.equals(this.keyType, datastoreAPIKeyResponse.keyType) &&
         Objects.equals(this.name, datastoreAPIKeyResponse.name) &&
@@ -294,9 +305,20 @@ public boolean equals(Object o) {
         Objects.equals(this.userId, datastoreAPIKeyResponse.userId);
   }
 
+  private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
+    return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get()));
+  }
+
   @Override
   public int hashCode() {
-    return Objects.hash(createdAt, expiresAt, key, keyType, name, role, uid, userId);
+    return Objects.hash(createdAt, hashCodeNullable(expiresAt), key, keyType, name, role, uid, userId);
+  }
+
+  private static <T> int hashCodeNullable(JsonNullable<T> a) {
+    if (a == null) {
+      return 1;
+    }
+    return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31;
   }
 
   @Override