Skip to content

Commit

Permalink
add locale to String.format
Browse files Browse the repository at this point in the history
Signed-off-by: zhichao-aws <[email protected]>
  • Loading branch information
zhichao-aws committed Sep 27, 2023
1 parent aae62d4 commit 2d51bb9
Showing 1 changed file with 12 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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(),
Expand All @@ -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;
Expand All @@ -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)
);
}
}
Expand Down Expand Up @@ -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()
)
);
}
}
Expand Down

0 comments on commit 2d51bb9

Please sign in to comment.