Updating knn to copy constructor

Author: Samiul-TheSoccerFan

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

@@ -265,34 +265,22 @@ public KnnVectorQueryBuilder(StreamInput in) throws IOException {
         this.queryVectorSupplier = null;
     }
 
-    public static KnnVectorQueryBuilder from(KnnVectorQueryBuilder queryBuilder) {
-        return from(queryBuilder, queryBuilder.getFieldName(), queryBuilder.queryVectorBuilder());
+    public KnnVectorQueryBuilder(KnnVectorQueryBuilder queryBuilder) {
+        this(queryBuilder, queryBuilder.getFieldName(), queryBuilder.queryVectorBuilder());
     }
 
-    public static KnnVectorQueryBuilder from(KnnVectorQueryBuilder queryBuilder, String fieldName, QueryVectorBuilder queryVectorBuilder) {
-        KnnVectorQueryBuilder knnVectorQueryBuilder;
-        if (queryBuilder.queryVectorBuilder() != null) {
-            knnVectorQueryBuilder = new KnnVectorQueryBuilder(
-                fieldName,
-                queryVectorBuilder,
-                queryBuilder.k(),
-                queryBuilder.numCands(),
-                queryBuilder.getVectorSimilarity()
-            );
-        } else {
-            knnVectorQueryBuilder = new KnnVectorQueryBuilder(
-                fieldName,
-                queryBuilder.queryVector(),
-                queryBuilder.k(),
-                queryBuilder.numCands(),
-                queryBuilder.rescoreVectorBuilder(),
-                queryBuilder.getVectorSimilarity()
-            );
-        }
-
-        knnVectorQueryBuilder.boost(queryBuilder.boost());
-        knnVectorQueryBuilder.queryName(queryBuilder.queryName());
-        return knnVectorQueryBuilder;
+    public KnnVectorQueryBuilder(KnnVectorQueryBuilder queryBuilder, String fieldName, QueryVectorBuilder queryVectorBuilder) {
+        this(fieldName,
+            queryBuilder.queryVector(),
+            queryVectorBuilder,
+            null,
+            queryBuilder.k(),
+            queryBuilder.numCands(),
+            queryBuilder.rescoreVectorBuilder(),
+            queryBuilder.getVectorSimilarity());
+        this.boost = queryBuilder.boost();
+        this.queryName = queryBuilder.queryName();
+        this.filterQueries.addAll(queryBuilder.filterQueries());
     }
 
     public String getFieldName() {

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

@@ -129,8 +129,7 @@ private QueryBuilder buildNestedQueryFromKnnVectorQuery(
     }
 
     private KnnVectorQueryBuilder addIndexFilterToKnnVectorQuery(Collection<String> indices, KnnVectorQueryBuilder original) {
-        KnnVectorQueryBuilder copy = KnnVectorQueryBuilder.from(original);
-        copy.addFilterQueries(original.filterQueries());
+        KnnVectorQueryBuilder copy = new KnnVectorQueryBuilder(original);
         copy.addFilterQuery(new TermsQueryBuilder(IndexFieldMapper.NAME, indices));
         return copy;
     }
@@ -149,9 +148,7 @@ private KnnVectorQueryBuilder buildNewKnnVectorQuery(
         KnnVectorQueryBuilder original,
         QueryVectorBuilder queryVectorBuilder
     ) {
-        KnnVectorQueryBuilder newQueryBuilder = KnnVectorQueryBuilder.from(original, fieldName, queryVectorBuilder);
-        newQueryBuilder.addFilterQueries(original.filterQueries());
-        return newQueryBuilder;
+        return new KnnVectorQueryBuilder(original, fieldName, queryVectorBuilder);
     }
 
     @Override