diff --git a/.apigentools-info b/.apigentools-info index c6cd338d9bf..b354e71b2ae 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.6.6", - "regenerated": "2025-03-17 14:53:07.738836", - "spec_repo_commit": "f73f9d61" + "regenerated": "2025-03-17 17:20:21.464212", + "spec_repo_commit": "29344bf2" }, "v2": { "apigentools_version": "1.6.6", - "regenerated": "2025-03-17 14:53:07.755443", - "spec_repo_commit": "f73f9d61" + "regenerated": "2025-03-17 17:20:21.480204", + "spec_repo_commit": "29344bf2" } } } \ No newline at end of file diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index 7bab924a46b..aa344b25b5e 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -29902,24 +29902,8 @@ components: type: object ServiceDefinitionV2Dot2Type: description: The type of service. - enum: - - web - - db - - cache - - function - - browser - - mobile - - custom example: web type: string - x-enum-varnames: - - WEB - - DB - - CACHE - - FUNCTION - - BROSWER - - MOBILE - - CUSTOM ServiceDefinitionV2Dot2Version: default: v2.2 description: Schema version being used. diff --git a/examples/v2/service-definition/CreateOrUpdateServiceDefinitions.java b/examples/v2/service-definition/CreateOrUpdateServiceDefinitions.java index 85dfc965d9a..6e8a741ccc3 100644 --- a/examples/v2/service-definition/CreateOrUpdateServiceDefinitions.java +++ b/examples/v2/service-definition/CreateOrUpdateServiceDefinitions.java @@ -11,7 +11,6 @@ import com.datadog.api.client.v2.model.ServiceDefinitionV2Dot2Opsgenie; import com.datadog.api.client.v2.model.ServiceDefinitionV2Dot2OpsgenieRegion; import com.datadog.api.client.v2.model.ServiceDefinitionV2Dot2Pagerduty; -import com.datadog.api.client.v2.model.ServiceDefinitionV2Dot2Type; import com.datadog.api.client.v2.model.ServiceDefinitionV2Dot2Version; import com.datadog.api.client.v2.model.ServiceDefinitionsCreateRequest; import java.util.Arrays; @@ -62,7 +61,7 @@ public static void main(String[] args) { .tags(Arrays.asList("my:tag", "service:tag")) .team("my-team") .tier("High") - .type(ServiceDefinitionV2Dot2Type.WEB)); + .type("web")); try { ServiceDefinitionCreateResponse result = apiInstance.createOrUpdateServiceDefinitions(body); diff --git a/src/main/java/com/datadog/api/client/v2/model/ServiceDefinitionV2Dot2.java b/src/main/java/com/datadog/api/client/v2/model/ServiceDefinitionV2Dot2.java index b9176d5019a..81ee5221c1d 100644 --- a/src/main/java/com/datadog/api/client/v2/model/ServiceDefinitionV2Dot2.java +++ b/src/main/java/com/datadog/api/client/v2/model/ServiceDefinitionV2Dot2.java @@ -84,7 +84,7 @@ public class ServiceDefinitionV2Dot2 { private String tier; public static final String JSON_PROPERTY_TYPE = "type"; - private ServiceDefinitionV2Dot2Type type; + private String type; public ServiceDefinitionV2Dot2() {} @@ -455,9 +455,8 @@ public void setTier(String tier) { this.tier = tier; } - public ServiceDefinitionV2Dot2 type(ServiceDefinitionV2Dot2Type type) { + public ServiceDefinitionV2Dot2 type(String type) { this.type = type; - this.unparsed |= !type.isValid(); return this; } @@ -469,14 +468,11 @@ public ServiceDefinitionV2Dot2 type(ServiceDefinitionV2Dot2Type type) { @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_TYPE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public ServiceDefinitionV2Dot2Type getType() { + public String getType() { return type; } - public void setType(ServiceDefinitionV2Dot2Type type) { - if (!type.isValid()) { - this.unparsed = true; - } + public void setType(String type) { this.type = type; } diff --git a/src/main/java/com/datadog/api/client/v2/model/ServiceDefinitionV2Dot2Type.java b/src/main/java/com/datadog/api/client/v2/model/ServiceDefinitionV2Dot2Type.java deleted file mode 100644 index 8e0ba03962b..00000000000 --- a/src/main/java/com/datadog/api/client/v2/model/ServiceDefinitionV2Dot2Type.java +++ /dev/null @@ -1,67 +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.v2.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; - -/** The type of service. */ -@JsonSerialize(using = ServiceDefinitionV2Dot2Type.ServiceDefinitionV2Dot2TypeSerializer.class) -public class ServiceDefinitionV2Dot2Type extends ModelEnum { - - private static final Set allowedValues = - new HashSet( - Arrays.asList("web", "db", "cache", "function", "browser", "mobile", "custom")); - - public static final ServiceDefinitionV2Dot2Type WEB = new ServiceDefinitionV2Dot2Type("web"); - public static final ServiceDefinitionV2Dot2Type DB = new ServiceDefinitionV2Dot2Type("db"); - public static final ServiceDefinitionV2Dot2Type CACHE = new ServiceDefinitionV2Dot2Type("cache"); - public static final ServiceDefinitionV2Dot2Type FUNCTION = - new ServiceDefinitionV2Dot2Type("function"); - public static final ServiceDefinitionV2Dot2Type BROSWER = - new ServiceDefinitionV2Dot2Type("browser"); - public static final ServiceDefinitionV2Dot2Type MOBILE = - new ServiceDefinitionV2Dot2Type("mobile"); - public static final ServiceDefinitionV2Dot2Type CUSTOM = - new ServiceDefinitionV2Dot2Type("custom"); - - ServiceDefinitionV2Dot2Type(String value) { - super(value, allowedValues); - } - - public static class ServiceDefinitionV2Dot2TypeSerializer - extends StdSerializer { - public ServiceDefinitionV2Dot2TypeSerializer(Class t) { - super(t); - } - - public ServiceDefinitionV2Dot2TypeSerializer() { - this(null); - } - - @Override - public void serialize( - ServiceDefinitionV2Dot2Type value, JsonGenerator jgen, SerializerProvider provider) - throws IOException, JsonProcessingException { - jgen.writeObject(value.value); - } - } - - @JsonCreator - public static ServiceDefinitionV2Dot2Type fromValue(String value) { - return new ServiceDefinitionV2Dot2Type(value); - } -}