Skip to content

Commit 742fbdc

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 1e21f96 commit 742fbdc

File tree

5 files changed

+48
-37
lines changed

5 files changed

+48
-37
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,11 @@ private QueryBuilder buildInferenceQuery(QueryBuilder queryBuilder, InferenceInd
6868
}
6969

7070
@Override
71-
protected QueryBuilder buildInferenceQuery(QueryBuilder queryBuilder, InferenceIndexInformationForField indexInformation, Float fieldWeight) {
71+
protected QueryBuilder buildInferenceQuery(
72+
QueryBuilder queryBuilder,
73+
InferenceIndexInformationForField indexInformation,
74+
Float fieldWeight
75+
) {
7276
QueryBuilder inferenceQuery = buildInferenceQuery(queryBuilder, indexInformation);
7377

7478
if (fieldWeight != null && fieldWeight.equals(1.0f) == false) {

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ private QueryBuilder buildInferenceQuery(QueryBuilder queryBuilder, InferenceInd
4444
}
4545

4646
@Override
47-
protected QueryBuilder buildInferenceQuery(QueryBuilder queryBuilder, InferenceIndexInformationForField indexInformation, Float fieldWeight) {
47+
protected QueryBuilder buildInferenceQuery(
48+
QueryBuilder queryBuilder,
49+
InferenceIndexInformationForField indexInformation,
50+
Float fieldWeight
51+
) {
4852
QueryBuilder inferenceQuery = buildInferenceQuery(queryBuilder, indexInformation);
4953

5054
if (fieldWeight != null && fieldWeight.equals(1.0f) == false) {

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

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
public class SemanticMultiMatchQueryRewriteInterceptor extends SemanticQueryRewriteInterceptor {
1818
@Override
1919
protected Map<String, Float> getFieldNamesWithWeights(QueryBuilder queryBuilder) {
20-
assert (queryBuilder instanceof MultiMatchQueryBuilder);
20+
assert (queryBuilder instanceof MultiMatchQueryBuilder);
2121
MultiMatchQueryBuilder multiMatchQueryBuilder = (MultiMatchQueryBuilder) queryBuilder;
2222
return multiMatchQueryBuilder.fields();
2323
}
@@ -30,18 +30,18 @@ protected String getQuery(QueryBuilder queryBuilder) {
3030
}
3131

3232
private QueryBuilder buildInferenceQuery(QueryBuilder queryBuilder, InferenceIndexInformationForField indexInformation) {
33-
SemanticQueryBuilder semanticQueryBuilder = new SemanticQueryBuilder(
34-
indexInformation.fieldName(),
35-
getQuery(queryBuilder),
36-
false
37-
);
33+
SemanticQueryBuilder semanticQueryBuilder = new SemanticQueryBuilder(indexInformation.fieldName(), getQuery(queryBuilder), false);
3834
semanticQueryBuilder.boost(queryBuilder.boost());
3935
semanticQueryBuilder.queryName(queryBuilder.queryName());
4036
return semanticQueryBuilder;
4137
}
4238

4339
@Override
44-
protected QueryBuilder buildInferenceQuery(QueryBuilder queryBuilder, InferenceIndexInformationForField indexInformation, Float fieldWeight) {
40+
protected QueryBuilder buildInferenceQuery(
41+
QueryBuilder queryBuilder,
42+
InferenceIndexInformationForField indexInformation,
43+
Float fieldWeight
44+
) {
4545
QueryBuilder inferenceQuery = buildInferenceQuery(queryBuilder, indexInformation);
4646

4747
if (fieldWeight != null && fieldWeight.equals(1.0f) == false) {
@@ -51,7 +51,10 @@ protected QueryBuilder buildInferenceQuery(QueryBuilder queryBuilder, InferenceI
5151
return inferenceQuery;
5252
}
5353

54-
private QueryBuilder buildCombinedInferenceAndNonInferenceQuery(QueryBuilder queryBuilder, InferenceIndexInformationForField indexInformation) {
54+
private QueryBuilder buildCombinedInferenceAndNonInferenceQuery(
55+
QueryBuilder queryBuilder,
56+
InferenceIndexInformationForField indexInformation
57+
) {
5558
assert (queryBuilder instanceof MultiMatchQueryBuilder);
5659
MultiMatchQueryBuilder originalMultiMatchQueryBuilder = (MultiMatchQueryBuilder) queryBuilder;
5760

@@ -65,51 +68,43 @@ private QueryBuilder buildCombinedInferenceAndNonInferenceQuery(QueryBuilder que
6568

6669
// Add semantic query for inference indices
6770
boolQueryBuilder.should(
68-
createSemanticSubQuery(
69-
indexInformation.getInferenceIndices(),
70-
indexInformation.fieldName(),
71-
getQuery(queryBuilder)
72-
)
71+
createSemanticSubQuery(indexInformation.getInferenceIndices(), indexInformation.fieldName(), getQuery(queryBuilder))
7372
);
7473

7574
// Add regular query for non-inference indices
76-
boolQueryBuilder.should(
77-
createSubQueryForIndices(indexInformation.nonInferenceIndices(), multiMatchQueryBuilder)
78-
);
75+
boolQueryBuilder.should(createSubQueryForIndices(indexInformation.nonInferenceIndices(), multiMatchQueryBuilder));
7976

8077
// TODO:: add boost
8178
boolQueryBuilder.queryName(queryBuilder.queryName());
8279
return boolQueryBuilder;
8380
}
8481

8582
@Override
86-
protected QueryBuilder buildCombinedInferenceAndNonInferenceQuery(QueryBuilder queryBuilder, InferenceIndexInformationForField indexInformation, Float fieldWeight) {
83+
protected QueryBuilder buildCombinedInferenceAndNonInferenceQuery(
84+
QueryBuilder queryBuilder,
85+
InferenceIndexInformationForField indexInformation,
86+
Float fieldWeight
87+
) {
8788
assert (queryBuilder instanceof MultiMatchQueryBuilder);
8889
MultiMatchQueryBuilder originalMultiMatchQueryBuilder = (MultiMatchQueryBuilder) queryBuilder;
8990

9091
MatchQueryBuilder matchQueryBuilder = new MatchQueryBuilder(indexInformation.fieldName(), getQuery(queryBuilder));
9192

9293
// Create a copy for non-inference fields with only this specific field
93-
// MultiMatchQueryBuilder multiMatchQueryBuilder = createSingleFieldMultiMatch(
94-
// originalMultiMatchQueryBuilder,
95-
// indexInformation.fieldName()
96-
// );
94+
// MultiMatchQueryBuilder multiMatchQueryBuilder = createSingleFieldMultiMatch(
95+
// originalMultiMatchQueryBuilder,
96+
// indexInformation.fieldName()
97+
// );
9798

9899
BoolQueryBuilder boolQueryBuilder = new BoolQueryBuilder();
99100

100101
// Add semantic query for inference indices
101102
boolQueryBuilder.should(
102-
createSemanticSubQuery(
103-
indexInformation.getInferenceIndices(),
104-
indexInformation.fieldName(),
105-
getQuery(matchQueryBuilder)
106-
)
103+
createSemanticSubQuery(indexInformation.getInferenceIndices(), indexInformation.fieldName(), getQuery(matchQueryBuilder))
107104
);
108105

109106
// Add regular query for non-inference indices
110-
boolQueryBuilder.should(
111-
createSubQueryForIndices(indexInformation.nonInferenceIndices(), matchQueryBuilder)
112-
);
107+
boolQueryBuilder.should(createSubQueryForIndices(indexInformation.nonInferenceIndices(), matchQueryBuilder));
113108

114109
if (fieldWeight != null && fieldWeight.equals(1.0f) == false) {
115110
boolQueryBuilder.boost(fieldWeight);

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,11 @@ public QueryBuilder interceptAndRewrite(QueryRewriteContext context, QueryBuilde
8484
* @param weight {@link Float}
8585
* @return {@link QueryBuilder}
8686
*/
87-
protected abstract QueryBuilder buildInferenceQuery(QueryBuilder queryBuilder, InferenceIndexInformationForField indexInformation, Float weight);
87+
protected abstract QueryBuilder buildInferenceQuery(
88+
QueryBuilder queryBuilder,
89+
InferenceIndexInformationForField indexInformation,
90+
Float weight
91+
);
8892

8993
/**
9094
* Builds a combined inference and non-inference query,
@@ -93,10 +97,10 @@ public QueryBuilder interceptAndRewrite(QueryRewriteContext context, QueryBuilde
9397
* @param indexInformation {@link InferenceIndexInformationForField}
9498
* @return {@link QueryBuilder}
9599
*/
96-
// protected abstract QueryBuilder buildCombinedInferenceAndNonInferenceQuery(
97-
// QueryBuilder queryBuilder,
98-
// InferenceIndexInformationForField indexInformation
99-
// );
100+
// protected abstract QueryBuilder buildCombinedInferenceAndNonInferenceQuery(
101+
// QueryBuilder queryBuilder,
102+
// InferenceIndexInformationForField indexInformation
103+
// );
100104

101105
protected abstract QueryBuilder buildCombinedInferenceAndNonInferenceQuery(
102106
QueryBuilder queryBuilder,

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@ private QueryBuilder buildInferenceQuery(QueryBuilder queryBuilder, InferenceInd
5757
}
5858

5959
@Override
60-
protected QueryBuilder buildInferenceQuery(QueryBuilder queryBuilder, InferenceIndexInformationForField indexInformation, Float fieldWeight) {
60+
protected QueryBuilder buildInferenceQuery(
61+
QueryBuilder queryBuilder,
62+
InferenceIndexInformationForField indexInformation,
63+
Float fieldWeight
64+
) {
6165
QueryBuilder inferenceQuery = buildInferenceQuery(queryBuilder, indexInformation);
6266

6367
if (fieldWeight != null && fieldWeight.equals(1.0f) == false) {

0 commit comments

Comments
 (0)