Address code review comments

Signed-off-by: Andriy Redko <[email protected]>

server/src/main/java/org/opensearch/common/lucene/search/function/FunctionScoreQuery.java

@@ -79,20 +79,20 @@ public static class FilterScoreFunction extends ScoreFunction {
  * @param function score function
  */
  public FilterScoreFunction(Query filter, ScoreFunction function) {
- this(filter, null, function);
+ this(filter, function, null);
  }
 
  /**
  * Creates a FilterScoreFunction with query and function.
  * @param filter filter query
- * @param queryName filter query name
  * @param function score function
+ * @param queryName filter query name
  */
- public FilterScoreFunction(Query filter, @Nullable String queryName, ScoreFunction function) {
+ public FilterScoreFunction(Query filter, ScoreFunction function, @Nullable String queryName) {
  super(function.getDefaultScoreCombiner());
  this.filter = filter;
- this.queryName = queryName;
  this.function = function;
+ this.queryName = queryName;
  }
 
  @Override
@@ -127,7 +127,7 @@ protected ScoreFunction rewrite(IndexReader reader) throws IOException {
  if (newFilter == filter) {
  return this;
  }
- return new FilterScoreFunction(newFilter, queryName, function);
+ return new FilterScoreFunction(newFilter, function, queryName);
  }
 
  @Override

server/src/main/java/org/opensearch/index/query/functionscore/FunctionScoreQueryBuilder.java

@@ -345,7 +345,7 @@ protected Query doToQuery(QueryShardContext context) throws IOException {
  filterFunctions[i++] = scoreFunction;
  } else {
  Query filter = builder.toQuery(context);
- filterFunctions[i++] = new FunctionScoreQuery.FilterScoreFunction(filter, builder.queryName(), scoreFunction);
+ filterFunctions[i++] = new FunctionScoreQuery.FilterScoreFunction(filter, scoreFunction, builder.queryName());
  }
  }