do not reuse ML feature causing a conflict

Author: Hendrik Muhs

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

@@ -31,6 +31,8 @@ public final class XPackField {
     public static final String SQL = "sql";
     /** Name constant for the rollup feature. */
     public static final String ROLLUP = "rollup";
+    /** Name constant for the feature index builder feature. */
+    public static final String FIB = "fib";
 
     private XPackField() {}
 

x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/FeatureIndexBuilderFeatureSet.java

@@ -28,7 +28,7 @@ public FeatureIndexBuilderFeatureSet(Settings settings, @Nullable XPackLicenseSt
 
     @Override
     public String name() {
-        return XPackField.MACHINE_LEARNING; // todo: own implementation??
+        return XPackField.FIB;
     }
 
     @Override

x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/FeatureIndexBuilderFeatureSetUsage.java

@@ -18,6 +18,6 @@ public FeatureIndexBuilderFeatureSetUsage(StreamInput input) throws IOException
     }
 
     public FeatureIndexBuilderFeatureSetUsage(boolean available, boolean enabled) {
-        super(XPackField.MACHINE_LEARNING, available, enabled);
+        super(XPackField.FIB, available, enabled);
     }
 }

x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/action/TransportPutFeatureIndexBuilderJobAction.java

@@ -60,7 +60,7 @@ protected PutFeatureIndexBuilderJobAction.Response newResponse() {
     protected void masterOperation(Request request, ClusterState clusterState, ActionListener<Response> listener) throws Exception {
 
         if (!licenseState.isMachineLearningAllowed()) {
-            listener.onFailure(LicenseUtils.newComplianceException(XPackField.MACHINE_LEARNING));
+            listener.onFailure(LicenseUtils.newComplianceException(XPackField.FIB));
             return;
         }
 

x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/action/TransportStartFeatureIndexBuilderJobAction.java

@@ -66,7 +66,7 @@ protected void doExecute(Task task, StartFeatureIndexBuilderJobAction.Request re
             ActionListener<StartFeatureIndexBuilderJobAction.Response> listener) {
 
         if (!licenseState.isMachineLearningAllowed()) {
-            listener.onFailure(LicenseUtils.newComplianceException(XPackField.MACHINE_LEARNING));
+            listener.onFailure(LicenseUtils.newComplianceException(XPackField.FIB));
             return;
         }