Removing the more generic exception since no other implementation needed it

Author: prwhelan

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfig.java

@@ -9,6 +9,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.support.IndicesOptions;
@@ -21,6 +22,7 @@
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.search.aggregations.AggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregatorFactories;
 import org.elasticsearch.search.aggregations.bucket.composite.CompositeAggregationBuilder;
@@ -1051,7 +1053,7 @@ public DatafeedConfig build() {
                 indicesOptions = IndicesOptions.STRICT_EXPAND_OPEN_HIDDEN_FORBID_CLOSED;
             }
             if (indicesOptions.resolveCrossProjectIndexExpression()) {
-                throw ExceptionsHelper.crossProjectSearchIsDisabled();
+                throw new ElasticsearchStatusException("Cross-project search is not enabled for Datafeeds", RestStatus.FORBIDDEN);
             }
 
             return new DatafeedConfig(

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/utils/ExceptionsHelper.java

@@ -101,10 +101,6 @@ public static ElasticsearchStatusException taskOperationFailureToStatusException
         return new ElasticsearchStatusException(failure.getCause().getMessage(), failure.getStatus(), failure.getCause());
     }
 
-    public static ElasticsearchStatusException crossProjectSearchIsDisabled() {
-        return new ElasticsearchStatusException("Cross-project search is not enabled for any ML feature", RestStatus.FORBIDDEN);
-    }
-
     /**
      * Creates an error message that explains there are shard failures, displays info
      * for the first failure (shard/reason) and kindly asks to see more info in the logs

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfigBuilderTests.java

@@ -159,7 +159,7 @@ public void testResolveCrossProjectIsDisabled() {
         );
 
         var actualException = assertThrows(ElasticsearchStatusException.class, datafeedBuilder::build);
-        assertThat(actualException.getMessage(), equalTo("Cross-project search is not enabled for any ML feature"));
+        assertThat(actualException.getMessage(), equalTo("Cross-project search is not enabled for Datafeeds"));
         assertThat(actualException.status(), equalTo(RestStatus.FORBIDDEN));
     }