Remove user fields that are unsupported by the Incidents API (#2512)

Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>

Author: api-clients-generation-pipeline[bot]

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-10-02 20:42:58.523618",
-            "spec_repo_commit": "76b7b19d"
+            "regenerated": "2024-10-03 13:53:46.307323",
+            "spec_repo_commit": "2c46d95c"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-10-02 20:42:58.538507",
-            "spec_repo_commit": "76b7b19d"
+            "regenerated": "2024-10-03 13:53:46.321725",
+            "spec_repo_commit": "2c46d95c"
         }
     }
 }

.generator/schemas/v2/openapi.yaml

@@ -10930,7 +10930,7 @@ components:
     IncidentResponseIncludedItem:
       description: An object related to an incident that is included in the response.
       oneOf:
-      - $ref: '#/components/schemas/User'
+      - $ref: '#/components/schemas/IncidentUserData'
       - $ref: '#/components/schemas/IncidentAttachmentData'
     IncidentResponseMeta:
       description: The metadata object containing pagination metadata.
@@ -11869,6 +11869,37 @@ components:
       required:
       - data
       type: object
+    IncidentUserAttributes:
+      description: Attributes of user object returned by the API.
+      properties:
+        email:
+          description: Email of the user.
+          type: string
+        handle:
+          description: Handle of the user.
+          type: string
+        icon:
+          description: URL of the user's icon.
+          type: string
+        name:
+          description: Name of the user.
+          nullable: true
+          type: string
+        uuid:
+          description: UUID of the user.
+          type: string
+      type: object
+    IncidentUserData:
+      description: User object returned by the API.
+      properties:
+        attributes:
+          $ref: '#/components/schemas/IncidentUserAttributes'
+        id:
+          description: ID of the user.
+          type: string
+        type:
+          $ref: '#/components/schemas/UsersType'
+      type: object
     IncidentUserDefinedFieldType:
       description: The incident user defined fields type.
       enum:

src/main/java/com/datadog/api/client/v2/model/IncidentResponseIncludedItem.java

@@ -81,45 +81,48 @@ public IncidentResponseIncludedItem deserialize(JsonParser jp, DeserializationCo
       boolean typeCoercion = ctxt.isEnabled(MapperFeature.ALLOW_COERCION_OF_SCALARS);
       int match = 0;
       JsonToken token = tree.traverse(jp.getCodec()).nextToken();
-      // deserialize User
+      // deserialize IncidentUserData
       try {
         boolean attemptParsing = true;
         // ensure that we respect type coercion as set on the client ObjectMapper
-        if (User.class.equals(Integer.class)
-            || User.class.equals(Long.class)
-            || User.class.equals(Float.class)
-            || User.class.equals(Double.class)
-            || User.class.equals(Boolean.class)
-            || User.class.equals(String.class)) {
+        if (IncidentUserData.class.equals(Integer.class)
+            || IncidentUserData.class.equals(Long.class)
+            || IncidentUserData.class.equals(Float.class)
+            || IncidentUserData.class.equals(Double.class)
+            || IncidentUserData.class.equals(Boolean.class)
+            || IncidentUserData.class.equals(String.class)) {
           attemptParsing = typeCoercion;
           if (!attemptParsing) {
             attemptParsing |=
-                ((User.class.equals(Integer.class) || User.class.equals(Long.class))
+                ((IncidentUserData.class.equals(Integer.class)
+                        || IncidentUserData.class.equals(Long.class))
                     && token == JsonToken.VALUE_NUMBER_INT);
             attemptParsing |=
-                ((User.class.equals(Float.class) || User.class.equals(Double.class))
+                ((IncidentUserData.class.equals(Float.class)
+                        || IncidentUserData.class.equals(Double.class))
                     && (token == JsonToken.VALUE_NUMBER_FLOAT
                         || token == JsonToken.VALUE_NUMBER_INT));
             attemptParsing |=
-                (User.class.equals(Boolean.class)
+                (IncidentUserData.class.equals(Boolean.class)
                     && (token == JsonToken.VALUE_FALSE || token == JsonToken.VALUE_TRUE));
-            attemptParsing |= (User.class.equals(String.class) && token == JsonToken.VALUE_STRING);
+            attemptParsing |=
+                (IncidentUserData.class.equals(String.class) && token == JsonToken.VALUE_STRING);
           }
         }
         if (attemptParsing) {
-          tmp = tree.traverse(jp.getCodec()).readValueAs(User.class);
+          tmp = tree.traverse(jp.getCodec()).readValueAs(IncidentUserData.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 (!((User) tmp).unparsed) {
+          if (!((IncidentUserData) tmp).unparsed) {
             deserialized = tmp;
             match++;
           }
-          log.log(Level.FINER, "Input data matches schema 'User'");
+          log.log(Level.FINER, "Input data matches schema 'IncidentUserData'");
         }
       } catch (Exception e) {
         // deserialization failed, continue
-        log.log(Level.FINER, "Input data does not match schema 'User'", e);
+        log.log(Level.FINER, "Input data does not match schema 'IncidentUserData'", e);
       }
 
       // deserialize IncidentAttachmentData
@@ -197,7 +200,7 @@ public IncidentResponseIncludedItem() {
     super("oneOf", Boolean.FALSE);
   }
 
-  public IncidentResponseIncludedItem(User o) {
+  public IncidentResponseIncludedItem(IncidentUserData o) {
     super("oneOf", Boolean.FALSE);
     setActualInstance(o);
   }
@@ -208,7 +211,7 @@ public IncidentResponseIncludedItem(IncidentAttachmentData o) {
   }
 
   static {
-    schemas.put("User", new GenericType<User>() {});
+    schemas.put("IncidentUserData", new GenericType<IncidentUserData>() {});
     schemas.put("IncidentAttachmentData", new GenericType<IncidentAttachmentData>() {});
     JSON.registerDescendants(
         IncidentResponseIncludedItem.class, Collections.unmodifiableMap(schemas));
@@ -221,14 +224,14 @@ public Map<String, GenericType> getSchemas() {
 
   /**
    * Set the instance that matches the oneOf child schema, check the instance parameter is valid
-   * against the oneOf child schemas: User, IncidentAttachmentData
+   * against the oneOf child schemas: IncidentUserData, IncidentAttachmentData
    *
    * <p>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(User.class, instance, new HashSet<Class<?>>())) {
+    if (JSON.isInstanceOf(IncidentUserData.class, instance, new HashSet<Class<?>>())) {
       super.setActualInstance(instance);
       return;
     }
@@ -241,28 +244,29 @@ public void setActualInstance(Object instance) {
       super.setActualInstance(instance);
       return;
     }
-    throw new RuntimeException("Invalid instance type. Must be User, IncidentAttachmentData");
+    throw new RuntimeException(
+        "Invalid instance type. Must be IncidentUserData, IncidentAttachmentData");
   }
 
   /**
-   * Get the actual instance, which can be the following: User, IncidentAttachmentData
+   * Get the actual instance, which can be the following: IncidentUserData, IncidentAttachmentData
    *
-   * @return The actual instance (User, IncidentAttachmentData)
+   * @return The actual instance (IncidentUserData, IncidentAttachmentData)
    */
   @Override
   public Object getActualInstance() {
     return super.getActualInstance();
   }
 
   /**
-   * Get the actual instance of `User`. If the actual instance is not `User`, the ClassCastException
-   * will be thrown.
+   * Get the actual instance of `IncidentUserData`. If the actual instance is not
+   * `IncidentUserData`, the ClassCastException will be thrown.
    *
-   * @return The actual instance of `User`
-   * @throws ClassCastException if the instance is not `User`
+   * @return The actual instance of `IncidentUserData`
+   * @throws ClassCastException if the instance is not `IncidentUserData`
    */
-  public User getUser() throws ClassCastException {
-    return (User) super.getActualInstance();
+  public IncidentUserData getIncidentUserData() throws ClassCastException {
+    return (IncidentUserData) super.getActualInstance();
   }
 
   /**