Skip to content

[7.x] Add assert that raw and readable xcontent field names are different (#63332) #63343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 6, 2020
Merged

[7.x] Add assert that raw and readable xcontent field names are different (#63332) #63343

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions libs/x-content/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,8 @@ public XContentBuilder timeField(String name, Object timeValue) throws IOExcepti
* {@link Long} class.
*/
public XContentBuilder timeField(String name, String readableName, long value) throws IOException {
assert name.equals(readableName) == false :
"expected raw and readable field names to differ, but they were both: " + name;
if (humanReadable) {
Function<Object, Object> longTransformer = DATE_TRANSFORMERS.get(Long.class);
if (longTransformer == null) {
Expand Down Expand Up @@ -937,6 +939,8 @@ private XContentBuilder value(Iterable<?> values, boolean ensureNoSelfReferences
//////////////////////////////////

public XContentBuilder humanReadableField(String rawFieldName, String readableFieldName, Object value) throws IOException {
assert rawFieldName.equals(readableFieldName) == false :
"expected raw and readable field names to differ, but they were both: " + rawFieldName;
if (humanReadable) {
field(readableFieldName, Objects.toString(value));
}
Expand All @@ -956,6 +960,8 @@ public XContentBuilder humanReadableField(String rawFieldName, String readableFi


public XContentBuilder percentageField(String rawFieldName, String readableFieldName, double percentage) throws IOException {
assert rawFieldName.equals(readableFieldName) == false :
"expected raw and readable field names to differ, but they were both: " + rawFieldName;
if (humanReadable) {
field(readableFieldName, String.format(Locale.ROOT, "%1.1f%%", percentage));
}
Expand Down