Refactor knn vector to adjust boost and queryname in the top level

Author: Samiul-TheSoccerFan

server/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java

@@ -84,10 +84,6 @@ private NestedQueryBuilder(String path, QueryBuilder query, ScoreMode scoreMode,
         this.innerHitBuilder = innerHitBuilder;
     }
 
-    public static NestedQueryBuilder from(String path, QueryBuilder query, ScoreMode scoreMode, String queryName) {
-        return new NestedQueryBuilder(path, query, scoreMode).queryName(queryName);
-    }
-
     /**
      * Read from a stream.
      */

server/src/main/java/org/elasticsearch/index/query/QueryBuilders.java

@@ -484,10 +484,6 @@ public static NestedQueryBuilder nestedQuery(String path, QueryBuilder query, Sc
         return new NestedQueryBuilder(path, query, scoreMode);
     }
 
-    public static NestedQueryBuilder nestedQuery(String path, QueryBuilder query, ScoreMode scoreMode, String queryName) {
-        return NestedQueryBuilder.from(path, query, scoreMode, queryName);
-    }
-
     /**
      * A filter for a field based on several terms matching on any of them.
      *

server/src/main/java/org/elasticsearch/search/vectors/KnnVectorQueryBuilder.java

@@ -280,8 +280,6 @@ public KnnVectorQueryBuilder(KnnVectorQueryBuilder queryBuilder, String fieldNam
             queryBuilder.rescoreVectorBuilder(),
             queryBuilder.getVectorSimilarity()
         );
-        this.boost = queryBuilder.boost();
-        this.queryName = queryBuilder.queryName();
         this.filterQueries.addAll(queryBuilder.filterQueries());
     }
 

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticKnnVectorQueryRewriteInterceptor.java

@@ -52,16 +52,20 @@ protected QueryBuilder buildInferenceQuery(QueryBuilder queryBuilder, InferenceI
         assert (queryBuilder instanceof KnnVectorQueryBuilder);
         KnnVectorQueryBuilder knnVectorQueryBuilder = (KnnVectorQueryBuilder) queryBuilder;
         Map<String, List<String>> inferenceIdsIndices = indexInformation.getInferenceIdsIndices();
+        QueryBuilder finalQueryBuilder;
         if (inferenceIdsIndices.size() == 1) {
             // Simple case, everything uses the same inference ID
             Map.Entry<String, List<String>> inferenceIdIndex = inferenceIdsIndices.entrySet().iterator().next();
             String searchInferenceId = inferenceIdIndex.getKey();
             List<String> indices = inferenceIdIndex.getValue();
-            return buildNestedQueryFromKnnVectorQuery(knnVectorQueryBuilder, indices, searchInferenceId);
+            finalQueryBuilder = buildNestedQueryFromKnnVectorQuery(knnVectorQueryBuilder, indices, searchInferenceId);
         } else {
             // Multiple inference IDs, construct a boolean query
-            return buildInferenceQueryWithMultipleInferenceIds(knnVectorQueryBuilder, inferenceIdsIndices);
+            finalQueryBuilder = buildInferenceQueryWithMultipleInferenceIds(knnVectorQueryBuilder, inferenceIdsIndices);
         }
+        finalQueryBuilder.boost(queryBuilder.boost());
+        finalQueryBuilder.queryName(queryBuilder.queryName());
+        return finalQueryBuilder;
     }
 
     private QueryBuilder buildInferenceQueryWithMultipleInferenceIds(
@@ -118,13 +122,8 @@ private QueryBuilder buildNestedQueryFromKnnVectorQuery(
         }
         return QueryBuilders.nestedQuery(
             SemanticTextField.getChunksFieldName(filteredKnnVectorQueryBuilder.getFieldName()),
-            buildNewKnnVectorQuery(
-                SemanticTextField.getEmbeddingsFieldName(filteredKnnVectorQueryBuilder.getFieldName()),
-                filteredKnnVectorQueryBuilder,
-                queryVectorBuilder
-            ),
-            ScoreMode.Max,
-            filteredKnnVectorQueryBuilder.queryName()
+            new KnnVectorQueryBuilder(filteredKnnVectorQueryBuilder, SemanticTextField.getEmbeddingsFieldName(filteredKnnVectorQueryBuilder.getFieldName()), queryVectorBuilder),
+            ScoreMode.Max
         );
     }