Improve resiliency to auto-formatting in server#48940
Merged
pugnascotia merged 1 commit intoelastic:7.xfrom Nov 11, 2019
Merged
Improve resiliency to auto-formatting in server#48940pugnascotia merged 1 commit intoelastic:7.xfrom
pugnascotia merged 1 commit intoelastic:7.xfrom
Conversation
Make a number of changes so that code in the `server` directory is more resilient to automatic formatting. This covers: * Reformatting multiline JSON to embed whitespace in the strings * Move some comments around to they aren't auto-formatted to a strange place. This also required moving some `&&` and `||` operators from the end-of-line to start-of-line`. * Add helper method `reformatJson()`, to strip whitespace from a JSON document using XContent methods. This is sometimes necessary where a test is comparing some machine-generated JSON with an expected value. Also, `HyperLogLogPlusPlus.java` is now excluded from formatting because it contains large data tables that don't reformat well with the current settings, and changing the settings would be worse for the rest of the codebase.
Collaborator
|
Pinging @elastic/es-core-infra (:Core/Infra/Core) |
Contributor
Author
|
@elasticmachine run elasticsearch-ci/1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #48450.
Make a number of changes so that code in the
serverdirectory is moreresilient to automatic formatting. This covers:
place. This also required moving some
&&and||operators from theend-of-line to start-of-line`.
reformatJson(), to strip whitespace from a JSONdocument using XContent methods. This is sometimes necessary where
a test is comparing some machine-generated JSON with an expected
value.
Also,
HyperLogLogPlusPlus.javais now excluded from formatting because itcontains large data tables that don't reformat well with the current settings,
and changing the settings would be worse for the rest of the codebase.