Fix some remaining references to simplified format

Author: Mikep86

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

@@ -47,9 +47,7 @@
  * formula.
  */
 public final class RRFRetrieverBuilder extends CompoundRetrieverBuilder<RRFRetrieverBuilder> {
-    public static final NodeFeature MULTI_FIELDS_QUERY_FORMAT_SUPPORT = new NodeFeature(
-        "rrf_retriever.multi_fields_query_format_support"
-    );
+    public static final NodeFeature MULTI_FIELDS_QUERY_FORMAT_SUPPORT = new NodeFeature("rrf_retriever.multi_fields_query_format_support");
 
     public static final String NAME = "rrf";
 

x-pack/plugin/rank-rrf/src/test/java/org/elasticsearch/xpack/rank/rrf/RRFRetrieverBuilderTests.java

@@ -84,7 +84,7 @@ public void testRetrieverExtractionErrors() throws IOException {
         }
     }
 
-    public void testSimplifiedParamsRewrite() {
+    public void testMultiFieldsParamsRewrite() {
         final String indexName = "test-index";
         final List<String> testInferenceFields = List.of("semantic_field_1", "semantic_field_2");
         final ResolvedIndices resolvedIndices = createMockResolvedIndices(indexName, testInferenceFields, null);
@@ -105,7 +105,7 @@ public void testSimplifiedParamsRewrite() {
             DEFAULT_RANK_WINDOW_SIZE,
             RRFRetrieverBuilder.DEFAULT_RANK_CONSTANT
         );
-        assertSimplifiedParamsRewrite(
+        assertMultiFieldsParamsRewrite(
             rrfRetrieverBuilder,
             queryRewriteContext,
             Map.of("field_1", 1.0f, "field_2", 1.0f),
@@ -121,7 +121,7 @@ public void testSimplifiedParamsRewrite() {
             DEFAULT_RANK_WINDOW_SIZE * 2,
             RRFRetrieverBuilder.DEFAULT_RANK_CONSTANT / 2
         );
-        assertSimplifiedParamsRewrite(
+        assertMultiFieldsParamsRewrite(
             rrfRetrieverBuilder,
             queryRewriteContext,
             Map.of("field_1", 1.0f, "field_2", 1.0f),
@@ -137,7 +137,7 @@ public void testSimplifiedParamsRewrite() {
             DEFAULT_RANK_WINDOW_SIZE,
             RRFRetrieverBuilder.DEFAULT_RANK_CONSTANT
         );
-        assertSimplifiedParamsRewrite(
+        assertMultiFieldsParamsRewrite(
             rrfRetrieverBuilder,
             queryRewriteContext,
             Map.of("field_*", 1.0f, "*_field_1", 1.0f),
@@ -153,7 +153,7 @@ public void testSimplifiedParamsRewrite() {
             DEFAULT_RANK_WINDOW_SIZE,
             RRFRetrieverBuilder.DEFAULT_RANK_CONSTANT
         );
-        assertSimplifiedParamsRewrite(
+        assertMultiFieldsParamsRewrite(
             rrfRetrieverBuilder,
             queryRewriteContext,
             Map.of("*", 1.0f),
@@ -248,7 +248,7 @@ private static ResolvedIndices createMockResolvedIndices(
         );
     }
 
-    private static void assertSimplifiedParamsRewrite(
+    private static void assertMultiFieldsParamsRewrite(
         RRFRetrieverBuilder retriever,
         QueryRewriteContext ctx,
         Map<String, Float> expectedNonInferenceFields,