Fix broken JSON API shape for security monitoring rules bulk delete

.generator/schemas/v2/openapi.yaml

@@ -91507,6 +91507,10 @@ components:
       properties:
         attributes:
           $ref: "#/components/schemas/SecurityMonitoringRuleBulkDeleteAttributes"
+        id:
+          description: Request ID. This value is echoed back as the response's resource ID.
+          example: bulk_delete
+          type: string
         type:
           $ref: "#/components/schemas/SecurityMonitoringRuleBulkDeleteRequestDataType"
       required:
@@ -91531,6 +91535,12 @@ components:
         - BULK_DELETE_RULES
     SecurityMonitoringRuleBulkDeleteResponse:
       description: Response for bulk deleting security monitoring rules.
+      properties:
+        data:
+          $ref: "#/components/schemas/SecurityMonitoringRuleBulkDeleteResponseData"
+      type: object
+    SecurityMonitoringRuleBulkDeleteResponseAttributes:
+      description: Attributes for the bulk delete response.
       properties:
         deletedRules:
           description: List of successfully deleted rule IDs.
@@ -91543,6 +91553,25 @@ components:
             type: string
           type: array
       type: object
+    SecurityMonitoringRuleBulkDeleteResponseData:
+      description: Data for the bulk delete response.
+      properties:
+        attributes:
+          $ref: "#/components/schemas/SecurityMonitoringRuleBulkDeleteResponseAttributes"
+        id:
+          description: The identifier of the bulk delete response.
+          type: string
+        type:
+          $ref: "#/components/schemas/SecurityMonitoringRuleBulkDeleteResponseDataType"
+      type: object
+    SecurityMonitoringRuleBulkDeleteResponseDataType:
+      description: The resource type for a bulk delete response.
+      enum:
+        - bulk_delete_response
+      example: bulk_delete_response
+      type: string
+      x-enum-varnames:
+        - BULK_DELETE_RESPONSE
     SecurityMonitoringRuleBulkExportAttributes:
       description: Attributes for bulk exporting security monitoring rules.
       properties:
@@ -185417,6 +185446,7 @@ paths:
                       ruleIds:
                         - abc-000-u7q
                         - abc-000-7dd
+                    id: bulk_delete
                     type: bulk_delete_rules
             schema:
               $ref: "#/components/schemas/SecurityMonitoringRuleBulkDeletePayload"
@@ -185428,10 +185458,14 @@ paths:
               examples:
                 default:
                   value:
-                    deletedRules:
-                      - abc-000-u7q
-                      - abc-000-7dd
-                    failedRules: []
+                    data:
+                      attributes:
+                        deletedRules:
+                          - abc-000-u7q
+                          - abc-000-7dd
+                        failedRules: []
+                      id: bulk_delete_response
+                      type: bulk_delete_response
               schema:
                 $ref: "#/components/schemas/SecurityMonitoringRuleBulkDeleteResponse"
           description: OK

examples/v2/security-monitoring/BulkDeleteSecurityMonitoringRules.java

@@ -22,6 +22,7 @@ public static void main(String[] args) {
                     .attributes(
                         new SecurityMonitoringRuleBulkDeleteAttributes()
                             .ruleIds(Arrays.asList("abc-000-u7q", "abc-000-7dd")))
+                    .id("bulk_delete")
                     .type(SecurityMonitoringRuleBulkDeleteRequestDataType.BULK_DELETE_RULES));
 
     try {

src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleBulkDeleteData.java

@@ -20,6 +20,7 @@
 /** Data for bulk deleting security monitoring rules. */
 @JsonPropertyOrder({
   SecurityMonitoringRuleBulkDeleteData.JSON_PROPERTY_ATTRIBUTES,
+  SecurityMonitoringRuleBulkDeleteData.JSON_PROPERTY_ID,
   SecurityMonitoringRuleBulkDeleteData.JSON_PROPERTY_TYPE
 })
 @jakarta.annotation.Generated(
@@ -29,6 +30,9 @@ public class SecurityMonitoringRuleBulkDeleteData {
   public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
   private SecurityMonitoringRuleBulkDeleteAttributes attributes;
 
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
+
   public static final String JSON_PROPERTY_TYPE = "type";
   private SecurityMonitoringRuleBulkDeleteRequestDataType type;
 
@@ -71,6 +75,27 @@ public void setAttributes(SecurityMonitoringRuleBulkDeleteAttributes attributes)
     }
   }
 
+  public SecurityMonitoringRuleBulkDeleteData id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * Request ID. This value is echoed back as the response's resource ID.
+   *
+   * @return id
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
   public SecurityMonitoringRuleBulkDeleteData type(
       SecurityMonitoringRuleBulkDeleteRequestDataType type) {
     this.type = type;
@@ -154,21 +179,23 @@ public boolean equals(Object o) {
     SecurityMonitoringRuleBulkDeleteData securityMonitoringRuleBulkDeleteData =
         (SecurityMonitoringRuleBulkDeleteData) o;
     return Objects.equals(this.attributes, securityMonitoringRuleBulkDeleteData.attributes)
+        && Objects.equals(this.id, securityMonitoringRuleBulkDeleteData.id)
         && Objects.equals(this.type, securityMonitoringRuleBulkDeleteData.type)
         && Objects.equals(
             this.additionalProperties, securityMonitoringRuleBulkDeleteData.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(attributes, type, additionalProperties);
+    return Objects.hash(attributes, id, type, additionalProperties);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class SecurityMonitoringRuleBulkDeleteData {\n");
     sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    type: ").append(toIndentedString(type)).append("\n");
     sb.append("    additionalProperties: ")
         .append(toIndentedString(additionalProperties))

src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleBulkDeleteResponse.java

@@ -12,83 +12,43 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
 /** Response for bulk deleting security monitoring rules. */
-@JsonPropertyOrder({
-  SecurityMonitoringRuleBulkDeleteResponse.JSON_PROPERTY_DELETED_RULES,
-  SecurityMonitoringRuleBulkDeleteResponse.JSON_PROPERTY_FAILED_RULES
-})
+@JsonPropertyOrder({SecurityMonitoringRuleBulkDeleteResponse.JSON_PROPERTY_DATA})
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
 public class SecurityMonitoringRuleBulkDeleteResponse {
   @JsonIgnore public boolean unparsed = false;
-  public static final String JSON_PROPERTY_DELETED_RULES = "deletedRules";
-  private List<String> deletedRules = null;
+  public static final String JSON_PROPERTY_DATA = "data";
+  private SecurityMonitoringRuleBulkDeleteResponseData data;
 
-  public static final String JSON_PROPERTY_FAILED_RULES = "failedRules";
-  private List<String> failedRules = null;
-
-  public SecurityMonitoringRuleBulkDeleteResponse deletedRules(List<String> deletedRules) {
-    this.deletedRules = deletedRules;
-    return this;
-  }
-
-  public SecurityMonitoringRuleBulkDeleteResponse addDeletedRulesItem(String deletedRulesItem) {
-    if (this.deletedRules == null) {
-      this.deletedRules = new ArrayList<>();
-    }
-    this.deletedRules.add(deletedRulesItem);
+  public SecurityMonitoringRuleBulkDeleteResponse data(
+      SecurityMonitoringRuleBulkDeleteResponseData data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
     return this;
   }
 
   /**
-   * List of successfully deleted rule IDs.
+   * Data for the bulk delete response.
    *
-   * @return deletedRules
+   * @return data
    */
   @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_DELETED_RULES)
+  @JsonProperty(JSON_PROPERTY_DATA)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public List<String> getDeletedRules() {
-    return deletedRules;
-  }
-
-  public void setDeletedRules(List<String> deletedRules) {
-    this.deletedRules = deletedRules;
-  }
-
-  public SecurityMonitoringRuleBulkDeleteResponse failedRules(List<String> failedRules) {
-    this.failedRules = failedRules;
-    return this;
+  public SecurityMonitoringRuleBulkDeleteResponseData getData() {
+    return data;
   }
 
-  public SecurityMonitoringRuleBulkDeleteResponse addFailedRulesItem(String failedRulesItem) {
-    if (this.failedRules == null) {
-      this.failedRules = new ArrayList<>();
+  public void setData(SecurityMonitoringRuleBulkDeleteResponseData data) {
+    this.data = data;
+    if (data != null) {
+      this.unparsed |= data.unparsed;
     }
-    this.failedRules.add(failedRulesItem);
-    return this;
-  }
-
-  /**
-   * List of rule IDs that could not be deleted.
-   *
-   * @return failedRules
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_FAILED_RULES)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public List<String> getFailedRules() {
-    return failedRules;
-  }
-
-  public void setFailedRules(List<String> failedRules) {
-    this.failedRules = failedRules;
   }
 
   /**
@@ -148,24 +108,22 @@ public boolean equals(Object o) {
     }
     SecurityMonitoringRuleBulkDeleteResponse securityMonitoringRuleBulkDeleteResponse =
         (SecurityMonitoringRuleBulkDeleteResponse) o;
-    return Objects.equals(this.deletedRules, securityMonitoringRuleBulkDeleteResponse.deletedRules)
-        && Objects.equals(this.failedRules, securityMonitoringRuleBulkDeleteResponse.failedRules)
+    return Objects.equals(this.data, securityMonitoringRuleBulkDeleteResponse.data)
         && Objects.equals(
             this.additionalProperties,
             securityMonitoringRuleBulkDeleteResponse.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(deletedRules, failedRules, additionalProperties);
+    return Objects.hash(data, additionalProperties);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class SecurityMonitoringRuleBulkDeleteResponse {\n");
-    sb.append("    deletedRules: ").append(toIndentedString(deletedRules)).append("\n");
-    sb.append("    failedRules: ").append(toIndentedString(failedRules)).append("\n");
+    sb.append("    data: ").append(toIndentedString(data)).append("\n");
     sb.append("    additionalProperties: ")
         .append(toIndentedString(additionalProperties))
         .append("\n");