[ML] move find file structure to a new API endpoint

client/rest-high-level/src/test/java/org/elasticsearch/client/MachineLearningIT.java

@@ -2895,8 +2895,17 @@ public void testFindFileStructure() throws IOException {
         FindFileStructureRequest request = new FindFileStructureRequest();
         request.setSample(sample.getBytes(StandardCharsets.UTF_8));
 
-        FindFileStructureResponse response =
-            execute(request, machineLearningClient::findFileStructure, machineLearningClient::findFileStructureAsync);
+        FindFileStructureResponse response = execute(
+            request,
+            machineLearningClient::findFileStructure,
+            machineLearningClient::findFileStructureAsync,
+            RequestOptions.DEFAULT
+                .toBuilder()
+                .setWarningsHandler(
+                    warnings -> Collections.singletonList(
+                        "[POST /_ml/find_file_structure] is deprecated! Use [POST /_text_structure/find_structure] instead."
+                    ).equals(warnings) == false
+                ).build());
 
         FileStructure structure = response.getFileStructure();
 

client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MlClientDocumentationIT.java

@@ -1870,8 +1870,17 @@ public void testFindFileStructure() throws Exception {
             // end::find-file-structure-request-options
 
             // tag::find-file-structure-execute
-            FindFileStructureResponse findFileStructureResponse =
-                client.machineLearning().findFileStructure(findFileStructureRequest, RequestOptions.DEFAULT);
+            FindFileStructureResponse findFileStructureResponse = client
+                .machineLearning()
+                .findFileStructure(
+                    findFileStructureRequest,
+                    RequestOptions.DEFAULT
+                        .toBuilder()
+                        .setWarningsHandler(
+                            warnings -> Collections.singletonList(
+                                "[POST /_ml/find_file_structure] is deprecated! Use [POST /_text_structure/find_structure] instead."
+                            ).equals(warnings) == false
+                        ).build());
             // end::find-file-structure-execute
 
             // tag::find-file-structure-response

docs/reference/ml/anomaly-detection/apis/find-file-structure.asciidoc

@@ -278,6 +278,7 @@ POST _ml/find_file_structure
 {"name": "The Left Hand of Darkness", "author": "Ursula K. Le Guin", "release_date": "1969-06-01", "page_count": 304}
 {"name": "The Moon is a Harsh Mistress", "author": "Robert A. Heinlein", "release_date": "1966-04-01", "page_count": 288}
 ----
+// TEST[warning:[POST /_ml/find_file_structure] is deprecated! Use [POST /_text_structure/find_structure] instead.]
 
 If the request does not encounter errors, you receive the following result:
 

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackClientPlugin.java

@@ -90,7 +90,7 @@
 import org.elasticsearch.xpack.core.ml.action.EvaluateDataFrameAction;
 import org.elasticsearch.xpack.core.ml.action.ExplainDataFrameAnalyticsAction;
 import org.elasticsearch.xpack.core.ml.action.FinalizeJobExecutionAction;
-import org.elasticsearch.xpack.core.ml.action.FindFileStructureAction;
+import org.elasticsearch.xpack.core.textstructure.action.FindFileStructureAction;
 import org.elasticsearch.xpack.core.ml.action.FlushJobAction;
 import org.elasticsearch.xpack.core.ml.action.ForecastJobAction;
 import org.elasticsearch.xpack.core.ml.action.GetBucketsAction;
@@ -316,7 +316,6 @@ public List<ActionType<? extends ActionResponse>> getClientActions() {
             GetCalendarEventsAction.INSTANCE,
             PostCalendarEventsAction.INSTANCE,
             PersistJobAction.INSTANCE,
-            FindFileStructureAction.INSTANCE,
             SetUpgradeModeAction.INSTANCE,
             PutDataFrameAnalyticsAction.INSTANCE,
             GetDataFrameAnalyticsAction.INSTANCE,
@@ -408,7 +407,9 @@ public List<ActionType<? extends ActionResponse>> getClientActions() {
             // Async Search
             SubmitAsyncSearchAction.INSTANCE,
             GetAsyncSearchAction.INSTANCE,
-            DeleteAsyncResultAction.INSTANCE
+            DeleteAsyncResultAction.INSTANCE,
+            // Text Structure
+            FindFileStructureAction.INSTANCE
         ));
 
         // rollupV2

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureAction.java → x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/action/FindFileStructureAction.java

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.core.ml.action;
+package org.elasticsearch.xpack.core.textstructure.action;
 
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
@@ -18,7 +18,7 @@
 import org.elasticsearch.common.xcontent.StatusToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.rest.RestStatus;
-import org.elasticsearch.xpack.core.ml.filestructurefinder.FileStructure;
+import org.elasticsearch.xpack.core.textstructure.structurefinder.FileStructure;
 
 import java.io.IOException;
 import java.util.Arrays;

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/filestructurefinder/FieldStats.java → x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/structurefinder/FieldStats.java

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.core.ml.filestructurefinder;
+package org.elasticsearch.xpack.core.textstructure.structurefinder;
 
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.Strings;

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/filestructurefinder/FileStructure.java → x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/structurefinder/FileStructure.java

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.core.ml.filestructurefinder;
+package org.elasticsearch.xpack.core.textstructure.structurefinder;
 
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -25,7 +25,7 @@
 import java.util.TreeMap;
 
 /**
- * Stores the file format determined by Machine Learning.
+ * Stores the determined file format.
  */
 public class FileStructure implements ToXContentObject, Writeable {
 

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java

@@ -73,7 +73,7 @@
 import org.elasticsearch.xpack.core.ml.action.EvaluateDataFrameAction;
 import org.elasticsearch.xpack.core.ml.action.ExplainDataFrameAnalyticsAction;
 import org.elasticsearch.xpack.core.ml.action.FinalizeJobExecutionAction;
-import org.elasticsearch.xpack.core.ml.action.FindFileStructureAction;
+import org.elasticsearch.xpack.core.textstructure.action.FindFileStructureAction;
 import org.elasticsearch.xpack.core.ml.action.FlushJobAction;
 import org.elasticsearch.xpack.core.ml.action.ForecastJobAction;
 import org.elasticsearch.xpack.core.ml.action.GetBucketsAction;

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureActionRequestTests.java → x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/textstructure/action/FindFileStructureActionRequestTests.java

@@ -3,13 +3,13 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.core.ml.action;
+package org.elasticsearch.xpack.core.textstructure.action;
 
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.test.AbstractWireSerializingTestCase;
-import org.elasticsearch.xpack.core.ml.filestructurefinder.FileStructure;
+import org.elasticsearch.xpack.core.textstructure.structurefinder.FileStructure;
 
 import java.util.Arrays;
 

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureActionResponseTests.java → x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/textstructure/action/FindFileStructureActionResponseTests.java

@@ -3,11 +3,12 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.core.ml.action;
+package org.elasticsearch.xpack.core.textstructure.action;
 
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.test.AbstractWireSerializingTestCase;
-import org.elasticsearch.xpack.core.ml.filestructurefinder.FileStructureTests;
+import org.elasticsearch.xpack.core.textstructure.action.FindFileStructureAction;
+import org.elasticsearch.xpack.core.textstructure.structurefinder.FileStructureTests;
 
 public class FindFileStructureActionResponseTests extends AbstractWireSerializingTestCase<FindFileStructureAction.Response> {
 

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/filestructurefinder/FieldStatsTests.java → x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/textstructure/structurefinder/FieldStatsTests.java

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.core.ml.filestructurefinder;
+package org.elasticsearch.xpack.core.textstructure.structurefinder;
 
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.XContentParser;

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/filestructurefinder/FileStructureTests.java → x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/textstructure/structurefinder/FileStructureTests.java

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.core.ml.filestructurefinder;
+package org.elasticsearch.xpack.core.textstructure.structurefinder;
 
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ToXContent;

x-pack/plugin/ml/build.gradle

@@ -58,7 +58,6 @@ dependencies {
 
   // ml deps
   api project(':libs:elasticsearch-grok')
-  api "com.ibm.icu:icu4j:${versions.icu4j}"
   api "net.sf.supercsv:super-csv:${versions.supercsv}"
   nativeBundle("org.elasticsearch.ml:ml-cpp:${project.version}@zip") {
     changing = true

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java

@@ -94,7 +94,6 @@
 import org.elasticsearch.xpack.core.ml.action.EvaluateDataFrameAction;
 import org.elasticsearch.xpack.core.ml.action.ExplainDataFrameAnalyticsAction;
 import org.elasticsearch.xpack.core.ml.action.FinalizeJobExecutionAction;
-import org.elasticsearch.xpack.core.ml.action.FindFileStructureAction;
 import org.elasticsearch.xpack.core.ml.action.FlushJobAction;
 import org.elasticsearch.xpack.core.ml.action.ForecastJobAction;
 import org.elasticsearch.xpack.core.ml.action.GetBucketsAction;
@@ -173,7 +172,6 @@
 import org.elasticsearch.xpack.ml.action.TransportEvaluateDataFrameAction;
 import org.elasticsearch.xpack.ml.action.TransportExplainDataFrameAnalyticsAction;
 import org.elasticsearch.xpack.ml.action.TransportFinalizeJobExecutionAction;
-import org.elasticsearch.xpack.ml.action.TransportFindFileStructureAction;
 import org.elasticsearch.xpack.ml.action.TransportFlushJobAction;
 import org.elasticsearch.xpack.ml.action.TransportForecastJobAction;
 import org.elasticsearch.xpack.ml.action.TransportGetBucketsAction;
@@ -279,7 +277,6 @@
 import org.elasticsearch.xpack.ml.process.NativeController;
 import org.elasticsearch.xpack.ml.process.NativeStorageProvider;
 import org.elasticsearch.xpack.ml.rest.RestDeleteExpiredDataAction;
-import org.elasticsearch.xpack.ml.rest.RestFindFileStructureAction;
 import org.elasticsearch.xpack.ml.rest.RestMlInfoAction;
 import org.elasticsearch.xpack.ml.rest.RestSetUpgradeModeAction;
 import org.elasticsearch.xpack.ml.rest.calendar.RestDeleteCalendarAction;
@@ -922,7 +919,6 @@ public List<RestHandler> getRestHandlers(Settings settings, RestController restC
             new RestPutCalendarJobAction(),
             new RestGetCalendarEventsAction(),
             new RestPostCalendarEventAction(),
-            new RestFindFileStructureAction(),
             new RestSetUpgradeModeAction(),
             new RestGetDataFrameAnalyticsAction(),
             new RestGetDataFrameAnalyticsStatsAction(),
@@ -1005,7 +1001,6 @@ public List<RestHandler> getRestHandlers(Settings settings, RestController restC
                 new ActionHandler<>(GetCalendarEventsAction.INSTANCE, TransportGetCalendarEventsAction.class),
                 new ActionHandler<>(PostCalendarEventsAction.INSTANCE, TransportPostCalendarEventsAction.class),
                 new ActionHandler<>(PersistJobAction.INSTANCE, TransportPersistJobAction.class),
-                new ActionHandler<>(FindFileStructureAction.INSTANCE, TransportFindFileStructureAction.class),
                 new ActionHandler<>(SetUpgradeModeAction.INSTANCE, TransportSetUpgradeModeAction.class),
                 new ActionHandler<>(GetDataFrameAnalyticsAction.INSTANCE, TransportGetDataFrameAnalyticsAction.class),
                 new ActionHandler<>(GetDataFrameAnalyticsStatsAction.INSTANCE, TransportGetDataFrameAnalyticsStatsAction.class),

x-pack/plugin/src/test/resources/rest-api-spec/api/ml.find_file_structure.json → x-pack/plugin/src/test/resources/rest-api-spec/api/text_structure.find_structure.json

@@ -1,5 +1,5 @@
 {
-  "ml.find_file_structure":{
+  "text_structure.find_structure":{
     "documentation":{
       "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-find-file-structure.html",
       "description":"Finds the structure of a text file. The text file must contain data that is suitable to be ingested into Elasticsearch."
@@ -13,7 +13,7 @@
     "url":{
       "paths":[
         {
-          "path":"/_ml/find_file_structure",
+          "path":"/_text_structure/find_structure",
           "methods":[
             "POST"
           ]

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/find_file_structure.yml → x-pack/plugin/src/test/resources/rest-api-spec/test/text_structure/find_file_structure.yml

@@ -8,7 +8,7 @@ setup:
         # This is to stop the usual content type randomization, which
         # would obviously ruin the results for this particular test
         Content-Type: "application/json"
-      ml.find_file_structure:
+      text_structure.find_structure:
         lines_to_sample: 3
         line_merge_size_limit: 1234
         timeout: 10s
@@ -67,7 +67,7 @@ setup:
         # This is to stop the usual content type randomization, which
         # would obviously ruin the results for this particular test
         Content-Type: "application/json"
-      ml.find_file_structure:
+      text_structure.find_structure:
         charset: UTF-8
         format: ndjson
         timestamp_field: time

x-pack/plugin/text-structure/build.gradle

@@ -0,0 +1,20 @@
+apply plugin: 'elasticsearch.esplugin'
+esplugin {
+  name 'x-pack-text-structure'
+  description 'Elasticsearch Expanded Pack Plugin - Text Structure'
+  classname 'org.elasticsearch.xpack.textstructure.TextStructurePlugin'
+  extendedPlugins = ['x-pack-core']
+}
+archivesBaseName = 'x-pack-text-structure'
+
+dependencies {
+  compileOnly project(path: xpackModule('core'), configuration: 'default')
+  testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
+  api project(':libs:elasticsearch-grok')
+  api "com.ibm.icu:icu4j:${versions.icu4j}"
+  api "net.sf.supercsv:super-csv:${versions.supercsv}"
+}
+
+addQaCheckDependencies()
+
+tasks.named("testingConventions").configure { enabled = false }

x-pack/plugin/text-structure/licenses/super-csv-2.4.0.jar.sha1

@@ -0,0 +1 @@
+017f8708c929029dde48bc298deaf3c7ae2452d3