Use RetrieverSource.from

Author: Mikep86

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

@@ -67,7 +67,7 @@ public final class RRFRetrieverBuilder extends CompoundRetrieverBuilder<RRFRetri
             int rankConstant = args[4] == null ? DEFAULT_RANK_CONSTANT : (int) args[4];
 
             List<RetrieverSource> innerRetrievers = childRetrievers != null
-                ? childRetrievers.stream().map(r -> new RetrieverSource(r, null)).toList()
+                ? childRetrievers.stream().map(RetrieverSource::from).toList()
                 : List.of();
             return new RRFRetrieverBuilder(innerRetrievers, fields, query, rankWindowSize, rankConstant);
         }
@@ -250,7 +250,7 @@ protected RetrieverBuilder doRewrite(QueryRewriteContext ctx) {
                         );
                     }
                 }
-            ).stream().map(CompoundRetrieverBuilder::convertToRetrieverSource).toList();
+            ).stream().map(RetrieverSource::from).toList();
 
             if (fieldsInnerRetrievers.isEmpty() == false) {
                 rewritten = new RRFRetrieverBuilder(fieldsInnerRetrievers, rankWindowSize, rankConstant);

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

@@ -27,7 +27,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.elasticsearch.search.retriever.CompoundRetrieverBuilder.convertToRetrieverSource;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
 
@@ -58,7 +57,7 @@ public static RRFRetrieverBuilder createRandomRRFRetrieverBuilder() {
         int retrieverCount = randomIntBetween(2, 50);
         List<CompoundRetrieverBuilder.RetrieverSource> innerRetrievers = new ArrayList<>(retrieverCount);
         while (retrieverCount > 0) {
-            innerRetrievers.add(convertToRetrieverSource(TestRetrieverBuilder.createRandomTestRetrieverBuilder()));
+            innerRetrievers.add(CompoundRetrieverBuilder.RetrieverSource.from(TestRetrieverBuilder.createRandomTestRetrieverBuilder()));
             --retrieverCount;
         }
 

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

@@ -41,7 +41,6 @@
 import java.util.Set;
 
 import static org.elasticsearch.search.rank.RankBuilder.DEFAULT_RANK_WINDOW_SIZE;
-import static org.elasticsearch.search.retriever.CompoundRetrieverBuilder.convertToRetrieverSource;
 
 /** Tests for the rrf retriever. */
 public class RRFRetrieverBuilderTests extends ESTestCase {
@@ -257,7 +256,7 @@ private static void assertSimplifiedParamsRewrite(
         String expectedQuery
     ) {
         Set<Object> expectedInnerRetrievers = Set.of(
-            convertToRetrieverSource(
+            CompoundRetrieverBuilder.RetrieverSource.from(
                 new StandardRetrieverBuilder(
                     new MultiMatchQueryBuilder(expectedQuery).type(MultiMatchQueryBuilder.Type.MOST_FIELDS)
                         .fields(expectedNonInferenceFields)
@@ -267,7 +266,9 @@ private static void assertSimplifiedParamsRewrite(
                 if (e.getValue() != 1.0f) {
                     throw new IllegalArgumentException("Cannot apply per-field weights in RRF");
                 }
-                return convertToRetrieverSource(new StandardRetrieverBuilder(new MatchQueryBuilder(e.getKey(), expectedQuery)));
+                return CompoundRetrieverBuilder.RetrieverSource.from(
+                    new StandardRetrieverBuilder(new MatchQueryBuilder(e.getKey(), expectedQuery))
+                );
             }).toArray())
         );