Cleanup

Author: kderusso

server/src/main/java/org/elasticsearch/search/rank/feature/CustomRankInput.java

@@ -12,12 +12,6 @@
 import org.elasticsearch.common.io.stream.Writeable;
 
 /**
- * Defines custom rank input that we send in as input to rank retrievers
+ * Defines custom rank input that we send in as input to rank retrievers. Placeholder for future customizations outside snippets.
  */
-public interface CustomRankInput extends Writeable {
-
-    /**
-     * @return unique identifier for this type of input
-     */
-    String name();
-}
+public interface CustomRankInput extends Writeable {}

server/src/main/java/org/elasticsearch/search/rank/feature/SnippetRankInput.java

@@ -20,8 +20,6 @@
  */
 public class SnippetRankInput implements CustomRankInput {
 
-    static final String NAME = "snippets";
-
     private final RerankSnippetConfig snippets;
     private final String inferenceText;
     private final int tokenSizeLimit;
@@ -71,9 +69,4 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(snippets, inferenceText, tokenSizeLimit);
     }
-
-    @Override
-    public String name() {
-        return NAME;
-    }
 }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankBuilder.java

@@ -265,13 +265,12 @@ public RankFeaturePhaseRankCoordinatorContext buildRankFeaturePhaseCoordinatorCo
 
     /**
      * @return The token size limit to apply to this rerank context.
-     * This is not yet available so we are hardcoding it for now.
+     * TODO This should be pulled from the inference endpoint when available, not hardcoded.
      */
     public static Integer tokenSizeLimit(String inferenceId) {
         if (inferenceId.equals(DEFAULT_RERANK_ID) || inferenceId.equals(RERANKER_ID)) {
             return RERANK_TOKEN_SIZE_LIMIT;
         }
-
         return DEFAULT_TOKEN_SIZE_LIMIT;
     }
 

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankFeaturePhaseRankCoordinatorContext.java

@@ -137,12 +137,10 @@ protected void computeScores(RankFeatureDoc[] featureDocs, ActionListener<float[
             if (featureDocs.length == 0) {
                 inferenceListener.onResponse(new InferenceAction.Response(new RankedDocsResults(List.of())));
             } else {
-                List<String> inferenceInputs = new ArrayList<>();
-                for (RankFeatureDoc featureDoc : featureDocs) {
-                    if (featureDoc.featureData != null) {
-                        inferenceInputs.addAll(featureDoc.featureData);
-                    }
-                }
+                List<String> inferenceInputs = Arrays.stream(featureDocs)
+                    .filter(featureDoc -> featureDoc.featureData != null)
+                    .flatMap(featureDoc -> featureDoc.featureData.stream())
+                    .toList();
                 InferenceAction.Request inferenceRequest = generateRequest(inferenceInputs);
                 try {
                     executeAsyncWithOrigin(client, INFERENCE_ORIGIN, InferenceAction.INSTANCE, inferenceRequest, inferenceListener);