GH-10083 Add Nullability to the mapping package #10382
Merged
Conversation
This file contains hidden or 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
Related to: spring-projects#10083 * AbstractHeaderMapper.java - Enhanced null safety by adding @nullable annotations to fields and methods. * Updated method signatures to match those in AbstractHeaderMapper for the following classes: - DefaultAmqpHeaderMapper.java - DefaultSoapHeaderMapper.java - DefaultXmppHeaderMapper.java
cppwfs
force-pushed
the
GH-10083-core-mapping
branch
from
f349850 to
14a2d7c
Compare
artembilan
requested changes
Sep 4, 2025
...gration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java
Outdated
Show resolved
Hide resolved
...egration-core/src/main/java/org/springframework/integration/mapping/support/JsonHeaders.java
Outdated
Show resolved
Hide resolved
Add Contract for buildResolvableType where the first param can be anything, and if the 2 or 3 value is not null, it will return a not null.
artembilan
requested changes
Sep 4, 2025
| * @since 5.2.4 | ||
| */ | ||
| public static ResolvableType buildResolvableType(@Nullable Class<?> targetClass, @Nullable Class<?> contentClass, | ||
| @Contract("_, !null, _ -> !null; _, _, !null -> !null") |
There was a problem hiding this comment.
This is wrong.
The method does not return null at all.
See getClassForValue().
That's where the @Contract has to be.
| Class<?> keyClass = getClassForValue(classLoader, keyClassValue); | ||
| Class<?> contentClass = getClassForValue(classLoader, contentClassValue); | ||
|
|
||
| Assert.notNull(targetClass, "targetClass must not be null"); |
There was a problem hiding this comment.
When you fix getClassForValue() with the @Contract, this is not necessary.
| return buildResolvableType(targetClass, contentClass, keyClass); | ||
| } | ||
|
|
||
| @Nullable |
There was a problem hiding this comment.
Please, move this next to the return type.
Remove associated Assert.state.
artembilan
approved these changes
Sep 4, 2025
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.
Related to: #10083