Remove mobile device ids and make all device ids simple string

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-11-19 21:12:12.431997",
-            "spec_repo_commit": "2e48953d"
+            "regenerated": "2024-11-20 20:14:20.566230",
+            "spec_repo_commit": "ebf27b5e"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-11-19 21:12:12.451025",
-            "spec_repo_commit": "2e48953d"
+            "regenerated": "2024-11-20 20:14:20.584628",
+            "spec_repo_commit": "ebf27b5e"
         }
     }
 }

.generator/schemas/v1/openapi.yaml

@@ -15178,34 +15178,8 @@ components:
       type: object
     SyntheticsDeviceID:
       description: The device ID.
-      enum:
-      - laptop_large
-      - tablet
-      - mobile_small
-      - chrome.laptop_large
-      - chrome.tablet
-      - chrome.mobile_small
-      - firefox.laptop_large
-      - firefox.tablet
-      - firefox.mobile_small
-      - edge.laptop_large
-      - edge.tablet
-      - edge.mobile_small
       example: chrome.laptop_large
       type: string
-      x-enum-varnames:
-      - LAPTOP_LARGE
-      - TABLET
-      - MOBILE_SMALL
-      - CHROME_LAPTOP_LARGE
-      - CHROME_TABLET
-      - CHROME_MOBILE_SMALL
-      - FIREFOX_LAPTOP_LARGE
-      - FIREFOX_TABLET
-      - FIREFOX_MOBILE_SMALL
-      - EDGE_LAPTOP_LARGE
-      - EDGE_TABLET
-      - EDGE_MOBILE_SMALL
     SyntheticsFetchUptimesPayload:
       description: Object containing IDs of Synthetic tests and a timeframe.
       properties:
@@ -15508,10 +15482,6 @@ components:
             $ref: '#/components/schemas/SyntheticsLocation'
           type: array
       type: object
-    SyntheticsMobileDeviceID:
-      description: The device ID.
-      example: synthetics:mobile:device:apple_ipad_10th_gen_2022_ios_16
-      type: string
     SyntheticsMobileStep:
       description: The steps used in a Synthetic mobile test.
       properties:
@@ -15787,7 +15757,7 @@ components:
         device_ids:
           description: Array with the different device IDs used to run the test.
           items:
-            $ref: '#/components/schemas/SyntheticsMobileDeviceID'
+            $ref: '#/components/schemas/SyntheticsDeviceID'
           type: array
         message:
           description: Notification message associated with the test.
@@ -15876,7 +15846,7 @@ components:
           example:
           - synthetics:mobile:device:apple_ipad_10th_gen_2022_ios_16
           items:
-            $ref: '#/components/schemas/SyntheticsMobileDeviceID'
+            $ref: '#/components/schemas/SyntheticsDeviceID'
           type: array
         disableAutoAcceptAlert:
           description: A boolean to disable auto accepting alerts.

examples/v1/synthetics/CreateSyntheticsAPITest.java

@@ -11,7 +11,6 @@
 import com.datadog.api.client.v1.model.SyntheticsAssertionTarget;
 import com.datadog.api.client.v1.model.SyntheticsAssertionType;
 import com.datadog.api.client.v1.model.SyntheticsBrowserTestRumSettings;
-import com.datadog.api.client.v1.model.SyntheticsDeviceID;
 import com.datadog.api.client.v1.model.SyntheticsTestCiOptions;
 import com.datadog.api.client.v1.model.SyntheticsTestDetailsSubType;
 import com.datadog.api.client.v1.model.SyntheticsTestExecutionRule;
@@ -52,7 +51,7 @@ public static void main(String[] args) {
                     .ci(
                         new SyntheticsTestCiOptions()
                             .executionRule(SyntheticsTestExecutionRule.BLOCKING))
-                    .deviceIds(Collections.singletonList(SyntheticsDeviceID.CHROME_LAPTOP_LARGE))
+                    .deviceIds(Collections.singletonList("chrome.laptop_large"))
                     .httpVersion(SyntheticsTestOptionsHTTPVersion.HTTP1)
                     .monitorOptions(
                         new SyntheticsTestOptionsMonitorOptions()

examples/v1/synthetics/CreateSyntheticsBrowserTest.java

@@ -10,7 +10,6 @@
 import com.datadog.api.client.v1.model.SyntheticsBrowserVariableType;
 import com.datadog.api.client.v1.model.SyntheticsConfigVariable;
 import com.datadog.api.client.v1.model.SyntheticsConfigVariableType;
-import com.datadog.api.client.v1.model.SyntheticsDeviceID;
 import com.datadog.api.client.v1.model.SyntheticsStep;
 import com.datadog.api.client.v1.model.SyntheticsStepType;
 import com.datadog.api.client.v1.model.SyntheticsTestOptions;
@@ -52,7 +51,7 @@ public static void main(String[] args) {
                 new SyntheticsTestOptions()
                     .acceptSelfSigned(false)
                     .allowInsecure(true)
-                    .deviceIds(Collections.singletonList(SyntheticsDeviceID.CHROME_LAPTOP_LARGE))
+                    .deviceIds(Collections.singletonList("chrome.laptop_large"))
                     .disableCors(true)
                     .followRedirects(true)
                     .minFailureDuration(10L)

examples/v1/synthetics/CreateSyntheticsBrowserTest_2932742688.java

@@ -9,7 +9,6 @@
 import com.datadog.api.client.v1.model.SyntheticsBrowserTestType;
 import com.datadog.api.client.v1.model.SyntheticsConfigVariable;
 import com.datadog.api.client.v1.model.SyntheticsConfigVariableType;
-import com.datadog.api.client.v1.model.SyntheticsDeviceID;
 import com.datadog.api.client.v1.model.SyntheticsStep;
 import com.datadog.api.client.v1.model.SyntheticsStepType;
 import com.datadog.api.client.v1.model.SyntheticsTestCiOptions;
@@ -48,7 +47,7 @@ public static void main(String[] args) {
                 new SyntheticsTestOptions()
                     .acceptSelfSigned(false)
                     .allowInsecure(true)
-                    .deviceIds(Collections.singletonList(SyntheticsDeviceID.TABLET))
+                    .deviceIds(Collections.singletonList("tablet"))
                     .disableCors(true)
                     .followRedirects(true)
                     .minFailureDuration(10L)

examples/v1/synthetics/CreateSyntheticsBrowserTest_397420811.java

@@ -9,7 +9,6 @@
 import com.datadog.api.client.v1.model.SyntheticsBrowserTestType;
 import com.datadog.api.client.v1.model.SyntheticsConfigVariable;
 import com.datadog.api.client.v1.model.SyntheticsConfigVariableType;
-import com.datadog.api.client.v1.model.SyntheticsDeviceID;
 import com.datadog.api.client.v1.model.SyntheticsStep;
 import com.datadog.api.client.v1.model.SyntheticsStepType;
 import com.datadog.api.client.v1.model.SyntheticsTestOptions;
@@ -45,7 +44,7 @@ public static void main(String[] args) {
                 new SyntheticsTestOptions()
                     .acceptSelfSigned(false)
                     .allowInsecure(true)
-                    .deviceIds(Collections.singletonList(SyntheticsDeviceID.TABLET))
+                    .deviceIds(Collections.singletonList("tablet"))
                     .disableCors(true)
                     .followRedirects(true)
                     .minFailureDuration(10L)

examples/v1/synthetics/TriggerCITests.java

@@ -13,7 +13,6 @@
 import com.datadog.api.client.v1.model.SyntheticsCIBatchMetadataProvider;
 import com.datadog.api.client.v1.model.SyntheticsCITest;
 import com.datadog.api.client.v1.model.SyntheticsCITestBody;
-import com.datadog.api.client.v1.model.SyntheticsDeviceID;
 import com.datadog.api.client.v1.model.SyntheticsTestOptionsRetry;
 import com.datadog.api.client.v1.model.SyntheticsTriggerCITestsResponse;
 import java.util.Collections;
@@ -34,8 +33,7 @@ public static void main(String[] args) {
                                     .password("PaSSw0RD!")
                                     .type(SyntheticsBasicAuthWebType.WEB)
                                     .username("my_username")))
-                        .deviceIds(
-                            Collections.singletonList(SyntheticsDeviceID.CHROME_LAPTOP_LARGE))
+                        .deviceIds(Collections.singletonList("chrome.laptop_large"))
                         .locations(Collections.singletonList("aws:eu-west-3"))
                         .metadata(
                             new SyntheticsCIBatchMetadata()

examples/v1/synthetics/UpdateBrowserTest.java

@@ -14,7 +14,6 @@
 import com.datadog.api.client.v1.model.SyntheticsBrowserVariableType;
 import com.datadog.api.client.v1.model.SyntheticsConfigVariable;
 import com.datadog.api.client.v1.model.SyntheticsConfigVariableType;
-import com.datadog.api.client.v1.model.SyntheticsDeviceID;
 import com.datadog.api.client.v1.model.SyntheticsStep;
 import com.datadog.api.client.v1.model.SyntheticsStepType;
 import com.datadog.api.client.v1.model.SyntheticsTestCallType;
@@ -84,7 +83,7 @@ public static void main(String[] args) {
                     .ci(
                         new SyntheticsTestCiOptions()
                             .executionRule(SyntheticsTestExecutionRule.BLOCKING))
-                    .deviceIds(Collections.singletonList(SyntheticsDeviceID.CHROME_LAPTOP_LARGE))
+                    .deviceIds(Collections.singletonList("chrome.laptop_large"))
                     .httpVersion(SyntheticsTestOptionsHTTPVersion.HTTP1)
                     .monitorOptions(
                         new SyntheticsTestOptionsMonitorOptions()

src/main/java/com/datadog/api/client/v1/model/SyntheticsBatchResult.java

@@ -34,7 +34,7 @@
 public class SyntheticsBatchResult {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_DEVICE = "device";
-  private SyntheticsDeviceID device;
+  private String device;
 
   public static final String JSON_PROPERTY_DURATION = "duration";
   private Double duration;
@@ -63,9 +63,8 @@ public class SyntheticsBatchResult {
   public static final String JSON_PROPERTY_TEST_TYPE = "test_type";
   private SyntheticsTestDetailsType testType;
 
-  public SyntheticsBatchResult device(SyntheticsDeviceID device) {
+  public SyntheticsBatchResult device(String device) {
     this.device = device;
-    this.unparsed |= !device.isValid();
     return this;
   }
 
@@ -77,14 +76,11 @@ public SyntheticsBatchResult device(SyntheticsDeviceID device) {
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DEVICE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public SyntheticsDeviceID getDevice() {
+  public String getDevice() {
     return device;
   }
 
-  public void setDevice(SyntheticsDeviceID device) {
-    if (!device.isValid()) {
-      this.unparsed = true;
-    }
+  public void setDevice(String device) {
     this.device = device;
   }
 

src/main/java/com/datadog/api/client/v1/model/SyntheticsCITest.java

@@ -57,7 +57,7 @@ public class SyntheticsCITest {
   private String cookies;
 
   public static final String JSON_PROPERTY_DEVICE_IDS = "deviceIds";
-  private List<SyntheticsDeviceID> deviceIds = null;
+  private List<String> deviceIds = null;
 
   public static final String JSON_PROPERTY_FOLLOW_REDIRECTS = "followRedirects";
   private Boolean followRedirects;
@@ -197,17 +197,16 @@ public void setCookies(String cookies) {
     this.cookies = cookies;
   }
 
-  public SyntheticsCITest deviceIds(List<SyntheticsDeviceID> deviceIds) {
+  public SyntheticsCITest deviceIds(List<String> deviceIds) {
     this.deviceIds = deviceIds;
     return this;
   }
 
-  public SyntheticsCITest addDeviceIdsItem(SyntheticsDeviceID deviceIdsItem) {
+  public SyntheticsCITest addDeviceIdsItem(String deviceIdsItem) {
     if (this.deviceIds == null) {
       this.deviceIds = new ArrayList<>();
     }
     this.deviceIds.add(deviceIdsItem);
-    this.unparsed |= !deviceIdsItem.isValid();
     return this;
   }
 
@@ -219,11 +218,11 @@ public SyntheticsCITest addDeviceIdsItem(SyntheticsDeviceID deviceIdsItem) {
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DEVICE_IDS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public List<SyntheticsDeviceID> getDeviceIds() {
+  public List<String> getDeviceIds() {
     return deviceIds;
   }
 
-  public void setDeviceIds(List<SyntheticsDeviceID> deviceIds) {
+  public void setDeviceIds(List<String> deviceIds) {
     this.deviceIds = deviceIds;
   }
 

src/main/java/com/datadog/api/client/v1/model/SyntheticsDevice.java

@@ -33,7 +33,7 @@ public class SyntheticsDevice {
   private Long height;
 
   public static final String JSON_PROPERTY_ID = "id";
-  private SyntheticsDeviceID id;
+  private String id;
 
   public static final String JSON_PROPERTY_IS_MOBILE = "isMobile";
   private Boolean isMobile;
@@ -49,12 +49,11 @@ public SyntheticsDevice() {}
   @JsonCreator
   public SyntheticsDevice(
       @JsonProperty(required = true, value = JSON_PROPERTY_HEIGHT) Long height,
-      @JsonProperty(required = true, value = JSON_PROPERTY_ID) SyntheticsDeviceID id,
+      @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
       @JsonProperty(required = true, value = JSON_PROPERTY_NAME) String name,
       @JsonProperty(required = true, value = JSON_PROPERTY_WIDTH) Long width) {
     this.height = height;
     this.id = id;
-    this.unparsed |= !id.isValid();
     this.name = name;
     this.width = width;
   }
@@ -79,9 +78,8 @@ public void setHeight(Long height) {
     this.height = height;
   }
 
-  public SyntheticsDevice id(SyntheticsDeviceID id) {
+  public SyntheticsDevice id(String id) {
     this.id = id;
-    this.unparsed |= !id.isValid();
     return this;
   }
 
@@ -92,14 +90,11 @@ public SyntheticsDevice id(SyntheticsDeviceID id) {
    */
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public SyntheticsDeviceID getId() {
+  public String getId() {
     return id;
   }
 
-  public void setId(SyntheticsDeviceID id) {
-    if (!id.isValid()) {
-      this.unparsed = true;
-    }
+  public void setId(String id) {
     this.id = id;
   }