Change columns attribute type from string array to object array in APM stats query widget

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.2.0",
-            "regenerated": "2020-10-05 08:54:49.005238",
-            "spec_repo_commit": "3e66447"
+            "regenerated": "2020-10-06 08:32:16.588916",
+            "spec_repo_commit": "d9efdb7"
         },
         "v2": {
             "apigentools_version": "1.2.0",
-            "regenerated": "2020-10-05 08:54:56.063919",
-            "spec_repo_commit": "3e66447"
+            "regenerated": "2020-10-06 08:32:24.078255",
+            "spec_repo_commit": "d9efdb7"
         }
     }
 }

api_docs/v1/ApmStatsQueryColumnType.md

@@ -0,0 +1,16 @@
+
+
+# ApmStatsQueryColumnType
+
+Column properties.
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**alias** | **String** | A user-assigned alias for the column. |  [optional]
+**cellDisplayMode** | [**TableWidgetCellDisplayMode**](TableWidgetCellDisplayMode.md) |  |  [optional]
+**name** | **String** | Column name. | 
+**order** | [**WidgetSort**](WidgetSort.md) |  |  [optional]
+
+
+

api_docs/v1/ApmStatsQueryDefinition.md

@@ -7,7 +7,7 @@ The APM stats query for table and distributions widgets.
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**columns** | **List<String>** | Column names used by front end for display. |  [optional]
+**columns** | [**List<ApmStatsQueryColumnType>**](ApmStatsQueryColumnType.md) | Column properties used by the front end for display. |  [optional]
 **env** | **String** | Environment name. | 
 **name** | **String** | Operation name associated with service. | 
 **primaryTag** | **String** | The organization's host group name and value. | 

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

@@ -0,0 +1,199 @@
+/*
+ * 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.
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package com.datadog.api.v1.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
+import com.datadog.api.v1.client.model.TableWidgetCellDisplayMode;
+import com.datadog.api.v1.client.model.WidgetSort;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.datadog.api.v1.client.JSON;
+
+
+/**
+ * Column properties.
+ */
+@ApiModel(description = "Column properties.")
+@JsonPropertyOrder({
+  ApmStatsQueryColumnType.JSON_PROPERTY_ALIAS,
+  ApmStatsQueryColumnType.JSON_PROPERTY_CELL_DISPLAY_MODE,
+  ApmStatsQueryColumnType.JSON_PROPERTY_NAME,
+  ApmStatsQueryColumnType.JSON_PROPERTY_ORDER
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ApmStatsQueryColumnType {
+  public static final String JSON_PROPERTY_ALIAS = "alias";
+  private String alias;
+
+  public static final String JSON_PROPERTY_CELL_DISPLAY_MODE = "cell_display_mode";
+  private TableWidgetCellDisplayMode cellDisplayMode = TableWidgetCellDisplayMode.NUMBER;
+
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+  public static final String JSON_PROPERTY_ORDER = "order";
+  private WidgetSort order;
+
+
+  public ApmStatsQueryColumnType alias(String alias) {
+    this.alias = alias;
+    return this;
+  }
+
+   /**
+   * A user-assigned alias for the column.
+   * @return alias
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "Requests", value = "A user-assigned alias for the column.")
+  @JsonProperty(JSON_PROPERTY_ALIAS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getAlias() {
+    return alias;
+  }
+
+
+  public void setAlias(String alias) {
+    this.alias = alias;
+  }
+
+
+  public ApmStatsQueryColumnType cellDisplayMode(TableWidgetCellDisplayMode cellDisplayMode) {
+    this.cellDisplayMode = cellDisplayMode;
+    return this;
+  }
+
+   /**
+   * Get cellDisplayMode
+   * @return cellDisplayMode
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_CELL_DISPLAY_MODE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public TableWidgetCellDisplayMode getCellDisplayMode() {
+    return cellDisplayMode;
+  }
+
+
+  public void setCellDisplayMode(TableWidgetCellDisplayMode cellDisplayMode) {
+    this.cellDisplayMode = cellDisplayMode;
+  }
+
+
+  public ApmStatsQueryColumnType name(String name) {
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Column name.
+   * @return name
+  **/
+  @ApiModelProperty(example = "Reqs", required = true, value = "Column name.")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  public ApmStatsQueryColumnType order(WidgetSort order) {
+    this.order = order;
+    return this;
+  }
+
+   /**
+   * Get order
+   * @return order
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ORDER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public WidgetSort getOrder() {
+    return order;
+  }
+
+
+  public void setOrder(WidgetSort order) {
+    this.order = order;
+  }
+
+
+  /**
+   * Return true if this ApmStatsQueryColumnType object is equal to o.
+   */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ApmStatsQueryColumnType apmStatsQueryColumnType = (ApmStatsQueryColumnType) o;
+    return Objects.equals(this.alias, apmStatsQueryColumnType.alias) &&
+        Objects.equals(this.cellDisplayMode, apmStatsQueryColumnType.cellDisplayMode) &&
+        Objects.equals(this.name, apmStatsQueryColumnType.name) &&
+        Objects.equals(this.order, apmStatsQueryColumnType.order);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(alias, cellDisplayMode, name, order);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ApmStatsQueryColumnType {\n");
+    sb.append("    alias: ").append(toIndentedString(alias)).append("\n");
+    sb.append("    cellDisplayMode: ").append(toIndentedString(cellDisplayMode)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    order: ").append(toIndentedString(order)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

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

@@ -15,6 +15,7 @@
 import java.util.Arrays;
 import java.util.Map;
 import java.util.HashMap;
+import com.datadog.api.v1.client.model.ApmStatsQueryColumnType;
 import com.datadog.api.v1.client.model.ApmStatsQueryRowType;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -45,7 +46,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApmStatsQueryDefinition {
   public static final String JSON_PROPERTY_COLUMNS = "columns";
-  private List<String> columns = null;
+  private List<ApmStatsQueryColumnType> columns = null;
 
   public static final String JSON_PROPERTY_ENV = "env";
   private String env;
@@ -66,12 +67,12 @@ public class ApmStatsQueryDefinition {
   private String service;
 
 
-  public ApmStatsQueryDefinition columns(List<String> columns) {
+  public ApmStatsQueryDefinition columns(List<ApmStatsQueryColumnType> columns) {
     this.columns = columns;
     return this;
   }
 
-  public ApmStatsQueryDefinition addColumnsItem(String columnsItem) {
+  public ApmStatsQueryDefinition addColumnsItem(ApmStatsQueryColumnType columnsItem) {
     if (this.columns == null) {
       this.columns = new ArrayList<>();
     }
@@ -80,20 +81,20 @@ public ApmStatsQueryDefinition addColumnsItem(String columnsItem) {
   }
 
    /**
-   * Column names used by front end for display.
+   * Column properties used by the front end for display.
    * @return columns
   **/
   @javax.annotation.Nullable
-  @ApiModelProperty(value = "Column names used by front end for display.")
+  @ApiModelProperty(value = "Column properties used by the front end for display.")
   @JsonProperty(JSON_PROPERTY_COLUMNS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
-  public List<String> getColumns() {
+  public List<ApmStatsQueryColumnType> getColumns() {
     return columns;
   }
 
 
-  public void setColumns(List<String> columns) {
+  public void setColumns(List<ApmStatsQueryColumnType> columns) {
     this.columns = columns;
   }
 

src/main/java/com/datadog/api/v1/openapi.yaml

@@ -367,15 +367,31 @@ components:
         api_key:
           $ref: '#/components/schemas/ApiKey'
       type: object
+    ApmStatsQueryColumnType:
+      description: Column properties.
+      properties:
+        alias:
+          description: A user-assigned alias for the column.
+          example: Requests
+          type: string
+        cell_display_mode:
+          $ref: '#/components/schemas/TableWidgetCellDisplayMode'
+        name:
+          description: Column name.
+          example: Reqs
+          type: string
+        order:
+          $ref: '#/components/schemas/WidgetSort'
+      required:
+      - name
+      type: object
     ApmStatsQueryDefinition:
       description: The APM stats query for table and distributions widgets.
       properties:
         columns:
-          description: Column names used by front end for display.
+          description: Column properties used by the front end for display.
           items:
-            description: Column header.
-            example: MeanLatency
-            type: string
+            $ref: '#/components/schemas/ApmStatsQueryColumnType'
           type: array
         env:
           description: Environment name.