diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml index 715f38f30c7..d971b72fbfb 100644 --- a/.generator/schemas/v1/openapi.yaml +++ b/.generator/schemas/v1/openapi.yaml @@ -7845,12 +7845,6 @@ components: x-enum-varnames: - DRAFT - PUBLISHED - MonitorFormulaAndFunctionAggregateAugmentQuery: - description: Augment query for aggregate augmented queries. Can be an events - query or a reference table query. - oneOf: - - $ref: '#/components/schemas/MonitorFormulaAndFunctionEventQueryDefinition' - - $ref: '#/components/schemas/MonitorFormulaAndFunctionReferenceTableQueryDefinition' MonitorFormulaAndFunctionAggregateAugmentedDataSource: description: Data source for aggregate augmented queries. enum: @@ -7865,7 +7859,9 @@ components: base query results with data from a reference table. properties: augment_query: - $ref: '#/components/schemas/MonitorFormulaAndFunctionAggregateAugmentQuery' + $ref: '#/components/schemas/MonitorFormulaAndFunctionAggregateSubQuery' + description: Augment query for aggregate augmented queries. Can be an events + query or a reference table query. base_query: $ref: '#/components/schemas/MonitorFormulaAndFunctionAggregateBaseQuery' compute: @@ -7901,12 +7897,6 @@ components: oneOf: - $ref: '#/components/schemas/MonitorFormulaAndFunctionEventQueryDefinition' - $ref: '#/components/schemas/MonitorFormulaAndFunctionMetricsQueryDefinition' - MonitorFormulaAndFunctionAggregateFilterQuery: - description: Filter query for aggregate filtered queries. Can be an events query - or a reference table query. - oneOf: - - $ref: '#/components/schemas/MonitorFormulaAndFunctionEventQueryDefinition' - - $ref: '#/components/schemas/MonitorFormulaAndFunctionReferenceTableQueryDefinition' MonitorFormulaAndFunctionAggregateFilteredDataSource: description: Data source for aggregate filtered queries. enum: @@ -7930,7 +7920,9 @@ components: data_source: $ref: '#/components/schemas/MonitorFormulaAndFunctionAggregateFilteredDataSource' filter_query: - $ref: '#/components/schemas/MonitorFormulaAndFunctionAggregateFilterQuery' + $ref: '#/components/schemas/MonitorFormulaAndFunctionAggregateSubQuery' + description: Filter query for aggregate filtered queries. Can be an events + query or a reference table query. filters: description: Filter conditions for the query. items: @@ -8000,6 +7992,12 @@ components: x-enum-varnames: - INNER - LEFT + MonitorFormulaAndFunctionAggregateSubQuery: + description: Sub-query for aggregate composite queries (augmented or filtered). + Can be an events query or a reference table query. + oneOf: + - $ref: '#/components/schemas/MonitorFormulaAndFunctionEventQueryDefinition' + - $ref: '#/components/schemas/MonitorFormulaAndFunctionReferenceTableQueryDefinition' MonitorFormulaAndFunctionCostAggregator: description: Aggregation methods for metric queries. enum: diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index 7c5de28af80..7ae721a4124 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -102212,6 +102212,13 @@ paths: get: description: Get the list of all critical assets. operationId: ListSecurityMonitoringCriticalAssets + parameters: + - description: Query string. + in: query + name: query + required: false + schema: + type: string responses: '200': content: diff --git a/examples/v1/monitors/CreateMonitor_2082938111.java b/examples/v1/monitors/CreateMonitor_2082938111.java index 79a5a5a54d1..328d36cf768 100644 --- a/examples/v1/monitors/CreateMonitor_2082938111.java +++ b/examples/v1/monitors/CreateMonitor_2082938111.java @@ -5,10 +5,10 @@ import com.datadog.api.client.v1.api.MonitorsApi; import com.datadog.api.client.v1.model.Monitor; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionAggregateBaseQuery; -import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionAggregateFilterQuery; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionAggregateFilteredDataSource; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionAggregateFilteredQueryDefinition; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionAggregateQueryFilter; +import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionAggregateSubQuery; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionMetricsDataSource; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionMetricsQueryDefinition; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionQueryDefinition; @@ -55,7 +55,7 @@ public static void main(String[] args) { "max:container.cpu.usage{*} by" + " {kube_cluster_name}.rollup(max)"))) .filterQuery( - new MonitorFormulaAndFunctionAggregateFilterQuery( + new MonitorFormulaAndFunctionAggregateSubQuery( new MonitorFormulaAndFunctionReferenceTableQueryDefinition() .name("filter_query") .dataSource( diff --git a/examples/v1/monitors/CreateMonitor_2608995690.java b/examples/v1/monitors/CreateMonitor_2608995690.java index 979e2964c6a..843a0d60654 100644 --- a/examples/v1/monitors/CreateMonitor_2608995690.java +++ b/examples/v1/monitors/CreateMonitor_2608995690.java @@ -4,12 +4,12 @@ import com.datadog.api.client.ApiException; import com.datadog.api.client.v1.api.MonitorsApi; import com.datadog.api.client.v1.model.Monitor; -import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionAggregateAugmentQuery; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionAggregateAugmentedDataSource; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionAggregateAugmentedQueryDefinition; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionAggregateBaseQuery; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionAggregateQueryJoinCondition; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionAggregateQueryJoinType; +import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionAggregateSubQuery; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionEventAggregation; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionEventQueryDefinitionCompute; import com.datadog.api.client.v1.model.MonitorFormulaAndFunctionEventQueryGroupBy; @@ -62,7 +62,7 @@ public static void main(String[] args) { .aggregation( MonitorFormulaAndFunctionEventAggregation.MAX))) .augmentQuery( - new MonitorFormulaAndFunctionAggregateAugmentQuery( + new MonitorFormulaAndFunctionAggregateSubQuery( new MonitorFormulaAndFunctionReferenceTableQueryDefinition() .name("filter_query") .dataSource( diff --git a/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionAggregateAugmentQuery.java b/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionAggregateAugmentQuery.java deleted file mode 100644 index 33cc116868a..00000000000 --- a/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionAggregateAugmentQuery.java +++ /dev/null @@ -1,331 +0,0 @@ -/* - * 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.AbstractOpenApiSchema; -import com.datadog.api.client.JSON; -import com.datadog.api.client.UnparsedObject; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.MapperFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.deser.std.StdDeserializer; -import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import jakarta.ws.rs.core.GenericType; -import java.io.IOException; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - -@jakarta.annotation.Generated( - value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator") -@JsonDeserialize( - using = - MonitorFormulaAndFunctionAggregateAugmentQuery - .MonitorFormulaAndFunctionAggregateAugmentQueryDeserializer.class) -@JsonSerialize( - using = - MonitorFormulaAndFunctionAggregateAugmentQuery - .MonitorFormulaAndFunctionAggregateAugmentQuerySerializer.class) -public class MonitorFormulaAndFunctionAggregateAugmentQuery extends AbstractOpenApiSchema { - private static final Logger log = - Logger.getLogger(MonitorFormulaAndFunctionAggregateAugmentQuery.class.getName()); - - @JsonIgnore public boolean unparsed = false; - - public static class MonitorFormulaAndFunctionAggregateAugmentQuerySerializer - extends StdSerializer { - public MonitorFormulaAndFunctionAggregateAugmentQuerySerializer( - Class t) { - super(t); - } - - public MonitorFormulaAndFunctionAggregateAugmentQuerySerializer() { - this(null); - } - - @Override - public void serialize( - MonitorFormulaAndFunctionAggregateAugmentQuery value, - JsonGenerator jgen, - SerializerProvider provider) - throws IOException, JsonProcessingException { - jgen.writeObject(value.getActualInstance()); - } - } - - public static class MonitorFormulaAndFunctionAggregateAugmentQueryDeserializer - extends StdDeserializer { - public MonitorFormulaAndFunctionAggregateAugmentQueryDeserializer() { - this(MonitorFormulaAndFunctionAggregateAugmentQuery.class); - } - - public MonitorFormulaAndFunctionAggregateAugmentQueryDeserializer(Class vc) { - super(vc); - } - - @Override - public MonitorFormulaAndFunctionAggregateAugmentQuery deserialize( - JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { - JsonNode tree = jp.readValueAsTree(); - Object deserialized = null; - Object tmp = null; - boolean typeCoercion = ctxt.isEnabled(MapperFeature.ALLOW_COERCION_OF_SCALARS); - int match = 0; - JsonToken token = tree.traverse(jp.getCodec()).nextToken(); - // deserialize MonitorFormulaAndFunctionEventQueryDefinition - try { - boolean attemptParsing = true; - // ensure that we respect type coercion as set on the client ObjectMapper - if (MonitorFormulaAndFunctionEventQueryDefinition.class.equals(Integer.class) - || MonitorFormulaAndFunctionEventQueryDefinition.class.equals(Long.class) - || MonitorFormulaAndFunctionEventQueryDefinition.class.equals(Float.class) - || MonitorFormulaAndFunctionEventQueryDefinition.class.equals(Double.class) - || MonitorFormulaAndFunctionEventQueryDefinition.class.equals(Boolean.class) - || MonitorFormulaAndFunctionEventQueryDefinition.class.equals(String.class)) { - attemptParsing = typeCoercion; - if (!attemptParsing) { - attemptParsing |= - ((MonitorFormulaAndFunctionEventQueryDefinition.class.equals(Integer.class) - || MonitorFormulaAndFunctionEventQueryDefinition.class.equals(Long.class)) - && token == JsonToken.VALUE_NUMBER_INT); - attemptParsing |= - ((MonitorFormulaAndFunctionEventQueryDefinition.class.equals(Float.class) - || MonitorFormulaAndFunctionEventQueryDefinition.class.equals(Double.class)) - && (token == JsonToken.VALUE_NUMBER_FLOAT - || token == JsonToken.VALUE_NUMBER_INT)); - attemptParsing |= - (MonitorFormulaAndFunctionEventQueryDefinition.class.equals(Boolean.class) - && (token == JsonToken.VALUE_FALSE || token == JsonToken.VALUE_TRUE)); - attemptParsing |= - (MonitorFormulaAndFunctionEventQueryDefinition.class.equals(String.class) - && token == JsonToken.VALUE_STRING); - } - } - if (attemptParsing) { - tmp = - tree.traverse(jp.getCodec()) - .readValueAs(MonitorFormulaAndFunctionEventQueryDefinition.class); - // TODO: there is no validation against JSON schema constraints - // (min, max, enum, pattern...), this does not perform a strict JSON - // validation, which means the 'match' count may be higher than it should be. - if (!((MonitorFormulaAndFunctionEventQueryDefinition) tmp).unparsed) { - deserialized = tmp; - match++; - } - log.log( - Level.FINER, - "Input data matches schema 'MonitorFormulaAndFunctionEventQueryDefinition'"); - } - } catch (Exception e) { - // deserialization failed, continue - log.log( - Level.FINER, - "Input data does not match schema 'MonitorFormulaAndFunctionEventQueryDefinition'", - e); - } - - // deserialize MonitorFormulaAndFunctionReferenceTableQueryDefinition - try { - boolean attemptParsing = true; - // ensure that we respect type coercion as set on the client ObjectMapper - if (MonitorFormulaAndFunctionReferenceTableQueryDefinition.class.equals(Integer.class) - || MonitorFormulaAndFunctionReferenceTableQueryDefinition.class.equals(Long.class) - || MonitorFormulaAndFunctionReferenceTableQueryDefinition.class.equals(Float.class) - || MonitorFormulaAndFunctionReferenceTableQueryDefinition.class.equals(Double.class) - || MonitorFormulaAndFunctionReferenceTableQueryDefinition.class.equals(Boolean.class) - || MonitorFormulaAndFunctionReferenceTableQueryDefinition.class.equals(String.class)) { - attemptParsing = typeCoercion; - if (!attemptParsing) { - attemptParsing |= - ((MonitorFormulaAndFunctionReferenceTableQueryDefinition.class.equals(Integer.class) - || MonitorFormulaAndFunctionReferenceTableQueryDefinition.class.equals( - Long.class)) - && token == JsonToken.VALUE_NUMBER_INT); - attemptParsing |= - ((MonitorFormulaAndFunctionReferenceTableQueryDefinition.class.equals(Float.class) - || MonitorFormulaAndFunctionReferenceTableQueryDefinition.class.equals( - Double.class)) - && (token == JsonToken.VALUE_NUMBER_FLOAT - || token == JsonToken.VALUE_NUMBER_INT)); - attemptParsing |= - (MonitorFormulaAndFunctionReferenceTableQueryDefinition.class.equals(Boolean.class) - && (token == JsonToken.VALUE_FALSE || token == JsonToken.VALUE_TRUE)); - attemptParsing |= - (MonitorFormulaAndFunctionReferenceTableQueryDefinition.class.equals(String.class) - && token == JsonToken.VALUE_STRING); - } - } - if (attemptParsing) { - tmp = - tree.traverse(jp.getCodec()) - .readValueAs(MonitorFormulaAndFunctionReferenceTableQueryDefinition.class); - // TODO: there is no validation against JSON schema constraints - // (min, max, enum, pattern...), this does not perform a strict JSON - // validation, which means the 'match' count may be higher than it should be. - if (!((MonitorFormulaAndFunctionReferenceTableQueryDefinition) tmp).unparsed) { - deserialized = tmp; - match++; - } - log.log( - Level.FINER, - "Input data matches schema 'MonitorFormulaAndFunctionReferenceTableQueryDefinition'"); - } - } catch (Exception e) { - // deserialization failed, continue - log.log( - Level.FINER, - "Input data does not match schema" - + " 'MonitorFormulaAndFunctionReferenceTableQueryDefinition'", - e); - } - - MonitorFormulaAndFunctionAggregateAugmentQuery ret = - new MonitorFormulaAndFunctionAggregateAugmentQuery(); - if (match == 1) { - ret.setActualInstance(deserialized); - } else { - Map res = - new ObjectMapper() - .readValue( - tree.traverse(jp.getCodec()).readValueAsTree().toString(), - new TypeReference>() {}); - ret.setActualInstance(new UnparsedObject(res)); - } - return ret; - } - - /** Handle deserialization of the 'null' value. */ - @Override - public MonitorFormulaAndFunctionAggregateAugmentQuery getNullValue(DeserializationContext ctxt) - throws JsonMappingException { - throw new JsonMappingException( - ctxt.getParser(), "MonitorFormulaAndFunctionAggregateAugmentQuery cannot be null"); - } - } - - // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); - - public MonitorFormulaAndFunctionAggregateAugmentQuery() { - super("oneOf", Boolean.FALSE); - } - - public MonitorFormulaAndFunctionAggregateAugmentQuery( - MonitorFormulaAndFunctionEventQueryDefinition o) { - super("oneOf", Boolean.FALSE); - setActualInstance(o); - } - - public MonitorFormulaAndFunctionAggregateAugmentQuery( - MonitorFormulaAndFunctionReferenceTableQueryDefinition o) { - super("oneOf", Boolean.FALSE); - setActualInstance(o); - } - - static { - schemas.put( - "MonitorFormulaAndFunctionEventQueryDefinition", - new GenericType() {}); - schemas.put( - "MonitorFormulaAndFunctionReferenceTableQueryDefinition", - new GenericType() {}); - JSON.registerDescendants( - MonitorFormulaAndFunctionAggregateAugmentQuery.class, Collections.unmodifiableMap(schemas)); - } - - @Override - public Map getSchemas() { - return MonitorFormulaAndFunctionAggregateAugmentQuery.schemas; - } - - /** - * Set the instance that matches the oneOf child schema, check the instance parameter is valid - * against the oneOf child schemas: MonitorFormulaAndFunctionEventQueryDefinition, - * MonitorFormulaAndFunctionReferenceTableQueryDefinition - * - *

It could be an instance of the 'oneOf' schemas. The oneOf child schemas may themselves be a - * composed schema (allOf, anyOf, oneOf). - */ - @Override - public void setActualInstance(Object instance) { - if (JSON.isInstanceOf( - MonitorFormulaAndFunctionEventQueryDefinition.class, instance, new HashSet>())) { - super.setActualInstance(instance); - return; - } - if (JSON.isInstanceOf( - MonitorFormulaAndFunctionReferenceTableQueryDefinition.class, - instance, - new HashSet>())) { - super.setActualInstance(instance); - return; - } - - if (JSON.isInstanceOf(UnparsedObject.class, instance, new HashSet>())) { - super.setActualInstance(instance); - return; - } - throw new RuntimeException( - "Invalid instance type. Must be MonitorFormulaAndFunctionEventQueryDefinition," - + " MonitorFormulaAndFunctionReferenceTableQueryDefinition"); - } - - /** - * Get the actual instance, which can be the following: - * MonitorFormulaAndFunctionEventQueryDefinition, - * MonitorFormulaAndFunctionReferenceTableQueryDefinition - * - * @return The actual instance (MonitorFormulaAndFunctionEventQueryDefinition, - * MonitorFormulaAndFunctionReferenceTableQueryDefinition) - */ - @Override - public Object getActualInstance() { - return super.getActualInstance(); - } - - /** - * Get the actual instance of `MonitorFormulaAndFunctionEventQueryDefinition`. If the actual - * instance is not `MonitorFormulaAndFunctionEventQueryDefinition`, the ClassCastException will be - * thrown. - * - * @return The actual instance of `MonitorFormulaAndFunctionEventQueryDefinition` - * @throws ClassCastException if the instance is not - * `MonitorFormulaAndFunctionEventQueryDefinition` - */ - public MonitorFormulaAndFunctionEventQueryDefinition - getMonitorFormulaAndFunctionEventQueryDefinition() throws ClassCastException { - return (MonitorFormulaAndFunctionEventQueryDefinition) super.getActualInstance(); - } - - /** - * Get the actual instance of `MonitorFormulaAndFunctionReferenceTableQueryDefinition`. If the - * actual instance is not `MonitorFormulaAndFunctionReferenceTableQueryDefinition`, the - * ClassCastException will be thrown. - * - * @return The actual instance of `MonitorFormulaAndFunctionReferenceTableQueryDefinition` - * @throws ClassCastException if the instance is not - * `MonitorFormulaAndFunctionReferenceTableQueryDefinition` - */ - public MonitorFormulaAndFunctionReferenceTableQueryDefinition - getMonitorFormulaAndFunctionReferenceTableQueryDefinition() throws ClassCastException { - return (MonitorFormulaAndFunctionReferenceTableQueryDefinition) super.getActualInstance(); - } -} diff --git a/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionAggregateAugmentedQueryDefinition.java b/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionAggregateAugmentedQueryDefinition.java index 04b4e6d33a0..bbcc1ed9fc9 100644 --- a/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionAggregateAugmentedQueryDefinition.java +++ b/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionAggregateAugmentedQueryDefinition.java @@ -33,7 +33,7 @@ public class MonitorFormulaAndFunctionAggregateAugmentedQueryDefinition { @JsonIgnore public boolean unparsed = false; public static final String JSON_PROPERTY_AUGMENT_QUERY = "augment_query"; - private MonitorFormulaAndFunctionAggregateAugmentQuery augmentQuery; + private MonitorFormulaAndFunctionAggregateSubQuery augmentQuery; public static final String JSON_PROPERTY_BASE_QUERY = "base_query"; private MonitorFormulaAndFunctionAggregateBaseQuery baseQuery; @@ -58,7 +58,7 @@ public MonitorFormulaAndFunctionAggregateAugmentedQueryDefinition() {} @JsonCreator public MonitorFormulaAndFunctionAggregateAugmentedQueryDefinition( @JsonProperty(required = true, value = JSON_PROPERTY_AUGMENT_QUERY) - MonitorFormulaAndFunctionAggregateAugmentQuery augmentQuery, + MonitorFormulaAndFunctionAggregateSubQuery augmentQuery, @JsonProperty(required = true, value = JSON_PROPERTY_BASE_QUERY) MonitorFormulaAndFunctionAggregateBaseQuery baseQuery, @JsonProperty(required = true, value = JSON_PROPERTY_COMPUTE) @@ -82,25 +82,25 @@ public MonitorFormulaAndFunctionAggregateAugmentedQueryDefinition( } public MonitorFormulaAndFunctionAggregateAugmentedQueryDefinition augmentQuery( - MonitorFormulaAndFunctionAggregateAugmentQuery augmentQuery) { + MonitorFormulaAndFunctionAggregateSubQuery augmentQuery) { this.augmentQuery = augmentQuery; this.unparsed |= augmentQuery.unparsed; return this; } /** - * Augment query for aggregate augmented queries. Can be an events query or a reference table - * query. + * Sub-query for aggregate composite queries (augmented or filtered). Can be an events query or a + * reference table query. * * @return augmentQuery */ @JsonProperty(JSON_PROPERTY_AUGMENT_QUERY) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public MonitorFormulaAndFunctionAggregateAugmentQuery getAugmentQuery() { + public MonitorFormulaAndFunctionAggregateSubQuery getAugmentQuery() { return augmentQuery; } - public void setAugmentQuery(MonitorFormulaAndFunctionAggregateAugmentQuery augmentQuery) { + public void setAugmentQuery(MonitorFormulaAndFunctionAggregateSubQuery augmentQuery) { this.augmentQuery = augmentQuery; } diff --git a/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionAggregateFilteredQueryDefinition.java b/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionAggregateFilteredQueryDefinition.java index 8626b952400..8cb3334a6f3 100644 --- a/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionAggregateFilteredQueryDefinition.java +++ b/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionAggregateFilteredQueryDefinition.java @@ -42,7 +42,7 @@ public class MonitorFormulaAndFunctionAggregateFilteredQueryDefinition { private MonitorFormulaAndFunctionAggregateFilteredDataSource dataSource; public static final String JSON_PROPERTY_FILTER_QUERY = "filter_query"; - private MonitorFormulaAndFunctionAggregateFilterQuery filterQuery; + private MonitorFormulaAndFunctionAggregateSubQuery filterQuery; public static final String JSON_PROPERTY_FILTERS = "filters"; private List filters = new ArrayList<>(); @@ -62,7 +62,7 @@ public MonitorFormulaAndFunctionAggregateFilteredQueryDefinition( @JsonProperty(required = true, value = JSON_PROPERTY_DATA_SOURCE) MonitorFormulaAndFunctionAggregateFilteredDataSource dataSource, @JsonProperty(required = true, value = JSON_PROPERTY_FILTER_QUERY) - MonitorFormulaAndFunctionAggregateFilterQuery filterQuery, + MonitorFormulaAndFunctionAggregateSubQuery filterQuery, @JsonProperty(required = true, value = JSON_PROPERTY_FILTERS) List filters) { this.baseQuery = baseQuery; @@ -157,24 +157,25 @@ public void setDataSource(MonitorFormulaAndFunctionAggregateFilteredDataSource d } public MonitorFormulaAndFunctionAggregateFilteredQueryDefinition filterQuery( - MonitorFormulaAndFunctionAggregateFilterQuery filterQuery) { + MonitorFormulaAndFunctionAggregateSubQuery filterQuery) { this.filterQuery = filterQuery; this.unparsed |= filterQuery.unparsed; return this; } /** - * Filter query for aggregate filtered queries. Can be an events query or a reference table query. + * Sub-query for aggregate composite queries (augmented or filtered). Can be an events query or a + * reference table query. * * @return filterQuery */ @JsonProperty(JSON_PROPERTY_FILTER_QUERY) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public MonitorFormulaAndFunctionAggregateFilterQuery getFilterQuery() { + public MonitorFormulaAndFunctionAggregateSubQuery getFilterQuery() { return filterQuery; } - public void setFilterQuery(MonitorFormulaAndFunctionAggregateFilterQuery filterQuery) { + public void setFilterQuery(MonitorFormulaAndFunctionAggregateSubQuery filterQuery) { this.filterQuery = filterQuery; } diff --git a/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionAggregateFilterQuery.java b/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionAggregateSubQuery.java similarity index 87% rename from src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionAggregateFilterQuery.java rename to src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionAggregateSubQuery.java index b919a5a08a4..1118b78782d 100644 --- a/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionAggregateFilterQuery.java +++ b/src/main/java/com/datadog/api/client/v1/model/MonitorFormulaAndFunctionAggregateSubQuery.java @@ -38,32 +38,32 @@ value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator") @JsonDeserialize( using = - MonitorFormulaAndFunctionAggregateFilterQuery - .MonitorFormulaAndFunctionAggregateFilterQueryDeserializer.class) + MonitorFormulaAndFunctionAggregateSubQuery + .MonitorFormulaAndFunctionAggregateSubQueryDeserializer.class) @JsonSerialize( using = - MonitorFormulaAndFunctionAggregateFilterQuery - .MonitorFormulaAndFunctionAggregateFilterQuerySerializer.class) -public class MonitorFormulaAndFunctionAggregateFilterQuery extends AbstractOpenApiSchema { + MonitorFormulaAndFunctionAggregateSubQuery + .MonitorFormulaAndFunctionAggregateSubQuerySerializer.class) +public class MonitorFormulaAndFunctionAggregateSubQuery extends AbstractOpenApiSchema { private static final Logger log = - Logger.getLogger(MonitorFormulaAndFunctionAggregateFilterQuery.class.getName()); + Logger.getLogger(MonitorFormulaAndFunctionAggregateSubQuery.class.getName()); @JsonIgnore public boolean unparsed = false; - public static class MonitorFormulaAndFunctionAggregateFilterQuerySerializer - extends StdSerializer { - public MonitorFormulaAndFunctionAggregateFilterQuerySerializer( - Class t) { + public static class MonitorFormulaAndFunctionAggregateSubQuerySerializer + extends StdSerializer { + public MonitorFormulaAndFunctionAggregateSubQuerySerializer( + Class t) { super(t); } - public MonitorFormulaAndFunctionAggregateFilterQuerySerializer() { + public MonitorFormulaAndFunctionAggregateSubQuerySerializer() { this(null); } @Override public void serialize( - MonitorFormulaAndFunctionAggregateFilterQuery value, + MonitorFormulaAndFunctionAggregateSubQuery value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException { @@ -71,18 +71,18 @@ public void serialize( } } - public static class MonitorFormulaAndFunctionAggregateFilterQueryDeserializer - extends StdDeserializer { - public MonitorFormulaAndFunctionAggregateFilterQueryDeserializer() { - this(MonitorFormulaAndFunctionAggregateFilterQuery.class); + public static class MonitorFormulaAndFunctionAggregateSubQueryDeserializer + extends StdDeserializer { + public MonitorFormulaAndFunctionAggregateSubQueryDeserializer() { + this(MonitorFormulaAndFunctionAggregateSubQuery.class); } - public MonitorFormulaAndFunctionAggregateFilterQueryDeserializer(Class vc) { + public MonitorFormulaAndFunctionAggregateSubQueryDeserializer(Class vc) { super(vc); } @Override - public MonitorFormulaAndFunctionAggregateFilterQuery deserialize( + public MonitorFormulaAndFunctionAggregateSubQuery deserialize( JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { JsonNode tree = jp.readValueAsTree(); Object deserialized = null; @@ -197,8 +197,8 @@ public MonitorFormulaAndFunctionAggregateFilterQuery deserialize( e); } - MonitorFormulaAndFunctionAggregateFilterQuery ret = - new MonitorFormulaAndFunctionAggregateFilterQuery(); + MonitorFormulaAndFunctionAggregateSubQuery ret = + new MonitorFormulaAndFunctionAggregateSubQuery(); if (match == 1) { ret.setActualInstance(deserialized); } else { @@ -214,27 +214,27 @@ public MonitorFormulaAndFunctionAggregateFilterQuery deserialize( /** Handle deserialization of the 'null' value. */ @Override - public MonitorFormulaAndFunctionAggregateFilterQuery getNullValue(DeserializationContext ctxt) + public MonitorFormulaAndFunctionAggregateSubQuery getNullValue(DeserializationContext ctxt) throws JsonMappingException { throw new JsonMappingException( - ctxt.getParser(), "MonitorFormulaAndFunctionAggregateFilterQuery cannot be null"); + ctxt.getParser(), "MonitorFormulaAndFunctionAggregateSubQuery cannot be null"); } } // store a list of schema names defined in oneOf public static final Map schemas = new HashMap(); - public MonitorFormulaAndFunctionAggregateFilterQuery() { + public MonitorFormulaAndFunctionAggregateSubQuery() { super("oneOf", Boolean.FALSE); } - public MonitorFormulaAndFunctionAggregateFilterQuery( + public MonitorFormulaAndFunctionAggregateSubQuery( MonitorFormulaAndFunctionEventQueryDefinition o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public MonitorFormulaAndFunctionAggregateFilterQuery( + public MonitorFormulaAndFunctionAggregateSubQuery( MonitorFormulaAndFunctionReferenceTableQueryDefinition o) { super("oneOf", Boolean.FALSE); setActualInstance(o); @@ -248,12 +248,12 @@ public MonitorFormulaAndFunctionAggregateFilterQuery( "MonitorFormulaAndFunctionReferenceTableQueryDefinition", new GenericType() {}); JSON.registerDescendants( - MonitorFormulaAndFunctionAggregateFilterQuery.class, Collections.unmodifiableMap(schemas)); + MonitorFormulaAndFunctionAggregateSubQuery.class, Collections.unmodifiableMap(schemas)); } @Override public Map getSchemas() { - return MonitorFormulaAndFunctionAggregateFilterQuery.schemas; + return MonitorFormulaAndFunctionAggregateSubQuery.schemas; } /** diff --git a/src/main/java/com/datadog/api/client/v2/api/SecurityMonitoringApi.java b/src/main/java/com/datadog/api/client/v2/api/SecurityMonitoringApi.java index 6ea7df0811d..1d8927d8442 100644 --- a/src/main/java/com/datadog/api/client/v2/api/SecurityMonitoringApi.java +++ b/src/main/java/com/datadog/api/client/v2/api/SecurityMonitoringApi.java @@ -10087,6 +10087,22 @@ public ApiResponse listSecurityFindingsWithHttpInf new GenericType() {}); } + /** Manage optional parameters to listSecurityMonitoringCriticalAssets. */ + public static class ListSecurityMonitoringCriticalAssetsOptionalParameters { + private String query; + + /** + * Set query. + * + * @param query Query string. (optional) + * @return ListSecurityMonitoringCriticalAssetsOptionalParameters + */ + public ListSecurityMonitoringCriticalAssetsOptionalParameters query(String query) { + this.query = query; + return this; + } + } + /** * Get all critical assets. * @@ -10097,7 +10113,9 @@ public ApiResponse listSecurityFindingsWithHttpInf */ public SecurityMonitoringCriticalAssetsResponse listSecurityMonitoringCriticalAssets() throws ApiException { - return listSecurityMonitoringCriticalAssetsWithHttpInfo().getData(); + return listSecurityMonitoringCriticalAssetsWithHttpInfo( + new ListSecurityMonitoringCriticalAssetsOptionalParameters()) + .getData(); } /** @@ -10109,7 +10127,40 @@ public SecurityMonitoringCriticalAssetsResponse listSecurityMonitoringCriticalAs */ public CompletableFuture listSecurityMonitoringCriticalAssetsAsync() { - return listSecurityMonitoringCriticalAssetsWithHttpInfoAsync() + return listSecurityMonitoringCriticalAssetsWithHttpInfoAsync( + new ListSecurityMonitoringCriticalAssetsOptionalParameters()) + .thenApply( + response -> { + return response.getData(); + }); + } + + /** + * Get all critical assets. + * + *

See {@link #listSecurityMonitoringCriticalAssetsWithHttpInfo}. + * + * @param parameters Optional parameters for the request. + * @return SecurityMonitoringCriticalAssetsResponse + * @throws ApiException if fails to make API call + */ + public SecurityMonitoringCriticalAssetsResponse listSecurityMonitoringCriticalAssets( + ListSecurityMonitoringCriticalAssetsOptionalParameters parameters) throws ApiException { + return listSecurityMonitoringCriticalAssetsWithHttpInfo(parameters).getData(); + } + + /** + * Get all critical assets. + * + *

See {@link #listSecurityMonitoringCriticalAssetsWithHttpInfoAsync}. + * + * @param parameters Optional parameters for the request. + * @return CompletableFuture<SecurityMonitoringCriticalAssetsResponse> + */ + public CompletableFuture + listSecurityMonitoringCriticalAssetsAsync( + ListSecurityMonitoringCriticalAssetsOptionalParameters parameters) { + return listSecurityMonitoringCriticalAssetsWithHttpInfoAsync(parameters) .thenApply( response -> { return response.getData(); @@ -10119,6 +10170,7 @@ public SecurityMonitoringCriticalAssetsResponse listSecurityMonitoringCriticalAs /** * Get the list of all critical assets. * + * @param parameters Optional parameters for the request. * @return ApiResponse<SecurityMonitoringCriticalAssetsResponse> * @throws ApiException if fails to make API call * @http.response.details @@ -10131,18 +10183,23 @@ public SecurityMonitoringCriticalAssetsResponse listSecurityMonitoringCriticalAs * */ public ApiResponse - listSecurityMonitoringCriticalAssetsWithHttpInfo() throws ApiException { + listSecurityMonitoringCriticalAssetsWithHttpInfo( + ListSecurityMonitoringCriticalAssetsOptionalParameters parameters) throws ApiException { Object localVarPostBody = null; + String query = parameters.query; // create path and map variables String localVarPath = "/api/v2/security_monitoring/configuration/critical_assets"; + List localVarQueryParams = new ArrayList(); Map localVarHeaderParams = new HashMap(); + localVarQueryParams.addAll(apiClient.parameterToPairs("", "query", query)); + Invocation.Builder builder = apiClient.createBuilder( "v2.SecurityMonitoringApi.listSecurityMonitoringCriticalAssets", localVarPath, - new ArrayList(), + localVarQueryParams, localVarHeaderParams, new HashMap(), new String[] {"application/json"}, @@ -10163,23 +10220,29 @@ public SecurityMonitoringCriticalAssetsResponse listSecurityMonitoringCriticalAs * *

See {@link #listSecurityMonitoringCriticalAssetsWithHttpInfo}. * + * @param parameters Optional parameters for the request. * @return CompletableFuture<ApiResponse<SecurityMonitoringCriticalAssetsResponse>> */ public CompletableFuture> - listSecurityMonitoringCriticalAssetsWithHttpInfoAsync() { + listSecurityMonitoringCriticalAssetsWithHttpInfoAsync( + ListSecurityMonitoringCriticalAssetsOptionalParameters parameters) { Object localVarPostBody = null; + String query = parameters.query; // create path and map variables String localVarPath = "/api/v2/security_monitoring/configuration/critical_assets"; + List localVarQueryParams = new ArrayList(); Map localVarHeaderParams = new HashMap(); + localVarQueryParams.addAll(apiClient.parameterToPairs("", "query", query)); + Invocation.Builder builder; try { builder = apiClient.createBuilder( "v2.SecurityMonitoringApi.listSecurityMonitoringCriticalAssets", localVarPath, - new ArrayList(), + localVarQueryParams, localVarHeaderParams, new HashMap(), new String[] {"application/json"},