minor refactoring

Author: tteofili

…h/xpack/esql/plugin/ScoreFunctionIT.java …ticsearch/xpack/esql/plugin/ScoreIT.javax-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/ScoreFunctionIT.java renamed to x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/ScoreIT.java x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/ScoreFunctionIT.java renamed to x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/ScoreIT.java

@@ -22,7 +22,7 @@
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 
 //@TestLogging(value = "org.elasticsearch.xpack.esql:TRACE,org.elasticsearch.compute:TRACE", reason = "debug")
-public class ScoreFunctionIT extends AbstractEsqlIntegTestCase {
+public class ScoreIT extends AbstractEsqlIntegTestCase {
 
     @Before
     public void setupIndex() {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/EsqlFunctionRegistry.java

@@ -44,7 +44,7 @@
 import org.elasticsearch.xpack.esql.expression.function.fulltext.Match;
 import org.elasticsearch.xpack.esql.expression.function.fulltext.MultiMatch;
 import org.elasticsearch.xpack.esql.expression.function.fulltext.QueryString;
-import org.elasticsearch.xpack.esql.expression.function.fulltext.ScoreFunction;
+import org.elasticsearch.xpack.esql.expression.function.fulltext.Score;
 import org.elasticsearch.xpack.esql.expression.function.fulltext.Term;
 import org.elasticsearch.xpack.esql.expression.function.grouping.Bucket;
 import org.elasticsearch.xpack.esql.expression.function.grouping.Categorize;
@@ -454,7 +454,7 @@ private static FunctionDefinition[][] snapshotFunctions() {
                 def(MinOverTime.class, uni(MinOverTime::new), "min_over_time"),
                 def(AvgOverTime.class, uni(AvgOverTime::new), "avg_over_time"),
                 def(LastOverTime.class, LastOverTime::withUnresolvedTimestamp, "last_over_time"),
-                def(ScoreFunction.class, uni(ScoreFunction::new), ScoreFunction.NAME),
+                def(Score.class, uni(Score::new), Score.NAME),
                 def(FirstOverTime.class, FirstOverTime::withUnresolvedTimestamp, "first_over_time"),
                 def(Term.class, bi(Term::new), "term") } };
     }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/FullTextFunction.java

@@ -232,10 +232,7 @@ private static void checkFullTextQueryFunctions(LogicalPlan plan, Failures failu
         } else {
             // TODO : improve this check, as this is not so nice :(
             List<FullTextFunction> scoredFTFs = new ArrayList<>();
-            plan.forEachExpression(
-                ScoreFunction.class,
-                scoreFunction -> { plan.forEachExpression(FullTextFunction.class, scoredFTFs::add); }
-            );
+            plan.forEachExpression(Score.class, scoreFunction -> { plan.forEachExpression(FullTextFunction.class, scoredFTFs::add); });
             plan.forEachExpression(FullTextFunction.class, ftf -> {
                 if (scoredFTFs.remove(ftf) == false) {
                     failures.add(

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/FullTextWritables.java

@@ -28,7 +28,7 @@ public static List<NamedWriteableRegistry.Entry> getNamedWriteables() {
             entries.add(Term.ENTRY);
         }
         if (EsqlCapabilities.Cap.SCORE_FUNCTION.isEnabled()) {
-            entries.add(ScoreFunction.ENTRY);
+            entries.add(Score.ENTRY);
         }
 
         return Collections.unmodifiableList(entries);

…ion/function/fulltext/ScoreFunction.java …/expression/function/fulltext/Score.javax-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/ScoreFunction.java renamed to x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/Score.java x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/ScoreFunction.java renamed to x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/Score.java

@@ -34,30 +34,26 @@
  * A function to be used to score specific portions of an ES|QL query e.g., in conjunction with
  * an {@link org.elasticsearch.xpack.esql.plan.logical.Eval}.
  */
-public class ScoreFunction extends Function implements EvaluatorMapper {
+public class Score extends Function implements EvaluatorMapper {
 
-    public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
-        Expression.class,
-        "score",
-        ScoreFunction::readFrom
-    );
+    public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(Expression.class, "score", Score::readFrom);
 
     public static final String NAME = "score";
 
     @FunctionInfo(
         returnType = "double",
         preview = true,
-        description = "Scores a full text function. Returns scores for all the matching docs.",
+        description = "Scores a full text function. Returns scores for all the resulting docs.",
         examples = { @Example(file = "score-function", tag = "score-single") }
     )
-    public ScoreFunction(
+    public Score(
         Source source,
         @Param(name = "query", type = { "keyword", "text" }, description = "full text function.") Expression scorableQuery
     ) {
         this(source, List.of(scorableQuery));
     }
 
-    protected ScoreFunction(Source source, List<Expression> children) {
+    protected Score(Source source, List<Expression> children) {
         super(source, children);
     }
 
@@ -68,12 +64,12 @@ public DataType dataType() {
 
     @Override
     public Expression replaceChildren(List<Expression> newChildren) {
-        return new ScoreFunction(source(), newChildren);
+        return new Score(source(), newChildren);
     }
 
     @Override
     protected NodeInfo<? extends Expression> info() {
-        return NodeInfo.create(this, ScoreFunction::new, children().getFirst());
+        return NodeInfo.create(this, Score::new, children().getFirst());
     }
 
     @Override
@@ -96,7 +92,7 @@ public void writeTo(StreamOutput out) throws IOException {
     private static Expression readFrom(StreamInput in) throws IOException {
         Source source = Source.readFrom((PlanStreamInput) in);
         Expression query = in.readOptionalNamedWriteable(Expression.class);
-        return new ScoreFunction(source, query);
+        return new Score(source, query);
     }
 
     private record ScorerEvaluatorFactory(ScoreOperator.ExpressionScorer.Factory scoreFactory)