Apply review comments

Author: przemekwitek

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/cat/RestCatDataFrameAnalyticsAction.java

@@ -92,13 +92,17 @@ private static Table getTableWithHeader() {
             .startHeaders()
             // DFA config info
             .addCell("id", TableColumnAttributeBuilder.builder("the id").build())
+            .addCell("type",
+                TableColumnAttributeBuilder.builder("analysis type")
+                    .setAliases("t")
+                    .build())
             .addCell("create_time",
                 TableColumnAttributeBuilder.builder("job creation time")
                     .setAliases("ct", "createTime")
                     .build())
-            .addCell("type",
-                TableColumnAttributeBuilder.builder("analysis type")
-                    .setAliases("t")
+            .addCell("version",
+                TableColumnAttributeBuilder.builder("the version of Elasticsearch when the analytics was created", false)
+                    .setAliases("v")
                     .build())
             .addCell("source_index",
                 TableColumnAttributeBuilder.builder("source index", false)
@@ -164,8 +168,9 @@ private static Table buildTable(GetDataFrameAnalyticsAction.Response getResponse
             table
                 .startRow()
                 .addCell(config.getId())
-                .addCell(config.getCreateTime())
                 .addCell(config.getAnalysis().getWriteableName())
+                .addCell(config.getCreateTime())
+                .addCell(config.getVersion())
                 .addCell(String.join(",", config.getSource().getIndex()))
                 .addCell(config.getDest().getIndex())
                 .addCell(config.getDescription())

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/data_frame_analytics_cat_apis.yml

@@ -46,8 +46,8 @@ setup:
         id: dfa-outlier-detection-job
   - match:
       $body: |
-        / #id                               create_time type                  state
-        ^ (dfa\-outlier\-detection\-job \s+ [^\s]+ \s+  outlier_detection \s+ stopped \n)+  $/
+        / #id                               type                  create_time state
+        ^ (dfa\-outlier\-detection\-job \s+ outlier_detection \s+ [^\s]+ \s+  stopped \n)+  $/
 
 ---
 "Test cat data frame analytics single job with header":
@@ -57,8 +57,8 @@ setup:
         v: true
   - match:
       $body: |
-        /^  id                           \s+ create_time \s+ type              \s+ state   \n
-           (dfa\-outlier\-detection\-job \s+ [^\s]+      \s+ outlier_detection \s+ stopped \n)+  $/
+        /^  id                           \s+ type              \s+ create_time \s+ state   \n
+           (dfa\-outlier\-detection\-job \s+ outlier_detection \s+ [^\s]+      \s+ stopped \n)+  $/
 
 ---
 "Test cat data frame analytics all jobs with header":
@@ -67,10 +67,10 @@ setup:
         v: true
   - match:
       $body: |
-        /^  id                           \s+ create_time \s+ type              \s+ state   \n
-           (dfa\-classification\-job     \s+ [^\s]+      \s+ classification    \s+ stopped \n)+
-           (dfa\-outlier\-detection\-job \s+ [^\s]+      \s+ outlier_detection \s+ stopped \n)+
-           (dfa\-regression\-job         \s+ [^\s]+      \s+ regression        \s+ stopped \n)+  $/
+        /^  id                           \s+ type              \s+ create_time \s+ state   \n
+           (dfa\-classification\-job     \s+ classification    \s+ [^\s]+      \s+ stopped \n)+
+           (dfa\-outlier\-detection\-job \s+ outlier_detection \s+ [^\s]+      \s+ stopped \n)+
+           (dfa\-regression\-job         \s+ regression        \s+ [^\s]+      \s+ stopped \n)+  $/
 
 ---
 "Test cat data frame analytics all jobs with header and column selection":