Skip to content
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

Jump to bottom

Throw better exception on wrong dynamic_templates syntax #51783

Merged
merged 6 commits into from
Feb 4, 2020
Merged

Throw better exception on wrong dynamic_templates syntax #51783

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
41b90b3
Fix issue #51486
feifeiiiiiiiiiii Feb 1, 2020
62083e0
Fix style and add detail error information
feifeiiiiiiiiiii Feb 4, 2020
8e4460b
Add illegal dynamic templates test
feifeiiiiiiiiiii Feb 4, 2020
3537a18
Update server/src/main/java/org/elasticsearch/index/mapper/RootObject…
feifeiiiiiiiiiii Feb 4, 2020
fa73a21
Fix syntax error
feifeiiiiiiiiiii Feb 4, 2020
5775ade
Update test exception message
feifeiiiiiiiiiii Feb 4, 2020
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
3 changes: 3 additions & 0 deletions server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@ protected boolean processField(RootObjectMapper.Builder builder, String fieldNam
}
]
*/
if (!(fieldNode instanceof List)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small style nit: can you use ((fieldNode instanceof List) == false) instead? We prefer that kind of more verbose state to the negate operator for better readability throughout the codebase.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cbuescher ok I will fix for you suggest

throw new MapperParsingException("Dynamic template syntax error");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be good to provide some more information the user what went wrong. In this case it would be great to tell the user know that dynamic_templates expects an array of named objects or something along those lines.

}
List<?> tmplNodes = (List<?>) fieldNode;
List<DynamicTemplate> templates = new ArrayList<>();
for (Object tmplNode : tmplNodes) {
Expand Down