Remove overengineered type param on the InferenceOperator.OutputBuilder

Author: afoucret

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/inference/InferenceOperator.java

@@ -8,7 +8,6 @@
 package org.elasticsearch.xpack.esql.inference;
 
 import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.compute.data.Block;
 import org.elasticsearch.compute.data.BlockFactory;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.operator.AsyncOperator;
@@ -103,7 +102,7 @@ public Page getOutput() {
             return null;
         }
 
-        try (OutputBuilder<Page> outputBuilder = outputBuilder(ongoingInferenceResult.inputPage)) {
+        try (OutputBuilder outputBuilder = outputBuilder(ongoingInferenceResult.inputPage)) {
             for (InferenceAction.Response response : ongoingInferenceResult.responses) {
                 outputBuilder.addInferenceResponse(response);
             }
@@ -126,12 +125,12 @@ public Page getOutput() {
      *
      * @param input The corresponding input page used to generate the inference requests.
      */
-    protected abstract OutputBuilder<Page> outputBuilder(Page input);
+    protected abstract OutputBuilder outputBuilder(Page input);
 
     /**
-     * An interface for accumulating inference responses and constructing a result (can be a {@link  Page} or a {@link Block}).
+     * An interface for accumulating inference responses and constructing the result page..
      */
-    public interface OutputBuilder<T> extends Releasable {
+    public interface OutputBuilder extends Releasable {
 
         /**
          * Adds an inference response to the output.
@@ -149,7 +148,7 @@ public interface OutputBuilder<T> extends Releasable {
          *
          * @return The constructed output block.
          */
-        T buildOutput();
+        Page buildOutput();
 
         static <IR extends InferenceServiceResults> IR inferenceResults(InferenceAction.Response inferenceResponse, Class<IR> clazz) {
             InferenceServiceResults results = inferenceResponse.getResults();

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/inference/completion/CompletionOperatorOutputBuilder.java

@@ -20,7 +20,7 @@
  * {@link CompletionOperatorOutputBuilder} builds the output page for {@link CompletionOperator} by converting {@link ChatCompletionResults}
  * into a {@link BytesRefBlock}.
  */
-public class CompletionOperatorOutputBuilder implements InferenceOperator.OutputBuilder<Page> {
+public class CompletionOperatorOutputBuilder implements InferenceOperator.OutputBuilder {
     private final Page inputPage;
     private final BytesRefBlock.Builder outputBlockBuilder;
     private final BytesRefBuilder bytesRefBuilder = new BytesRefBuilder();

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/inference/rerank/RerankOperatorOutputBuilder.java

@@ -24,7 +24,7 @@
  *  * reranked relevance scores into the specified score channel of the input page.
  */
 
-public class RerankOperatorOutputBuilder implements InferenceOperator.OutputBuilder<Page> {
+public class RerankOperatorOutputBuilder implements InferenceOperator.OutputBuilder {
 
     private final Page inputPage;
     private final DoubleBlock.Builder scoreBlockBuilder;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/inference/textembedding/TextEmbeddingOperatorOutputBuilder.java

@@ -21,7 +21,7 @@
  * {@link TextEmbeddingOperatorOutputBuilder} builds the output page for text embedding by converting
  * {@link TextEmbeddingResults} into a {@link FloatBlock} containing dense vector embeddings.
  */
-public class TextEmbeddingOperatorOutputBuilder implements InferenceOperator.OutputBuilder<Page> {
+public class TextEmbeddingOperatorOutputBuilder implements InferenceOperator.OutputBuilder {
     private final Page inputPage;
     private final FloatBlock.Builder outputBlockBuilder;