refactoring match query to adjust boost and queryname and move to copy constructor

Author: Samiul-TheSoccerFan

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

@@ -36,7 +36,7 @@ protected String getQuery(QueryBuilder queryBuilder) {
 
     @Override
     protected QueryBuilder buildInferenceQuery(QueryBuilder queryBuilder, InferenceIndexInformationForField indexInformation) {
-        return SemanticQueryBuilder.from(queryBuilder, indexInformation.fieldName(), getQuery(queryBuilder), false);
+        return new SemanticQueryBuilder(queryBuilder, indexInformation.fieldName(), getQuery(queryBuilder), false);
     }
 
     @Override
@@ -47,9 +47,15 @@ protected QueryBuilder buildCombinedInferenceAndNonInferenceQuery(
         assert (queryBuilder instanceof MatchQueryBuilder);
         MatchQueryBuilder matchQueryBuilder = (MatchQueryBuilder) queryBuilder;
         BoolQueryBuilder boolQueryBuilder = new BoolQueryBuilder();
-        QueryBuilder semanticQueryBuilder = createSemanticSubQuery(indexInformation.getInferenceIndices(), matchQueryBuilder);
-        boolQueryBuilder.should(semanticQueryBuilder);
+        boolQueryBuilder.should(
+            createSemanticSubQuery(
+                indexInformation.getInferenceIndices(),
+                matchQueryBuilder
+            )
+        );
         boolQueryBuilder.should(createSubQueryForIndices(indexInformation.nonInferenceIndices(), matchQueryBuilder));
+        boolQueryBuilder.boost(matchQueryBuilder.boost());
+        boolQueryBuilder.queryName(matchQueryBuilder.queryName());
         return boolQueryBuilder;
     }
 

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

@@ -109,11 +109,10 @@ public SemanticQueryBuilder(StreamInput in) throws IOException {
         }
     }
 
-    public static SemanticQueryBuilder from(QueryBuilder queryBuilder, String fieldName, String query, Boolean lenient) {
-        SemanticQueryBuilder semanticQueryBuilder = new SemanticQueryBuilder(fieldName, query, lenient);
-        semanticQueryBuilder.boost(queryBuilder.boost());
-        semanticQueryBuilder.queryName(queryBuilder.queryName());
-        return semanticQueryBuilder;
+    public SemanticQueryBuilder(QueryBuilder queryBuilder, String fieldName, String query, Boolean lenient) {
+        this(fieldName, query, lenient);
+        this.boost = queryBuilder.boost();
+        this.queryName = queryBuilder.queryName();
     }
 
     @Override

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

@@ -116,7 +116,7 @@ protected QueryBuilder createSubQueryForIndices(Collection<String> indices, Quer
 
     protected QueryBuilder createSemanticSubQuery(Collection<String> indices, QueryBuilder queryBuilder) {
         BoolQueryBuilder boolQueryBuilder = new BoolQueryBuilder();
-        boolQueryBuilder.must(SemanticQueryBuilder.from(queryBuilder, getFieldName(queryBuilder), getQuery(queryBuilder), true));
+        boolQueryBuilder.must(new SemanticQueryBuilder(getFieldName(queryBuilder), getQuery(queryBuilder), true));
         boolQueryBuilder.filter(new TermsQueryBuilder(IndexFieldMapper.NAME, indices));
         return boolQueryBuilder;
     }