* Fix DateFormat time zone is not restored and add Test.
* delete the test and make sure mvn clean test -X can be SUCCESS
* delete the test and make sure mvn clean test -X can be SUCCESS
* add test
* restore the DateFormat time zone in SqlDateTypeAdapter and SqlTimeTypeAdapter
* Adjust the code according to the code review feedback.
* Adjust the code according to the code review feedback.
* Adjust the code according to the code review feedback.
* Adjust the Test
* fix Werror error
* Adjust the DefaultDateTypeAdapterTest according to the code review feedback.
---------
Co-authored-by: Carpe-Wang <wangcarpe@126.com>
* Add CI build using JDK 21
This is mainly to make sure that besides the known JDK 21 build
incompatibilities Gson can be built and run using JDK 21.
* Update ProGuard
* Update Protobuf
3.25.1 is actually newer than 4.0.0-rc-2
* Perform minor code clean-up
Notable changes:
- Replace most usages of `<code>` with `{@code ...}` in Javadoc
- Add proper summary sentence to `GsonBuilder.enableComplexMapKeySerialization`
- Extend documentation for `GsonBuilder.setDateFormat` methods
- Fix `TypeToken.isAssignableFrom(Type)` throwing AssertionError in some cases
Maybe the method should not throw an exception in the first place, but it
might not matter much since it is deprecated already anyway.
- Remove outdated `throws NumberFormatException` from internal
`JsonReader.nextQuotedValue`; the behavior had been changed by
85ebaf7c35
- Fix incorrect documentation on JsonScope fields
- Fix unit tests having 'expected' and 'actual' switched
- Use dedicated Truth methods instead of `isTrue()` / `isFalse()`
- Use common helper methods in JsonWriterTest to avoid duplication
* Implement `toString()` for ReflectionAccessFilter constants
* Address most of the review comments
* Add comment about `source.scm.tag=HEAD` warning
Actually it looks like the warning is not actually caused by usage of
`HEAD` as value, but rather because the project has a snapshot version
during development (which is expected though), see
https://github.com/apache/maven-artifact-plugin/blob/maven-artifact-plugin-3.5.0/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildInfoWriter.java#L140
But this is not a problem either since during release a non-snapshot
version is used.
`DateFormat` validates these arguments as well, but it is currently not
documented, see https://bugs.openjdk.org/browse/JDK-8319628.
Also moves the other tests for `setDateFormat(String)` from
DefaultTypeAdaptersTest to GsonBuilderTest.
However, it might still be necessary to use the same OS and JDK version
to actually be able to create identical artifacts.
This commit also formats the `pom.xml` files in the way the Maven Release
Plugin would.
* validating the date format, add test case, since NumberFormatException extends IllegalArgumentException, it is only necessary to write IllegalArgumentException.
* Apply code formatting with Spotless
---------
Co-authored-by: Carpe-Wang <wangcarpe@126.com>
* Formatting follow-up
- Adds formatting commits to .git-blame-ignore-revs so that they don't
distract during Git blame
- Restores hard line breaks in Troubleshooting.md using `\` instead of
trailing spaces
- Changes formatting of some string literals and comments
- Fixes accidental Javadoc and comment issues introduced by manual changes
of formatting commit
- Fixes license header in $Gson$Types.java erroneously being a Javadoc
comment and being reformatted
- Slightly changes `JsonReader` `getPath` and `getPreviousPath` documentation
to help Javadoc detect first sentence as summary
* Remove `spotless:off` markers
* Add empty line before comment
* Check format for .github YAML files
* Code changes and tests for #2436 to throw exception when trying to register adapter for Object or JsonElement
* #2436 - Updates to User guide & comments to indicate exception cases and fix for 7 test cases of Parameterized Type
* #2436 - Fixes as per the review comments.
* #2436 - Refactored as per latest review comments + throwing error message.
* #2436 - added a clarifying comment in a positive test case.
* #2436 - formatting and minor changes as per review.
* Update gson/src/main/java/com/google/gson/GsonBuilder.java
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
* Update gson/src/test/java/com/google/gson/GsonBuilderTest.java
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
* Update gson/src/test/java/com/google/gson/GsonBuilderTest.java
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
---------
Co-authored-by: Sachin Patil <sachin.patil2@capitalone.com>
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
* Only create one BoundField instance per field in ReflectiveTypeAdapterFactory
Instead of creating a BoundField for every possible name of a field (for
SerializedName usage) and then storing for that BoundField whether it is
serialized or deserialized, instead only create one BoundField and then have
a separate Map<String, BoundField> for deserialized fields, and a separate
List<BoundField> for serialized fields.
* Fix indentation
Recent versions of javac emit a warning if a serializable class has
a non-transient instance field with a declared type that does not
inherit `Serializable`. In this context, we know that the actual
values will always be serializable.
Previous fix in 392cc65ff3 only covered writing
name as top level value, but not when trying to write name inside JSON array.
Removed `stackSize == 0` check from `JsonWriter.name` because that is done
already by `peek()` call.
* Document how `JsonAdapter` creates adapter instances & add tests
* Extend `JsonAdapter.nullSafe()` documentation
* Improve test for JsonAdapter factory returning null
Existing test `JsonAdapterNullSafeTest` had misleading comments; while it
did in the end detect if null had not been handled correctly, that only
worked because the field `JsonAdapterFactory.recursiveCall` is static and
one test method therefore affected the state of the other test method.
If the test methods were run separately in different test runs, they would
not have detected if null was handled correctly, because the factory would
not have returned null.
* Extend JsonAdapter nullSafe test
* Extend test
* Fix `Gson.getDelegateAdapter` not working properly for `JsonAdapter`
* Address review feedback and add comments regarding thread-safety
* Revert InstanceCreator instance validation
* Disallow `null` as `skipPast`
* Avoid `equals` usage in `getDelegateAdapter` & minor other changes
Previously `getDelegateAdapter` called `factories.contains(skipPast)`,
but unlike the other comparisons which check for reference equality,
that would have used the `equals` method.
This could lead to spurious "GSON cannot serialize ..." exceptions
if two factory instances compared equal, but the one provided as
`skipPast` had not been registered yet.
* Prevent `TypeToken` from capturing type variables
* Use hyphen for term "type-safe"
Not completely sure if that is grammatically correct, but it might make the
text a bit easier to understand.
* Update Troubleshooting Guide URLs in tests from 'master' to 'main'
* Rename system property
* Simplify system property check
* Add integration test for GraalVM Native Image
* Enable 'quickBuild' mode
Seems to improve build speed, and at least for the previous issue with
`RecordComponent` still causes test failures (as expected) if the fix
is reverted.
* Strict mode for JSON parsing (#2323)
* Feat #6: Add strict flag to Gson and GsonBuilder
* Test #2: Add failing tests for capitalized keywords
* Feat #2: JsonReader does not read (partially) capitalized keywords if strict mode is used
* Feat #3: Added implementation and tests for JSONReader not accepting specific escape sequence representing in strict mode
* Test #3: Simplify test cases by removing unnecessary array
* Feat #3: Improve error by including the illegal character
* Feat #5: JsonReader does not allow unespaced control flow characters in strict mode
* Test #5: Test unespaced control flow characters in strict mode
* Feat #4: Disallow espaced newline character in strict mode
* Test #4: Add tests for (dis)allowing newline character depensding on strictness
* Test #5: Test case for unescaped control char in non-strict mode
* Test #2: Simplify test cases
* Feat #13: Change leniency API to Strictness enum in JsonReader, Gson, and GsonBuilder
* Feat #15: Change JsonWriter API to also use Strictness
* Test #15: Test Strictness in JsonWriter API
* Doc #15: Add and update documentation for Strictness in JsonWriter API
* refactor #12: Fixed typos and empty catch brackets in tests
* refactor #12: Resolved importing wildcards, made some lines adhere to Google java style
* #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>
* 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
* Test #34: Add tests for setting strictness through GsonBuilder
* Fix: Add Fix broken test
* Fix: Invalid JavaDoc in Gson.java
* Doc #17: update outdated javadoc
* #37: Resolve more PR feedback
* Fix#37: Resolve various PR comments
* Fix#37: Resolve various PR comments
* Refactor #35: Refactor JsonReader#peekKeyword to reduce the amount of strictness checks (#39)
* Doc #40: Update JavaDoc based on PR feedback
* Doc #40: Update old RFC in GsonBuilder documentation
* Doc #40: Fix formatting error in JavaDoc
* Doc #40: Add tests for setting strictness and lenient to JsonReaderTest
* 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>
* doc #46: Resolved comments in main PR
* Feat #45: Change Gson.fromJson and Gson.toJson to be strict when the provided writer/reader is strict
* Fix#45: Small type
* Update gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
* Fix#45: Resolve various comments by Marcono1234
* Update gson/src/main/java/com/google/gson/GsonBuilder.java
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
* Fix#45: Resolve various comments by Marcono1234
* Fix#45: Resolve various comments by eamonmcmanus
* Strictness mode follow-up
* Update Troubleshooting.md and Gson default lenient mode documentation
* Always use GSON strictness when set.
* Rename Strictness.DEFAULT to Strictness.LEGACY_STRICT
* Update JavaDoc with new strictness functionality
* Replace default with legacy strict for JsonReader javadoc
* Add JSONReader test cases for U2028 and U2029
* Refactor JSONReader#peekKeyWord() based on @eamonmcmanus's suggestion
* Deprecate setLenient in favor of setStrictness
---------
Co-authored-by: Carl Peterson <unknown>
Co-authored-by: Gustaf Johansson <gustajoh@kth.se>
Co-authored-by: gustajoh <58432871+gustajoh@users.noreply.github.com>
Co-authored-by: LMC117 <2295699210@qq.com>
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
* Strictness follow-up (#2408)
* Strictness mode follow-up
- Remove mentions of `null` Gson strictness; this is an implementation detail
- Fix incorrect / outdated documentation
- Reduce links to RFC; if there is already a link to it in a previous sentence
don't link to it again
- Extend and update tests
- Minor punctuation changes in documentation for consistency
* Deprecate `setLenient` methods
* `strictness2` fixes & improvements (#2456)
* Adjust ProGuard default rules and shrinking tests (#2420)
* Adjust ProGuard default rules and shrinking tests
* Adjust comment
* Add shrinking test for class without no-args constructor; improve docs
* Improve Unsafe mention in Troubleshooting Guide
* Improve comment for `-if class *`
* Bump com.google.guava:guava from 32.0.1-jre to 32.1.1-jre (#2444)
Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.0.1-jre to 32.1.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)
---
updated-dependencies:
- dependency-name: com.google.guava:guava
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump com.google.guava:guava-testlib from 32.0.1-jre to 32.1.1-jre (#2443)
Bumps [com.google.guava:guava-testlib](https://github.com/google/guava) from 32.0.1-jre to 32.1.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)
---
updated-dependencies:
- dependency-name: com.google.guava:guava-testlib
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Support non-generic type for `TypeToken.getParameterized` for legacy reasons (#2447)
This partially restores the behavior before a589ef2008,
except that back then for a non-generic type a bogus `TypeToken(ParameterizedType)`
was created, whereas now a `TypeToken(Class)` is created instead.
* Fixed Typo in GsonBuilder.java (#2449)
* Make date-formatting tests less fragile with regular expressions. (#2450)
* Make date-formatting tests less fragile with regular expressions.
This is not great. We should really ensure that formatted dates are the same
regardless of JDK version. There is code that attempts to do that but it is not
really effective. So for now we fudge around the differences by using regular
expressions to paper over the differences.
* Temporarily add test-debugging code.
* Another attempt at debugging a test failure.
* Fix pattern in assertion.
* Modification in test cases (#2454)
* Fixed Typo in GsonBuilder.java
* Suggestions on Test cases
* Modified test cases using assertThrows method (JUnit)
* Update gson/src/test/java/com/google/gson/JsonArrayAsListTest.java
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
* Update gson/src/test/java/com/google/gson/GsonTest.java
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
* Update gson/src/test/java/com/google/gson/JsonArrayAsListTest.java
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
* Update gson/src/test/java/com/google/gson/JsonStreamParserTest.java
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
* Update gson/src/test/java/com/google/gson/JsonStreamParserTest.java
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
* Update gson/src/test/java/com/google/gson/JsonStreamParserTest.java
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
* Update gson/src/test/java/com/google/gson/ToNumberPolicyTest.java
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
* Update gson/src/test/java/com/google/gson/TypeAdapterTest.java
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
* Update gson/src/test/java/com/google/gson/TypeAdapterTest.java
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
* Update gson/src/test/java/com/google/gson/ToNumberPolicyTest.java
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
* Update gson/src/test/java/com/google/gson/ToNumberPolicyTest.java
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
---------
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
* Minor follow-up changes
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: elevne <97422844+elevne@users.noreply.github.com>
Co-authored-by: Éamonn McManus <emcmanus@google.com>
Co-authored-by: Wonil <cwi5525@naver.com>
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Marten <martenvoorberg@gmail.com>
Co-authored-by: Gustaf Johansson <gustajoh@kth.se>
Co-authored-by: gustajoh <58432871+gustajoh@users.noreply.github.com>
Co-authored-by: LMC117 <2295699210@qq.com>
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: elevne <97422844+elevne@users.noreply.github.com>
Co-authored-by: Wonil <cwi5525@naver.com>
* Make date-formatting tests less fragile with regular expressions.
This is not great. We should really ensure that formatted dates are the same
regardless of JDK version. There is code that attempts to do that but it is not
really effective. So for now we fudge around the differences by using regular
expressions to paper over the differences.
* Temporarily add test-debugging code.
* Another attempt at debugging a test failure.
* Fix pattern in assertion.
This partially restores the behavior before a589ef2008,
except that back then for a non-generic type a bogus `TypeToken(ParameterizedType)`
was created, whereas now a `TypeToken(Class)` is created instead.
* Adjust ProGuard default rules and shrinking tests
* Adjust comment
* Add shrinking test for class without no-args constructor; improve docs
* Improve Unsafe mention in Troubleshooting Guide
* Improve comment for `-if class *`