diff --git a/.apigentools-info b/.apigentools-info index c17c3e06bdf..ab6cf9c3902 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.6.6", - "regenerated": "2025-04-03 16:27:59.649576", - "spec_repo_commit": "4468962d" + "regenerated": "2025-04-03 20:27:30.299485", + "spec_repo_commit": "17df409e" }, "v2": { "apigentools_version": "1.6.6", - "regenerated": "2025-04-03 16:27:59.666584", - "spec_repo_commit": "4468962d" + "regenerated": "2025-04-03 20:27:30.315269", + "spec_repo_commit": "17df409e" } } } \ No newline at end of file diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml index a0c142ac78b..365c00f50ca 100644 --- a/.generator/schemas/v1/openapi.yaml +++ b/.generator/schemas/v1/openapi.yaml @@ -1623,10 +1623,7 @@ components: - - 0.5 - 1.0 items: - description: List of distribution point. - oneOf: - - $ref: '#/components/schemas/DistributionPointTimestamp' - - $ref: '#/components/schemas/DistributionPointData' + $ref: '#/components/schemas/DistributionPointItems' maxItems: 2 minItems: 2 type: array @@ -1637,6 +1634,11 @@ components: format: double type: number type: array + DistributionPointItems: + description: List of distribution point. + oneOf: + - $ref: '#/components/schemas/DistributionPointTimestamp' + - $ref: '#/components/schemas/DistributionPointData' DistributionPointTimestamp: description: Distribution point timestamp. It should be in seconds and current. format: double diff --git a/examples/v1/metrics/SubmitDistributionPoints.java b/examples/v1/metrics/SubmitDistributionPoints.java index da2bd223f2a..9cc81c53eb3 100644 --- a/examples/v1/metrics/SubmitDistributionPoints.java +++ b/examples/v1/metrics/SubmitDistributionPoints.java @@ -1,34 +1,33 @@ // Submit distribution points returns "Payload accepted" response -import com.datadog.api.client.ApiClient; +import java.time.OffsetDateTime; + import com.datadog.api.client.ApiException; +import com.datadog.api.client.ApiClient; import com.datadog.api.client.v1.api.MetricsApi; -import com.datadog.api.client.v1.model.DistributionPointItem; +import com.datadog.api.client.v1.model.IntakePayloadAccepted; +import com.datadog.api.client.v1.model.DistributionPointItems; import com.datadog.api.client.v1.model.DistributionPointsPayload; import com.datadog.api.client.v1.model.DistributionPointsSeries; -import com.datadog.api.client.v1.model.IntakePayloadAccepted; +import com.datadog.api.client.v1.model.DistributionPointTimestamp; +import com.datadog.api.client.v1.model.List; +import java.io.File; import java.time.OffsetDateTime; import java.util.Arrays; import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.UUID; public class Example { public static void main(String[] args) { ApiClient defaultClient = ApiClient.getDefaultApiClient(); MetricsApi apiInstance = new MetricsApi(defaultClient); - DistributionPointsPayload body = - new DistributionPointsPayload() - .series( - Collections.singletonList( - new DistributionPointsSeries() - .metric("system.load.1.dist") - .points( - Collections.singletonList( - Arrays.asList( - new DistributionPointItem( - Long.valueOf( - OffsetDateTime.now().toInstant().getEpochSecond()) - .doubleValue()), - new DistributionPointItem(Arrays.asList(1.0, 2.0))))))); + DistributionPointsPayload body = new DistributionPointsPayload() +.series(Collections.singletonList(new DistributionPointsSeries() +.metric("system.load.1.dist") +.points(Collections.singletonList(Arrays.asList(new DistributionPointItems( +Long.valueOf(OffsetDateTime.now().toInstant().getEpochSecond()).doubleValue()), new List(Arrays.asList(1.0, 2.0))))))); try { IntakePayloadAccepted result = apiInstance.submitDistributionPoints(body); @@ -41,4 +40,4 @@ public static void main(String[] args) { e.printStackTrace(); } } -} +} \ No newline at end of file diff --git a/examples/v1/metrics/SubmitDistributionPoints_3109558960.java b/examples/v1/metrics/SubmitDistributionPoints_3109558960.java index 53f40374a84..d3e000f6b57 100644 --- a/examples/v1/metrics/SubmitDistributionPoints_3109558960.java +++ b/examples/v1/metrics/SubmitDistributionPoints_3109558960.java @@ -1,43 +1,38 @@ // Submit deflate distribution points returns "Payload accepted" response -import com.datadog.api.client.ApiClient; +import java.time.OffsetDateTime; + import com.datadog.api.client.ApiException; +import com.datadog.api.client.ApiClient; import com.datadog.api.client.v1.api.MetricsApi; import com.datadog.api.client.v1.api.MetricsApi.SubmitDistributionPointsOptionalParameters; -import com.datadog.api.client.v1.model.DistributionPointItem; +import com.datadog.api.client.v1.model.IntakePayloadAccepted; +import com.datadog.api.client.v1.model.DistributionPointItems; import com.datadog.api.client.v1.model.DistributionPointsContentEncoding; import com.datadog.api.client.v1.model.DistributionPointsPayload; import com.datadog.api.client.v1.model.DistributionPointsSeries; -import com.datadog.api.client.v1.model.IntakePayloadAccepted; +import com.datadog.api.client.v1.model.DistributionPointTimestamp; +import com.datadog.api.client.v1.model.List; +import java.io.File; import java.time.OffsetDateTime; import java.util.Arrays; import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.UUID; public class Example { public static void main(String[] args) { ApiClient defaultClient = ApiClient.getDefaultApiClient(); MetricsApi apiInstance = new MetricsApi(defaultClient); - DistributionPointsPayload body = - new DistributionPointsPayload() - .series( - Collections.singletonList( - new DistributionPointsSeries() - .metric("system.load.1.dist") - .points( - Collections.singletonList( - Arrays.asList( - new DistributionPointItem( - Long.valueOf( - OffsetDateTime.now().toInstant().getEpochSecond()) - .doubleValue()), - new DistributionPointItem(Arrays.asList(1.0, 2.0))))))); + DistributionPointsPayload body = new DistributionPointsPayload() +.series(Collections.singletonList(new DistributionPointsSeries() +.metric("system.load.1.dist") +.points(Collections.singletonList(Arrays.asList(new DistributionPointItems( +Long.valueOf(OffsetDateTime.now().toInstant().getEpochSecond()).doubleValue()), new List(Arrays.asList(1.0, 2.0))))))); try { - IntakePayloadAccepted result = - apiInstance.submitDistributionPoints( - body, - new SubmitDistributionPointsOptionalParameters() - .contentEncoding(DistributionPointsContentEncoding.DEFLATE)); + IntakePayloadAccepted result = apiInstance.submitDistributionPoints(body,new SubmitDistributionPointsOptionalParameters().contentEncoding(DistributionPointsContentEncoding.DEFLATE)); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling MetricsApi#submitDistributionPoints"); @@ -47,4 +42,4 @@ public static void main(String[] args) { e.printStackTrace(); } } -} +} \ No newline at end of file diff --git a/src/main/java/com/datadog/api/client/v1/model/DistributionPointItem.java b/src/main/java/com/datadog/api/client/v1/model/DistributionPointItems.java similarity index 86% rename from src/main/java/com/datadog/api/client/v1/model/DistributionPointItem.java rename to src/main/java/com/datadog/api/client/v1/model/DistributionPointItems.java index bf1a993de93..1ec59737d67 100644 --- a/src/main/java/com/datadog/api/client/v1/model/DistributionPointItem.java +++ b/src/main/java/com/datadog/api/client/v1/model/DistributionPointItems.java @@ -37,42 +37,43 @@ @jakarta.annotation.Generated( value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator") -@JsonDeserialize(using = DistributionPointItem.DistributionPointItemDeserializer.class) -@JsonSerialize(using = DistributionPointItem.DistributionPointItemSerializer.class) -public class DistributionPointItem extends AbstractOpenApiSchema { - private static final Logger log = Logger.getLogger(DistributionPointItem.class.getName()); +@JsonDeserialize(using = DistributionPointItems.DistributionPointItemsDeserializer.class) +@JsonSerialize(using = DistributionPointItems.DistributionPointItemsSerializer.class) +public class DistributionPointItems extends AbstractOpenApiSchema { + private static final Logger log = Logger.getLogger(DistributionPointItems.class.getName()); @JsonIgnore public boolean unparsed = false; - public static class DistributionPointItemSerializer extends StdSerializer { - public DistributionPointItemSerializer(Class t) { + public static class DistributionPointItemsSerializer + extends StdSerializer { + public DistributionPointItemsSerializer(Class t) { super(t); } - public DistributionPointItemSerializer() { + public DistributionPointItemsSerializer() { this(null); } @Override public void serialize( - DistributionPointItem value, JsonGenerator jgen, SerializerProvider provider) + DistributionPointItems value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException { jgen.writeObject(value.getActualInstance()); } } - public static class DistributionPointItemDeserializer - extends StdDeserializer { - public DistributionPointItemDeserializer() { - this(DistributionPointItem.class); + public static class DistributionPointItemsDeserializer + extends StdDeserializer { + public DistributionPointItemsDeserializer() { + this(DistributionPointItems.class); } - public DistributionPointItemDeserializer(Class vc) { + public DistributionPointItemsDeserializer(Class vc) { super(vc); } @Override - public DistributionPointItem deserialize(JsonParser jp, DeserializationContext ctxt) + public DistributionPointItems deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { JsonNode tree = jp.readValueAsTree(); Object deserialized = null; @@ -161,7 +162,7 @@ public DistributionPointItem deserialize(JsonParser jp, DeserializationContext c log.log(Level.FINER, "Input data does not match schema 'List'", e); } - DistributionPointItem ret = new DistributionPointItem(); + DistributionPointItems ret = new DistributionPointItems(); if (match == 1) { ret.setActualInstance(deserialized); } else { @@ -177,25 +178,25 @@ public DistributionPointItem deserialize(JsonParser jp, DeserializationContext c /** Handle deserialization of the 'null' value. */ @Override - public DistributionPointItem getNullValue(DeserializationContext ctxt) + public DistributionPointItems getNullValue(DeserializationContext ctxt) throws JsonMappingException { - throw new JsonMappingException(ctxt.getParser(), "DistributionPointItem cannot be null"); + throw new JsonMappingException(ctxt.getParser(), "DistributionPointItems cannot be null"); } } // store a list of schema names defined in oneOf public static final Map schemas = new HashMap(); - public DistributionPointItem() { + public DistributionPointItems() { super("oneOf", Boolean.FALSE); } - public DistributionPointItem(Double o) { + public DistributionPointItems(Double o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public DistributionPointItem(List o) { + public DistributionPointItems(List o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } @@ -203,12 +204,12 @@ public DistributionPointItem(List o) { static { schemas.put("Double", new GenericType() {}); schemas.put("List", new GenericType>() {}); - JSON.registerDescendants(DistributionPointItem.class, Collections.unmodifiableMap(schemas)); + JSON.registerDescendants(DistributionPointItems.class, Collections.unmodifiableMap(schemas)); } @Override public Map getSchemas() { - return DistributionPointItem.schemas; + return DistributionPointItems.schemas; } /** diff --git a/src/main/java/com/datadog/api/client/v1/model/DistributionPointsSeries.java b/src/main/java/com/datadog/api/client/v1/model/DistributionPointsSeries.java index e66f6fb3290..f40eaac92f5 100644 --- a/src/main/java/com/datadog/api/client/v1/model/DistributionPointsSeries.java +++ b/src/main/java/com/datadog/api/client/v1/model/DistributionPointsSeries.java @@ -38,7 +38,7 @@ public class DistributionPointsSeries { private String metric; public static final String JSON_PROPERTY_POINTS = "points"; - private List> points = new ArrayList<>(); + private List> points = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -52,7 +52,7 @@ public DistributionPointsSeries() {} public DistributionPointsSeries( @JsonProperty(required = true, value = JSON_PROPERTY_METRIC) String metric, @JsonProperty(required = true, value = JSON_PROPERTY_POINTS) - List> points) { + List> points) { this.metric = metric; this.points = points; } @@ -98,12 +98,12 @@ public void setMetric(String metric) { this.metric = metric; } - public DistributionPointsSeries points(List> points) { + public DistributionPointsSeries points(List> points) { this.points = points; return this; } - public DistributionPointsSeries addPointsItem(List pointsItem) { + public DistributionPointsSeries addPointsItem(List pointsItem) { this.points.add(pointsItem); return this; } @@ -116,11 +116,11 @@ public DistributionPointsSeries addPointsItem(List points */ @JsonProperty(JSON_PROPERTY_POINTS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public List> getPoints() { + public List> getPoints() { return points; } - public void setPoints(List> points) { + public void setPoints(List> points) { this.points = points; }