From 2d51bb9b54c4fd17b79044552d405b5cac8e202d Mon Sep 17 00:00:00 2001 From: zhichao-aws Date: Wed, 27 Sep 2023 10:54:54 +0800 Subject: [PATCH] add locale to String.format Signed-off-by: zhichao-aws --- .../query/SparseEncodingQueryBuilder.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/opensearch/neuralsearch/query/SparseEncodingQueryBuilder.java b/src/main/java/org/opensearch/neuralsearch/query/SparseEncodingQueryBuilder.java index a8c2baaf7..4b8b6f0d4 100644 --- a/src/main/java/org/opensearch/neuralsearch/query/SparseEncodingQueryBuilder.java +++ b/src/main/java/org/opensearch/neuralsearch/query/SparseEncodingQueryBuilder.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.function.Supplier; @@ -127,6 +128,7 @@ public static SparseEncodingQueryBuilder fromXContent(XContentParser parser) thr throw new ParsingException( parser.getTokenLocation(), String.format( + Locale.ROOT, "[%s] query doesn't support multiple fields, found [%s] and [%s]", NAME, sparseEncodingQueryBuilder.fieldName(), @@ -138,11 +140,11 @@ public static SparseEncodingQueryBuilder fromXContent(XContentParser parser) thr requireValue(sparseEncodingQueryBuilder.fieldName(), "Field name must be provided for " + NAME + " query"); requireValue( sparseEncodingQueryBuilder.queryText(), - String.format("%s field must be provided for [%s] query", QUERY_TEXT_FIELD.getPreferredName(), NAME) + String.format(Locale.ROOT, "%s field must be provided for [%s] query", QUERY_TEXT_FIELD.getPreferredName(), NAME) ); requireValue( sparseEncodingQueryBuilder.modelId(), - String.format("%s field must be provided for [%s] query", MODEL_ID_FIELD.getPreferredName(), NAME) + String.format(Locale.ROOT, "%s field must be provided for [%s] query", MODEL_ID_FIELD.getPreferredName(), NAME) ); return sparseEncodingQueryBuilder; @@ -166,13 +168,13 @@ private static void parseQueryParams(XContentParser parser, SparseEncodingQueryB } else { throw new ParsingException( parser.getTokenLocation(), - String.format("[%s] query does not support [%s] field", NAME, currentFieldName) + String.format(Locale.ROOT, "[%s] query does not support [%s] field", NAME, currentFieldName) ); } } else { throw new ParsingException( parser.getTokenLocation(), - String.format("[%s] unknown token [%s] after [%s]", NAME, token, currentFieldName) + String.format(Locale.ROOT, "[%s] unknown token [%s] after [%s]", NAME, token, currentFieldName) ); } } @@ -222,7 +224,12 @@ protected Query doToQuery(QueryShardContext context) throws IOException { private static void validateForRewrite(String queryText, String modelId) { if (StringUtils.isBlank(queryText) || StringUtils.isBlank(modelId)) { throw new IllegalArgumentException( - String.format("%s and %s cannot be null", QUERY_TEXT_FIELD.getPreferredName(), MODEL_ID_FIELD.getPreferredName()) + String.format( + Locale.ROOT, + "%s and %s cannot be null", + QUERY_TEXT_FIELD.getPreferredName(), + MODEL_ID_FIELD.getPreferredName() + ) ); } }