Skip to content

Consistently declare @Nullable on parameter in equals() implementations#36075

Closed
MukjepScarlet wants to merge 1 commit intospring-projects:mainfrom
MukjepScarlet:nullable-equals
Closed

Consistently declare @Nullable on parameter in equals() implementations#36075
MukjepScarlet wants to merge 1 commit intospring-projects:mainfrom
MukjepScarlet:nullable-equals

Conversation

@MukjepScarlet
Copy link
Contributor

@MukjepScarlet MukjepScarlet commented Dec 26, 2025

String found: org.springframework.cglib.core.EmitUtils/KeyFactory
I don't know if they should be changed.

Reason: https://youtrack.jetbrains.com/projects/KT/issues/KT-83314/JSpecify-NullMarked-changes-Java-equalsObject-to-equalsAny-causing-override-conflict-in-Kotlin-2.3

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged or decided on label Dec 26, 2025
@MukjepScarlet MukjepScarlet changed the title fix: equals(@Nullable Object) fix: boolean equals(Object) should have nullable on parameter Dec 26, 2025
@sbrannen sbrannen changed the title fix: boolean equals(Object) should have nullable on parameter Consistently declare @Nullable on parameter in equals() impementations Dec 27, 2025
@sbrannen
Copy link
Member

sbrannen commented Dec 27, 2025 •
edited
Loading

String found: org.springframework.cglib.core.EmitUtils/KeyFactory
I don't know if they should be changed.

No, those are used to create a Signature which is used for bytecode generation.

More importantly, why did you add @Nullable to types in the cglib package and its subpackages?

As far as I can tell, none of those packages are @NullMarked, and we have never added nullability declarations to our fork of CGLIB.

Also, why did you introduce @Nullable in test classes?

@sbrannen sbrannen added the status: waiting-for-feedback We need additional information before we can continue label Dec 27, 2025
@sbrannen sbrannen self-assigned this Dec 27, 2025
@MukjepScarlet
Copy link
Contributor Author

MukjepScarlet commented Dec 27, 2025

I used text replacement... That's why there are unneeded replacements (in not @NullMarked packages this will be Any! in Kotlin). I can revert some of them of course.

@spring-projects-issues spring-projects-issues added status: feedback-provided Feedback has been provided and removed status: waiting-for-feedback We need additional information before we can continue labels Dec 27, 2025
@sbrannen
Copy link
Member

sbrannen commented Dec 27, 2025

I used text replacement... That's why there are unneeded replacements (in not @NullMarked packages this will be Any! in Kotlin). I can revert some of them of course.

Yes, please remove @Nullable declarations in packages that are not @NullMarked.

@MukjepScarlet
fix: equals(@nullable Object)
1eef584 
Signed-off-by: 木葉 Scarlet <93977077+mukjepscarlet@users.noreply.github.com>
@MukjepScarlet
Copy link
Contributor Author

MukjepScarlet commented Dec 27, 2025

Nullable in cglib package and test modules are removed now.

@sbrannen sbrannen added type: enhancement A general enhancement and removed status: waiting-for-triage An issue we've not yet triaged or decided on status: feedback-provided Feedback has been provided labels Dec 27, 2025
@sbrannen sbrannen added this to the 7.0.3 milestone Dec 27, 2025
@sbrannen sbrannen changed the title Consistently declare @Nullable on parameter in equals() impementations Consistently declare @Nullable on parameter in equals() implementations Dec 29, 2025
@sbrannen sbrannen closed this in d077e04 Dec 29, 2025
@sbrannen
Copy link
Member

sbrannen commented Dec 29, 2025

This has been merged into main.

Thanks

@MukjepScarlet MukjepScarlet deleted the nullable-equals branch December 29, 2025 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@sbrannen sbrannen

Labels

type: enhancement A general enhancement

Projects

None yet

Milestone

7.0.3

Development

Successfully merging this pull request may close these issues.

3 participants

@MukjepScarlet @sbrannen @spring-projects-issues