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

Strict mode for JSON parsing #2323

Merged
merged 51 commits into from May 30, 2023
Merged

Strict mode for JSON parsing #2323

merged 51 commits into from May 30, 2023

Commits on Feb 23, 2023

  1. Feat #6: Add strict flag to Gson and GsonBuilder

    @marten-voorberg
    marten-voorberg committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    9b2d343 View commit details
    Browse the repository at this point in the history

  2. Test #2: Add failing tests for capitalized keywords

    @marten-voorberg
    marten-voorberg committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    fe6dd37 View commit details
    Browse the repository at this point in the history

  3. Feat #2: JsonReader does not read (partially) capitalized keywords if… 

    … strict mode is used
    @marten-voorberg
    marten-voorberg committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    a78764a View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2023

  1. Feat #3: Added implementation and tests for JSONReader not accepting … 

    …specific escape sequence representing in strict mode
    @marten-voorberg
    Carl Peterson authored and marten-voorberg committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    4895e8f View commit details
    Browse the repository at this point in the history

  2. Test #3: Simplify test cases by removing unnecessary array

    @marten-voorberg
    marten-voorberg committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    fd3f757 View commit details
    Browse the repository at this point in the history

  3. Feat #3: Improve error by including the illegal character

    @marten-voorberg
    marten-voorberg committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    0c28e0b View commit details
    Browse the repository at this point in the history

  4. Feat #5: JsonReader does not allow unespaced control flow characters … 

    …in strict mode
    @marten-voorberg
    marten-voorberg committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    947a312 View commit details
    Browse the repository at this point in the history

  5. Test #5: Test unespaced control flow characters in strict mode

    @marten-voorberg
    marten-voorberg committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    0f57cc9 View commit details
    Browse the repository at this point in the history

  6. Feat #4: Disallow espaced newline character in strict mode

    @marten-voorberg
    marten-voorberg committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    695159b View commit details
    Browse the repository at this point in the history

  7. Test #4: Add tests for (dis)allowing newline character depensding on … 

    …strictness
    @marten-voorberg
    marten-voorberg committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    bda7321 View commit details
    Browse the repository at this point in the history

  8. Test #5: Test case for unescaped control char in non-strict mode

    @marten-voorberg
    marten-voorberg committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    d438cbd View commit details
    Browse the repository at this point in the history

  9. Test #2: Simplify test cases

    @marten-voorberg
    marten-voorberg committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    23897d2 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin/master' 

    # Conflicts:
#	gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
    @marten-voorberg
    marten-voorberg committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    26463e7 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2023

  1. Feat #13: Change leniency API to Strictness enum in JsonReader, Gson,… 

    … and GsonBuilder
    @marten-voorberg
    marten-voorberg committed Feb 26, 2023
    Configuration menu
    Copy the full SHA
    d3950fa View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2023

  1. Feat #15: Change JsonWriter API to also use Strictness

    @marten-voorberg
    marten-voorberg committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    c303c61 View commit details
    Browse the repository at this point in the history

  2. Test #15: Test Strictness in JsonWriter API

    @marten-voorberg
    marten-voorberg committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    2b55804 View commit details
    Browse the repository at this point in the history

  3. Doc #15: Add and update documentation for Strictness in JsonWriter API

    @marten-voorberg
    marten-voorberg committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    d2a792b View commit details
    Browse the repository at this point in the history

  4. refactor #12: Fixed typos and empty catch brackets in tests

    @gustajoh @marten-voorberg
    gustajoh authored and marten-voorberg committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    0cd64da View commit details
    Browse the repository at this point in the history

  5. refactor #12: Resolved importing wildcards, made some lines adhere to… 

    … Google java style
    @gustajoh @marten-voorberg
    gustajoh authored and marten-voorberg committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    f2abd89 View commit details
    Browse the repository at this point in the history

  6. #5 Add test case for unescaped control characters 

    * Feat #5: add new lines to make JsonReader able to detect unescaped control characters (U+0000 through U+001F) and throw exceptions.

* Feat #5: add new lines to make JsonReader able to detect unescaped control characters (U+0000 through U+001F) and throw exceptions.

* Test #11: Added two tests for testing implementation of control character handling in strict mode and moved the implementation to nextQuotedValue

* Test #11: Added two tests for testing implementation of control character handling in strict mode and moved the implementation to nextQuotedValue

---------

Co-authored-by: LMC117 <2295699210@qq.com>
Co-authored-by: Marten Voorberg <martenvoorberg@gmail.com>
    @gustajoh @LMC117 @marten-voorberg
    3 people committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    d506d00 View commit details
    Browse the repository at this point in the history

  7. Doc #17: Add and change javadoc of public methods 

    * Doc #17: Update JavaDoc in JsonReader and Strictness

* Doc #17: Update JavaDoc in Gson and GsonBuilder
    @marten-voorberg
    marten-voorberg committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    7319777 View commit details
    Browse the repository at this point in the history

  8. Test #34: Add tests for setting strictness through GsonBuilder

    @marten-voorberg
    marten-voorberg committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    b29baa0 View commit details
    Browse the repository at this point in the history

  9. Fix: Add Fix broken test

    @marten-voorberg
    marten-voorberg committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    0af517b View commit details
    Browse the repository at this point in the history

  10. Fix: Invalid JavaDoc in Gson.java

    @marten-voorberg
    marten-voorberg committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    e44d1c3 View commit details
    Browse the repository at this point in the history

  11. Doc #17: update outdated javadoc

    @marten-voorberg
    marten-voorberg committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    15d7db6 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. #37: Resolve more PR feedback 

    * Fix #37: Resolve various PR comments

* Fix #37: Resolve various PR comments
    @marten-voorberg
    marten-voorberg committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    75f9c8c View commit details
    Browse the repository at this point in the history

  2. Refactor #35: Refactor JsonReader#peekKeyword to reduce the amount of… 

    … strictness checks (#39)
    @marten-voorberg
    marten-voorberg committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    a0a6c36 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. Doc #40: Update JavaDoc based on PR feedback

    @marten-voorberg
    marten-voorberg committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    77dff43 View commit details
    Browse the repository at this point in the history

  2. Doc #40: Update old RFC in GsonBuilder documentation

    @marten-voorberg
    marten-voorberg committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    664bf1c View commit details
    Browse the repository at this point in the history

  3. Doc #40: Fix formatting error in JavaDoc

    @marten-voorberg
    marten-voorberg committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    5e64e3c View commit details
    Browse the repository at this point in the history

  4. Doc #40: Add tests for setting strictness and lenient to JsonReaderTest

    @marten-voorberg
    marten-voorberg committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    0d65c62 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. Test #43: Changed tests to make use of assertThrows 

    * test #43: Changed tests to make use of assertThrows as per feedback

* Test #43: Update JsonWriterTest#testStrictnessNull to use assertThrows

* Test #43: Update JsonWriterTest#testStrictnessNull to use assertThrows

* test #43: Resolve PR recommendations

* Test #43: Mini change to TC

* Test #43: Mini change to TC

---------

Co-authored-by: Marten Voorberg <martenvoorberg@gmail.com>
    @gustajoh @marten-voorberg
    gustajoh and marten-voorberg committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    2b812f1 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. doc #46: Resolved comments in main PR

    @gustajoh @marten-voorberg
    gustajoh authored and marten-voorberg committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    d7fff3b View commit details
    Browse the repository at this point in the history

  2. Feat #45: Change Gson.fromJson and Gson.toJson to be strict when the … 

    …provided writer/reader is strict
    @marten-voorberg
    marten-voorberg committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    a821062 View commit details
    Browse the repository at this point in the history

  3. Fix #45: Small type

    @marten-voorberg
    marten-voorberg committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    ce04ac0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'google:master' into master

    @marten-voorberg
    marten-voorberg committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    7f7586d View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. Update gson/src/test/java/com/google/gson/stream/JsonReaderTest.java 

    Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
    @marten-voorberg @Marcono1234
    marten-voorberg and Marcono1234 committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    c0df07c View commit details
    Browse the repository at this point in the history

  2. Fix #45: Resolve various comments by Marcono1234

    @marten-voorberg
    marten-voorberg committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    8b63f54 View commit details
    Browse the repository at this point in the history

  3. Update gson/src/main/java/com/google/gson/GsonBuilder.java 

    Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
    @marten-voorberg @Marcono1234
    marten-voorberg and Marcono1234 committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    eaa0ed5 View commit details
    Browse the repository at this point in the history

  4. Fix #45: Resolve various comments by Marcono1234

    @marten-voorberg
    marten-voorberg committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    6a27a65 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/master'

    @marten-voorberg
    marten-voorberg committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    79295c8 View commit details
    Browse the repository at this point in the history

  6. Fix #45: Resolve various comments by eamonmcmanus

    @marten-voorberg
    marten-voorberg committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    d0a4065 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2023

  1. Strictness mode follow-up

    @Marcono1234 @marten-voorberg
    Marcono1234 authored and marten-voorberg committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    8453738 View commit details
    Browse the repository at this point in the history

  2. Update Troubleshooting.md and Gson default lenient mode documentation

    @Marcono1234 @marten-voorberg
    Marcono1234 authored and marten-voorberg committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    8593b57 View commit details
    Browse the repository at this point in the history

  3. Always use GSON strictness when set.

    @marten-voorberg
    marten-voorberg committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    9a7f33a View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Rename Strictness.DEFAULT to Strictness.LEGACY_STRICT

    @marten-voorberg
    marten-voorberg committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    4d0ea89 View commit details
    Browse the repository at this point in the history

  2. Update JavaDoc with new strictness functionality

    @marten-voorberg
    marten-voorberg committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    be59dd6 View commit details
    Browse the repository at this point in the history

  3. Replace default with legacy strict for JsonReader javadoc

    @marten-voorberg
    marten-voorberg committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    48bf90c View commit details
    Browse the repository at this point in the history

Commits on May 13, 2023

  1. Add JSONReader test cases for U2028 and U2029

    @marten-voorberg
    marten-voorberg committed May 13, 2023
    Configuration menu
    Copy the full SHA
    caaad5b View commit details
    Browse the repository at this point in the history

  2. Refactor JSONReader#peekKeyWord() based on @eamonmcmanus's suggestion

    @marten-voorberg
    marten-voorberg committed May 13, 2023
    Configuration menu
    Copy the full SHA
    39cd9a0 View commit details
    Browse the repository at this point in the history

  3. Deprecate setLenient in favor of setStrictness

    @marten-voorberg
    marten-voorberg committed May 13, 2023
    Configuration menu
    Copy the full SHA
    4342ef8 View commit details
    Browse the repository at this point in the history