diff --git a/.apigentools-info b/.apigentools-info index a9f0ebd961f..9f0f61c5e46 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.6.6", - "regenerated": "2025-02-14 15:03:35.352599", - "spec_repo_commit": "a739b49f" + "regenerated": "2025-02-17 08:39:26.763726", + "spec_repo_commit": "08213d1b" }, "v2": { "apigentools_version": "1.6.6", - "regenerated": "2025-02-14 15:03:35.368038", - "spec_repo_commit": "a739b49f" + "regenerated": "2025-02-17 08:39:26.778770", + "spec_repo_commit": "08213d1b" } } } \ No newline at end of file diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml index 79e471c0686..3080ec77342 100644 --- a/.generator/schemas/v1/openapi.yaml +++ b/.generator/schemas/v1/openapi.yaml @@ -1115,6 +1115,61 @@ components: type: string x-enum-varnames: - CHECK_STATUS + ColumnOrderObject: + description: Order criteria + properties: + index: + description: Index of the sorted column + format: double + type: number + name: + description: Name of the sorted column + type: string + order: + $ref: '#/components/schemas/ColumnOrderObjectOrder' + description: Order of the sort + type: + $ref: '#/components/schemas/ColumnOrderObjectType' + description: Type of sorted attribute + required: + - order + - type + type: object + ColumnOrderObjectOrder: + description: Order object + enum: + - asc + - desc + example: asc + type: string + x-enum-varnames: + - ASC + - DESC + ColumnOrderObjectType: + description: type of column + enum: + - formula + - group + example: formula + type: string + x-enum-varnames: + - FORMULA + - GROUP + ColumnSortObject: + description: Sort object + properties: + count: + description: Limit number of items displayed + format: double + type: number + order_by: + description: Order criteria + items: + $ref: '#/components/schemas/ColumnOrderObject' + maxItems: 1 + minItems: 1 + type: array + type: object ContentEncoding: description: HTTP header used to compress the media-type. enum: @@ -10223,6 +10278,8 @@ components: $ref: '#/components/schemas/LogQueryDefinition' security_query: $ref: '#/components/schemas/LogQueryDefinition' + sort: + $ref: '#/components/schemas/ColumnSortObject' type: object ReferenceTableLogsLookupProcessor: description: '**Note**: Reference Tables are in public beta. diff --git a/src/main/java/com/datadog/api/client/v1/model/ColumnOrderObject.java b/src/main/java/com/datadog/api/client/v1/model/ColumnOrderObject.java new file mode 100644 index 00000000000..26bbb905655 --- /dev/null +++ b/src/main/java/com/datadog/api/client/v1/model/ColumnOrderObject.java @@ -0,0 +1,237 @@ +/* + * 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.v1.model; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonCreator; +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; + +/** Order criteria */ +@JsonPropertyOrder({ + ColumnOrderObject.JSON_PROPERTY_INDEX, + ColumnOrderObject.JSON_PROPERTY_NAME, + ColumnOrderObject.JSON_PROPERTY_ORDER, + ColumnOrderObject.JSON_PROPERTY_TYPE +}) +@jakarta.annotation.Generated( + value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator") +public class ColumnOrderObject { + @JsonIgnore public boolean unparsed = false; + public static final String JSON_PROPERTY_INDEX = "index"; + private Double index; + + public static final String JSON_PROPERTY_NAME = "name"; + private String name; + + public static final String JSON_PROPERTY_ORDER = "order"; + private ColumnOrderObjectOrder order; + + public static final String JSON_PROPERTY_TYPE = "type"; + private ColumnOrderObjectType type; + + public ColumnOrderObject() {} + + @JsonCreator + public ColumnOrderObject( + @JsonProperty(required = true, value = JSON_PROPERTY_ORDER) ColumnOrderObjectOrder order, + @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) ColumnOrderObjectType type) { + this.order = order; + this.unparsed |= !order.isValid(); + this.type = type; + this.unparsed |= !type.isValid(); + } + + public ColumnOrderObject index(Double index) { + this.index = index; + return this; + } + + /** + * Index of the sorted column + * + * @return index + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_INDEX) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Double getIndex() { + return index; + } + + public void setIndex(Double index) { + this.index = index; + } + + public ColumnOrderObject name(String name) { + this.name = name; + return this; + } + + /** + * Name of the sorted column + * + * @return name + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public ColumnOrderObject order(ColumnOrderObjectOrder order) { + this.order = order; + this.unparsed |= !order.isValid(); + return this; + } + + /** + * Order object + * + * @return order + */ + @JsonProperty(JSON_PROPERTY_ORDER) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public ColumnOrderObjectOrder getOrder() { + return order; + } + + public void setOrder(ColumnOrderObjectOrder order) { + if (!order.isValid()) { + this.unparsed = true; + } + this.order = order; + } + + public ColumnOrderObject type(ColumnOrderObjectType type) { + this.type = type; + this.unparsed |= !type.isValid(); + return this; + } + + /** + * type of column + * + * @return type + */ + @JsonProperty(JSON_PROPERTY_TYPE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public ColumnOrderObjectType getType() { + return type; + } + + public void setType(ColumnOrderObjectType type) { + if (!type.isValid()) { + this.unparsed = true; + } + this.type = type; + } + + /** + * 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 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 ColumnOrderObject + */ + @JsonAnySetter + public ColumnOrderObject putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + * + * @return The additional properties + */ + @JsonAnyGetter + public Map 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 ColumnOrderObject object is equal to o. */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ColumnOrderObject columnOrderObject = (ColumnOrderObject) o; + return Objects.equals(this.index, columnOrderObject.index) + && Objects.equals(this.name, columnOrderObject.name) + && Objects.equals(this.order, columnOrderObject.order) + && Objects.equals(this.type, columnOrderObject.type) + && Objects.equals(this.additionalProperties, columnOrderObject.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(index, name, order, type, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ColumnOrderObject {\n"); + sb.append(" index: ").append(toIndentedString(index)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" order: ").append(toIndentedString(order)).append("\n"); + sb.append(" type: ").append(toIndentedString(type)).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 "); + } +} diff --git a/src/main/java/com/datadog/api/client/v1/model/ColumnOrderObjectOrder.java b/src/main/java/com/datadog/api/client/v1/model/ColumnOrderObjectOrder.java new file mode 100644 index 00000000000..ac68435927a --- /dev/null +++ b/src/main/java/com/datadog/api/client/v1/model/ColumnOrderObjectOrder.java @@ -0,0 +1,57 @@ +/* + * 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.v1.model; + +import com.datadog.api.client.ModelEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import java.io.IOException; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** Order object */ +@JsonSerialize(using = ColumnOrderObjectOrder.ColumnOrderObjectOrderSerializer.class) +public class ColumnOrderObjectOrder extends ModelEnum { + + private static final Set allowedValues = + new HashSet(Arrays.asList("asc", "desc")); + + public static final ColumnOrderObjectOrder ASC = new ColumnOrderObjectOrder("asc"); + public static final ColumnOrderObjectOrder DESC = new ColumnOrderObjectOrder("desc"); + + ColumnOrderObjectOrder(String value) { + super(value, allowedValues); + } + + public static class ColumnOrderObjectOrderSerializer + extends StdSerializer { + public ColumnOrderObjectOrderSerializer(Class t) { + super(t); + } + + public ColumnOrderObjectOrderSerializer() { + this(null); + } + + @Override + public void serialize( + ColumnOrderObjectOrder value, JsonGenerator jgen, SerializerProvider provider) + throws IOException, JsonProcessingException { + jgen.writeObject(value.value); + } + } + + @JsonCreator + public static ColumnOrderObjectOrder fromValue(String value) { + return new ColumnOrderObjectOrder(value); + } +} diff --git a/src/main/java/com/datadog/api/client/v1/model/ColumnOrderObjectType.java b/src/main/java/com/datadog/api/client/v1/model/ColumnOrderObjectType.java new file mode 100644 index 00000000000..a1c6b92f8d1 --- /dev/null +++ b/src/main/java/com/datadog/api/client/v1/model/ColumnOrderObjectType.java @@ -0,0 +1,56 @@ +/* + * 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.v1.model; + +import com.datadog.api.client.ModelEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import java.io.IOException; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** type of column */ +@JsonSerialize(using = ColumnOrderObjectType.ColumnOrderObjectTypeSerializer.class) +public class ColumnOrderObjectType extends ModelEnum { + + private static final Set allowedValues = + new HashSet(Arrays.asList("formula", "group")); + + public static final ColumnOrderObjectType FORMULA = new ColumnOrderObjectType("formula"); + public static final ColumnOrderObjectType GROUP = new ColumnOrderObjectType("group"); + + ColumnOrderObjectType(String value) { + super(value, allowedValues); + } + + public static class ColumnOrderObjectTypeSerializer extends StdSerializer { + public ColumnOrderObjectTypeSerializer(Class t) { + super(t); + } + + public ColumnOrderObjectTypeSerializer() { + this(null); + } + + @Override + public void serialize( + ColumnOrderObjectType value, JsonGenerator jgen, SerializerProvider provider) + throws IOException, JsonProcessingException { + jgen.writeObject(value.value); + } + } + + @JsonCreator + public static ColumnOrderObjectType fromValue(String value) { + return new ColumnOrderObjectType(value); + } +} diff --git a/src/main/java/com/datadog/api/client/v1/model/ColumnSortObject.java b/src/main/java/com/datadog/api/client/v1/model/ColumnSortObject.java new file mode 100644 index 00000000000..479f5cfc536 --- /dev/null +++ b/src/main/java/com/datadog/api/client/v1/model/ColumnSortObject.java @@ -0,0 +1,175 @@ +/* + * 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.v1.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.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** Sort object */ +@JsonPropertyOrder({ColumnSortObject.JSON_PROPERTY_COUNT, ColumnSortObject.JSON_PROPERTY_ORDER_BY}) +@jakarta.annotation.Generated( + value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator") +public class ColumnSortObject { + @JsonIgnore public boolean unparsed = false; + public static final String JSON_PROPERTY_COUNT = "count"; + private Double count; + + public static final String JSON_PROPERTY_ORDER_BY = "order_by"; + private List orderBy = null; + + public ColumnSortObject count(Double count) { + this.count = count; + return this; + } + + /** + * Limit number of items displayed + * + * @return count + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_COUNT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Double getCount() { + return count; + } + + public void setCount(Double count) { + this.count = count; + } + + public ColumnSortObject orderBy(List orderBy) { + this.orderBy = orderBy; + for (ColumnOrderObject item : orderBy) { + this.unparsed |= item.unparsed; + } + return this; + } + + public ColumnSortObject addOrderByItem(ColumnOrderObject orderByItem) { + if (this.orderBy == null) { + this.orderBy = new ArrayList<>(); + } + this.orderBy.add(orderByItem); + this.unparsed |= orderByItem.unparsed; + return this; + } + + /** + * Order criteria + * + * @return orderBy + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ORDER_BY) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getOrderBy() { + return orderBy; + } + + public void setOrderBy(List orderBy) { + this.orderBy = orderBy; + } + + /** + * 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 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 ColumnSortObject + */ + @JsonAnySetter + public ColumnSortObject putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + * + * @return The additional properties + */ + @JsonAnyGetter + public Map 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 ColumnSortObject object is equal to o. */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ColumnSortObject columnSortObject = (ColumnSortObject) o; + return Objects.equals(this.count, columnSortObject.count) + && Objects.equals(this.orderBy, columnSortObject.orderBy) + && Objects.equals(this.additionalProperties, columnSortObject.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(count, orderBy, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ColumnSortObject {\n"); + sb.append(" count: ").append(toIndentedString(count)).append("\n"); + sb.append(" orderBy: ").append(toIndentedString(orderBy)).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 "); + } +} diff --git a/src/main/java/com/datadog/api/client/v1/model/QueryValueWidgetRequest.java b/src/main/java/com/datadog/api/client/v1/model/QueryValueWidgetRequest.java index cf3b17286aa..1dde8936046 100644 --- a/src/main/java/com/datadog/api/client/v1/model/QueryValueWidgetRequest.java +++ b/src/main/java/com/datadog/api/client/v1/model/QueryValueWidgetRequest.java @@ -34,7 +34,8 @@ QueryValueWidgetRequest.JSON_PROPERTY_QUERIES, QueryValueWidgetRequest.JSON_PROPERTY_RESPONSE_FORMAT, QueryValueWidgetRequest.JSON_PROPERTY_RUM_QUERY, - QueryValueWidgetRequest.JSON_PROPERTY_SECURITY_QUERY + QueryValueWidgetRequest.JSON_PROPERTY_SECURITY_QUERY, + QueryValueWidgetRequest.JSON_PROPERTY_SORT }) @jakarta.annotation.Generated( value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator") @@ -85,6 +86,9 @@ public class QueryValueWidgetRequest { public static final String JSON_PROPERTY_SECURITY_QUERY = "security_query"; private LogQueryDefinition securityQuery; + public static final String JSON_PROPERTY_SORT = "sort"; + private ColumnSortObject sort; + public QueryValueWidgetRequest aggregator(WidgetAggregator aggregator) { this.aggregator = aggregator; this.unparsed |= !aggregator.isValid(); @@ -456,6 +460,28 @@ public void setSecurityQuery(LogQueryDefinition securityQuery) { this.securityQuery = securityQuery; } + public QueryValueWidgetRequest sort(ColumnSortObject sort) { + this.sort = sort; + this.unparsed |= sort.unparsed; + return this; + } + + /** + * Sort object + * + * @return sort + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_SORT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public ColumnSortObject getSort() { + return sort; + } + + public void setSort(ColumnSortObject sort) { + this.sort = sort; + } + /** * A container for additional, undeclared properties. This is a holder for any undeclared * properties as specified with the 'additionalProperties' keyword in the OAS document. @@ -527,6 +553,7 @@ public boolean equals(Object o) { && Objects.equals(this.responseFormat, queryValueWidgetRequest.responseFormat) && Objects.equals(this.rumQuery, queryValueWidgetRequest.rumQuery) && Objects.equals(this.securityQuery, queryValueWidgetRequest.securityQuery) + && Objects.equals(this.sort, queryValueWidgetRequest.sort) && Objects.equals(this.additionalProperties, queryValueWidgetRequest.additionalProperties); } @@ -548,6 +575,7 @@ public int hashCode() { responseFormat, rumQuery, securityQuery, + sort, additionalProperties); } @@ -572,6 +600,7 @@ public String toString() { sb.append(" responseFormat: ").append(toIndentedString(responseFormat)).append("\n"); sb.append(" rumQuery: ").append(toIndentedString(rumQuery)).append("\n"); sb.append(" securityQuery: ").append(toIndentedString(securityQuery)).append("\n"); + sb.append(" sort: ").append(toIndentedString(sort)).append("\n"); sb.append(" additionalProperties: ") .append(toIndentedString(additionalProperties)) .append("\n");