Fix SimpleMailMessage nullability annotations #29139
Closed
Conversation
This file contains 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
spring-projects-issues
added
the
status: waiting-for-triage
|
Apologies for the force push on my fork - forgot to set my git command line email properly and wanted to fix it. |
Fixes the nullability annotations in `SimpleMailMessage` so the `set*(...)` methods have their parameters marked as `@Nullable`. These method parameters had no annotations and when `SimpleMailMessage` is used from Kotlin with `-Xjsr305=strict` enabled, the `set*(...)` methods were treated as being marked `@NonNull`. This also meant Kotlin would not see matched pairs of get/set methods as `var` properties, so calling `message.text = "Text"` would not compile in Kotlin. Adds tests in `SimpleMailMessageJsr305ComplianceTests.kt` that verify the nullability annotations for `SimpleMailMessage` are correct. This file will actually fail to compile if the nullability annotations are missing, causing the tests to fail. Also modifies `spring-context-support.gradle` to force the Kotlin test code to compile with `-Xjsr305=strict`, enabling the test code to work properly.
Improves test code in `SimpleMailMessageJsr305ComplianceTests.kt`. Adds more comments and greatly simplified the unsafe vararg call helper function compared to its initial implementation. Adds a few extra tests as well.
sdeleuze
added
type: bug
|
Merged via fded79d without the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes the nullability annotations in
SimpleMailMessageso theset*(...)methods have their parameters marked as@Nullable.These method parameters had no annotations and when
SimpleMailMessageis used from Kotlin with-Xjsr305=strictenabled, theset*(...)methods were treated as being marked@NonNull. This also meant Kotlin would not see matched pairs of get/set methods asvarproperties, so callingmessage.text = "Text"would not compile in Kotlin.Adds tests in
SimpleMailMessageJsr305ComplianceTests.ktthat verify the nullability annotations forSimpleMailMessageare correct. This file will actually fail to compile if the nullability annotations are missing, causing the tests to fail.Also modifies
spring-context-support.gradleto force the Kotlin test code to compile with-Xjsr305=strict, enabling the test code to work properly.