Skip to content

Commit a0cc202

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent d76323d commit a0cc202

File tree

3 files changed

+17
-18
lines changed

3 files changed

+17
-18
lines changed

server/src/main/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapper.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -494,11 +494,7 @@ public static Boolean parseIndexOptionsPruneValue(Map<String, Object> indexOptio
494494
}
495495

496496
throw new MapperParsingException(
497-
"["
498-
+ SPARSE_VECTOR_INDEX_OPTIONS
499-
+ "] field ["
500-
+ PRUNE_FIELD_NAME
501-
+ "] should be true or false"
497+
"[" + SPARSE_VECTOR_INDEX_OPTIONS + "] field [" + PRUNE_FIELD_NAME + "] should be true or false"
502498
);
503499
}
504500

@@ -511,12 +507,12 @@ public static TokenPruningConfig parseIndexOptionsPruningConfig(Boolean prune, M
511507
if (prune == null || prune == false) {
512508
throw new MapperParsingException(
513509
"["
514-
+ SPARSE_VECTOR_INDEX_OPTIONS
515-
+ "] field ["
516-
+ PRUNING_CONFIG_FIELD_NAME
517-
+"] should only be set if ["
518-
+ PRUNE_FIELD_NAME
519-
+ "] is set to true"
510+
+ SPARSE_VECTOR_INDEX_OPTIONS
511+
+ "] field ["
512+
+ PRUNING_CONFIG_FIELD_NAME
513+
+ "] should only be set if ["
514+
+ PRUNE_FIELD_NAME
515+
+ "] is set to true"
520516
);
521517
}
522518

server/src/main/java/org/elasticsearch/index/mapper/vectors/TokenPruningConfig.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.elasticsearch.common.io.stream.StreamInput;
1515
import org.elasticsearch.common.io.stream.StreamOutput;
1616
import org.elasticsearch.common.io.stream.Writeable;
17-
import org.elasticsearch.index.mapper.MapperParsingException;
1817
import org.elasticsearch.index.query.QueryBuilder;
1918
import org.elasticsearch.xcontent.ConstructingObjectParser;
2019
import org.elasticsearch.xcontent.DeprecationHandler;
@@ -32,7 +31,6 @@
3231
import java.util.Objects;
3332
import java.util.Set;
3433

35-
import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg;
3634
import static org.elasticsearch.xcontent.ConstructingObjectParser.optionalConstructorArg;
3735

3836
public class TokenPruningConfig implements Writeable, ToXContentObject {
@@ -196,8 +194,8 @@ public static TokenPruningConfig fromXContent(XContentParser parser) throws IOEx
196194
private static final ConstructingObjectParser<TokenPruningConfig, Void> PARSER = new ConstructingObjectParser<>(
197195
PRUNING_CONFIG_FIELD,
198196
args -> new TokenPruningConfig(
199-
args[0] == null ? DEFAULT_TOKENS_FREQ_RATIO_THRESHOLD : (Float)args[0],
200-
args[1] == null ? DEFAULT_TOKENS_WEIGHT_THRESHOLD : (Float)args[1],
197+
args[0] == null ? DEFAULT_TOKENS_FREQ_RATIO_THRESHOLD : (Float) args[0],
198+
args[1] == null ? DEFAULT_TOKENS_WEIGHT_THRESHOLD : (Float) args[1],
201199
args[2] != null && (Boolean) args[2]
202200
)
203201
);
@@ -214,7 +212,8 @@ public static TokenPruningConfig parseFromMap(Map<String, Object> pruningConfigM
214212
}
215213

216214
try {
217-
XContentParser parser = new MapXContentParser(NamedXContentRegistry.EMPTY,
215+
XContentParser parser = new MapXContentParser(
216+
NamedXContentRegistry.EMPTY,
218217
DeprecationHandler.IGNORE_DEPRECATIONS,
219218
pruningConfigMap,
220219
XContentType.JSON

server/src/test/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapperTests.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,9 @@ public void testTokensFreqRatioCorrect() {
314314
})));
315315
assertThat(
316316
eTestRangeLower.getMessage(),
317-
containsString("Failed to parse mapping: java.lang.IllegalArgumentException: [tokens_freq_ratio_threshold] must be between [1] and [100], got -2.0")
317+
containsString(
318+
"Failed to parse mapping: java.lang.IllegalArgumentException: [tokens_freq_ratio_threshold] must be between [1] and [100], got -2.0"
319+
)
318320
);
319321

320322
Exception eTestRangeHigher = expectThrows(MapperParsingException.class, () -> createMapperService(fieldMapping(b -> {
@@ -328,7 +330,9 @@ public void testTokensFreqRatioCorrect() {
328330
})));
329331
assertThat(
330332
eTestRangeHigher.getMessage(),
331-
containsString("Failed to parse mapping: java.lang.IllegalArgumentException: [tokens_freq_ratio_threshold] must be between [1] and [100], got 101")
333+
containsString(
334+
"Failed to parse mapping: java.lang.IllegalArgumentException: [tokens_freq_ratio_threshold] must be between [1] and [100], got 101"
335+
)
332336
);
333337
}
334338

0 commit comments

Comments
 (0)