Renamed and moved cluster feature

Author: Mikep86

x-pack/plugin/rank-rrf/src/main/java/org/elasticsearch/xpack/rank/RankRRFFeatures.java

@@ -9,6 +9,7 @@
 
 import org.elasticsearch.features.FeatureSpecification;
 import org.elasticsearch.features.NodeFeature;
+import org.elasticsearch.xpack.rank.linear.LinearRetrieverBuilder;
 
 import java.util.Set;
 
@@ -19,7 +20,6 @@
 public class RankRRFFeatures implements FeatureSpecification {
 
     public static final NodeFeature LINEAR_RETRIEVER_SUPPORTED = new NodeFeature("linear_retriever_supported");
-    public static final NodeFeature SIMPLIFIED_RETRIEVER_FORMAT = new NodeFeature("simplified_retriever_format");
 
     @Override
     public Set<NodeFeature> getFeatures() {
@@ -32,7 +32,7 @@ public Set<NodeFeature> getTestFeatures() {
             INNER_RETRIEVERS_FILTER_SUPPORT,
             LINEAR_RETRIEVER_MINMAX_SINGLE_DOC_FIX,
             LINEAR_RETRIEVER_L2_NORM,
-            SIMPLIFIED_RETRIEVER_FORMAT
+            LinearRetrieverBuilder.MULTI_FIELDS_QUERY_FORMAT_SUPPORT
         );
     }
 }

x-pack/plugin/rank-rrf/src/main/java/org/elasticsearch/xpack/rank/linear/LinearRetrieverBuilder.java

@@ -12,6 +12,7 @@
 import org.elasticsearch.action.ResolvedIndices;
 import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.common.util.Maps;
+import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.index.query.MatchNoneQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryRewriteContext;
@@ -53,6 +54,9 @@
  *
  */
 public final class LinearRetrieverBuilder extends CompoundRetrieverBuilder<LinearRetrieverBuilder> {
+    public static final NodeFeature MULTI_FIELDS_QUERY_FORMAT_SUPPORT = new NodeFeature(
+        "linear_retriever.multi_fields_query_format_support"
+    );
 
     public static final String NAME = "linear";
 

x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/linear/20_linear_retriever_simplified.yml

@@ -1,7 +1,7 @@
 setup:
   - requires:
-      cluster_features: [ "simplified_retriever_format" ]
-      reason: "Simplified retriever format"
+      cluster_features: [ "linear_retriever.multi_fields_query_format_support" ]
+      reason: "Linear retriever multi-fields query format support"
       test_runner_features: [ "close_to", "headers", "contains" ]
 
   - do: