Add included rows to batchrowsquery and pagination meta to listrows for reference tables responses

.generator/schemas/v2/openapi.yaml

@@ -12763,9 +12763,25 @@ components:
                 - id: row_id_2
                   type: row
           type: reference-tables-batch-rows-query
+        included:
+          - attributes:
+              values:
+                ip_address: 102.130.113.9
+            id: row_id_1
+            type: row
+          - attributes:
+              values:
+                ip_address: 102.130.113.10
+            id: row_id_2
+            type: row
       properties:
         data:
           $ref: "#/components/schemas/BatchRowsQueryResponseData"
+        included:
+          description: Full row resources matching the query, included alongside the relationship references in `data`.
+          items:
+            $ref: "#/components/schemas/TableRowResourceData"
+          type: array
       type: object
     BatchRowsQueryResponseData:
       description: Data object for a batch rows query response.
@@ -56966,6 +56982,9 @@ components:
         links:
           first: "/api/v2/reference-tables/tables/00000000-0000-0000-0000-000000000000/rows/list?page%5Blimit%5D=100"
           self: "/api/v2/reference-tables/tables/00000000-0000-0000-0000-000000000000/rows/list?page%5Bcontinuation_token%5D=eyJzaWQiOjEyMzQ1LCJwayI6ImV4YW1wbGVfcGsifQ%3D%3D&page%5Blimit%5D=100"
+        meta:
+          page:
+            next_continuation_token: eyJzaWQiOjEyMzQ1LCJwayI6ImV4YW1wbGVfcGsifQ==
       properties:
         data:
           description: The rows.
@@ -56974,6 +56993,8 @@ components:
           type: array
         links:
           $ref: "#/components/schemas/ListRowsResponseLinks"
+        meta:
+          $ref: "#/components/schemas/ListRowsResponseMeta"
       required:
         - data
         - links
@@ -56997,6 +57018,20 @@ components:
         - self
         - first
       type: object
+    ListRowsResponseMeta:
+      description: Contains pagination details, including the continuation token for fetching additional rows.
+      properties:
+        page:
+          $ref: "#/components/schemas/ListRowsResponseMetaPage"
+      type: object
+    ListRowsResponseMetaPage:
+      description: Contains the continuation token for navigating to the next page of rows.
+      properties:
+        next_continuation_token:
+          description: Opaque token to pass as the `page[continuation_token]` query parameter to fetch the next page of results. Only present when more rows are available.
+          example: eyJzaWQiOjEyMzQ1LCJwayI6ImV4YW1wbGVfcGsifQ==
+          type: string
+      type: object
     ListRulesResponse:
       description: Scorecard rules response.
       properties:

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

@@ -12,19 +12,27 @@
 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 object for a batch rows query against a reference table. */
-@JsonPropertyOrder({BatchRowsQueryResponse.JSON_PROPERTY_DATA})
+@JsonPropertyOrder({
+  BatchRowsQueryResponse.JSON_PROPERTY_DATA,
+  BatchRowsQueryResponse.JSON_PROPERTY_INCLUDED
+})
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
 public class BatchRowsQueryResponse {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_DATA = "data";
   private BatchRowsQueryResponseData data;
 
+  public static final String JSON_PROPERTY_INCLUDED = "included";
+  private List<TableRowResourceData> included = null;
+
   public BatchRowsQueryResponse data(BatchRowsQueryResponseData data) {
     this.data = data;
     this.unparsed |= data.unparsed;
@@ -47,6 +55,40 @@ public void setData(BatchRowsQueryResponseData data) {
     this.data = data;
   }
 
+  public BatchRowsQueryResponse included(List<TableRowResourceData> included) {
+    this.included = included;
+    for (TableRowResourceData item : included) {
+      this.unparsed |= item.unparsed;
+    }
+    return this;
+  }
+
+  public BatchRowsQueryResponse addIncludedItem(TableRowResourceData includedItem) {
+    if (this.included == null) {
+      this.included = new ArrayList<>();
+    }
+    this.included.add(includedItem);
+    this.unparsed |= includedItem.unparsed;
+    return this;
+  }
+
+  /**
+   * Full row resources matching the query, included alongside the relationship references in <code>
+   * data</code>.
+   *
+   * @return included
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_INCLUDED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<TableRowResourceData> getIncluded() {
+    return included;
+  }
+
+  public void setIncluded(List<TableRowResourceData> included) {
+    this.included = included;
+  }
+
   /**
    * A container for additional, undeclared properties. This is a holder for any undeclared
    * properties as specified with the 'additionalProperties' keyword in the OAS document.
@@ -104,19 +146,21 @@ public boolean equals(Object o) {
     }
     BatchRowsQueryResponse batchRowsQueryResponse = (BatchRowsQueryResponse) o;
     return Objects.equals(this.data, batchRowsQueryResponse.data)
+        && Objects.equals(this.included, batchRowsQueryResponse.included)
         && Objects.equals(this.additionalProperties, batchRowsQueryResponse.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(data, additionalProperties);
+    return Objects.hash(data, included, additionalProperties);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class BatchRowsQueryResponse {\n");
     sb.append("    data: ").append(toIndentedString(data)).append("\n");
+    sb.append("    included: ").append(toIndentedString(included)).append("\n");
     sb.append("    additionalProperties: ")
         .append(toIndentedString(additionalProperties))
         .append("\n");

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

@@ -20,7 +20,11 @@
 import java.util.Objects;
 
 /** Paginated list of reference table rows. */
-@JsonPropertyOrder({ListRowsResponse.JSON_PROPERTY_DATA, ListRowsResponse.JSON_PROPERTY_LINKS})
+@JsonPropertyOrder({
+  ListRowsResponse.JSON_PROPERTY_DATA,
+  ListRowsResponse.JSON_PROPERTY_LINKS,
+  ListRowsResponse.JSON_PROPERTY_META
+})
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
 public class ListRowsResponse {
@@ -31,6 +35,9 @@ public class ListRowsResponse {
   public static final String JSON_PROPERTY_LINKS = "links";
   private ListRowsResponseLinks links;
 
+  public static final String JSON_PROPERTY_META = "meta";
+  private ListRowsResponseMeta meta;
+
   public ListRowsResponse() {}
 
   @JsonCreator
@@ -92,6 +99,28 @@ public void setLinks(ListRowsResponseLinks links) {
     this.links = links;
   }
 
+  public ListRowsResponse meta(ListRowsResponseMeta meta) {
+    this.meta = meta;
+    this.unparsed |= meta.unparsed;
+    return this;
+  }
+
+  /**
+   * Contains pagination details, including the continuation token for fetching additional rows.
+   *
+   * @return meta
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_META)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public ListRowsResponseMeta getMeta() {
+    return meta;
+  }
+
+  public void setMeta(ListRowsResponseMeta meta) {
+    this.meta = meta;
+  }
+
   /**
    * A container for additional, undeclared properties. This is a holder for any undeclared
    * properties as specified with the 'additionalProperties' keyword in the OAS document.
@@ -150,12 +179,13 @@ public boolean equals(Object o) {
     ListRowsResponse listRowsResponse = (ListRowsResponse) o;
     return Objects.equals(this.data, listRowsResponse.data)
         && Objects.equals(this.links, listRowsResponse.links)
+        && Objects.equals(this.meta, listRowsResponse.meta)
         && Objects.equals(this.additionalProperties, listRowsResponse.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(data, links, additionalProperties);
+    return Objects.hash(data, links, meta, additionalProperties);
   }
 
   @Override
@@ -164,6 +194,7 @@ public String toString() {
     sb.append("class ListRowsResponse {\n");
     sb.append("    data: ").append(toIndentedString(data)).append("\n");
     sb.append("    links: ").append(toIndentedString(links)).append("\n");
+    sb.append("    meta: ").append(toIndentedString(meta)).append("\n");
     sb.append("    additionalProperties: ")
         .append(toIndentedString(additionalProperties))
         .append("\n");

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

@@ -0,0 +1,136 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Contains pagination details, including the continuation token for fetching additional rows. */
+@JsonPropertyOrder({ListRowsResponseMeta.JSON_PROPERTY_PAGE})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class ListRowsResponseMeta {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_PAGE = "page";
+  private ListRowsResponseMetaPage page;
+
+  public ListRowsResponseMeta page(ListRowsResponseMetaPage page) {
+    this.page = page;
+    this.unparsed |= page.unparsed;
+    return this;
+  }
+
+  /**
+   * Contains the continuation token for navigating to the next page of rows.
+   *
+   * @return page
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAGE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public ListRowsResponseMetaPage getPage() {
+    return page;
+  }
+
+  public void setPage(ListRowsResponseMetaPage page) {
+    this.page = page;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return ListRowsResponseMeta
+   */
+  @JsonAnySetter
+  public ListRowsResponseMeta putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this ListRowsResponseMeta object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ListRowsResponseMeta listRowsResponseMeta = (ListRowsResponseMeta) o;
+    return Objects.equals(this.page, listRowsResponseMeta.page)
+        && Objects.equals(this.additionalProperties, listRowsResponseMeta.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(page, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ListRowsResponseMeta {\n");
+    sb.append("    page: ").append(toIndentedString(page)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}