Regenerate client from commit 16f60a8 of spec repo

Author: ci.datadog-api-spec

.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:

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(

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(