Skip to content

skip null check in doMarshal JSON serializer #6807

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

Draft
RanVaknin wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

skip null check in doMarshal JSON serializer #6807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39456ce
Skip null non required fields in JsonProtocolMarshaller.doMarshall
RanVaknin Mar 19, 2026
1626e1b
Fix domarshall logic
RanVaknin Mar 20, 2026
f9e4340
Fix logic, add null suppression
RanVaknin Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,4 +523,12 @@
<Class name="software.amazon.awssdk.http.urlconnection.UrlConnectionSdkHttpService"/>
<Bug pattern="CT_CONSTRUCTOR_THROW"/>
</Match>

<!-- Intentionally passing null to marshallField for non-PAYLOAD fields
(PATH, HEADER, QUERY) whose NULL marshallers handle null validation. -->
<Match>
<Class name="software.amazon.awssdk.protocols.json.internal.marshall.JsonProtocolMarshaller"/>
<Method name="doMarshall"/>
<Bug pattern="NP_LOAD_OF_KNOWN_NULL_VALUE"/>
</Match>
</FindBugsFilter>
10 changes: 9 additions & 1 deletion .../java/software/amazon/awssdk/protocols/json/internal/marshall/JsonProtocolMarshaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import software.amazon.awssdk.core.protocol.MarshallLocation;
import software.amazon.awssdk.core.protocol.MarshallingType;
import software.amazon.awssdk.core.traits.PayloadTrait;
import software.amazon.awssdk.core.traits.RequiredTrait;
import software.amazon.awssdk.core.traits.TimestampFormatTrait;
import software.amazon.awssdk.core.traits.TraitType;
import software.amazon.awssdk.http.SdkHttpFullRequest;
Expand Down Expand Up @@ -212,8 +213,15 @@ void doMarshall(SdkPojo pojo) {
}
} else if (isExplicitPayloadMember(field)) {
marshallExplicitJsonPayload(field, val);
} else {
} else if (val != null) {
marshallField(field, val);
} else if (field.location() != MarshallLocation.PAYLOAD) {
marshallField(field, val);
} else if (field.containsTrait(RequiredTrait.class,
TraitType.REQUIRED_TRAIT)) {
throw new IllegalArgumentException(
String.format("Parameter '%s' must not be null",
field.locationName()));
}
}
}
Expand Down
Loading