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

Improve resiliency to formatting JSON in server #48553

Merged
merged 6 commits into from
Oct 30, 2019
Merged

Improve resiliency to formatting JSON in server #48553

merged 6 commits into from
Oct 30, 2019

Commits on Oct 26, 2019

  1. Improve resiliency to formatting JSON in server 

    Make a number of changes so that JSON in the server directory is more
resilient to automatic formatting. This covers:

   * Reformatting multiline JSON to embed whitespace in the strings
   * 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.
    @pugnascotia
    pugnascotia committed Oct 26, 2019
    Configuration menu
    Copy the full SHA
    f9b15a2 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2019

  1. Rename JSON helper to stripWhiteSpace

    @pugnascotia
    pugnascotia committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    a046bf3 View commit details
    Browse the repository at this point in the history

  2. Fix silly camel-casing

    @pugnascotia
    pugnascotia committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    d761c27 View commit details
    Browse the repository at this point in the history

  3. Remove some old formatter tags that were missed

    @pugnascotia
    pugnascotia committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    5c72c53 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master' into formatting-fixes-… 

    …server-json
    @pugnascotia
    pugnascotia committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    070eb31 View commit details
    Browse the repository at this point in the history

  5. Fix test failure

    @pugnascotia
    pugnascotia committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    30fd405 View commit details
    Browse the repository at this point in the history