Skip to content

Make JsonGenerator::writeTypePrefix method to not make a WRAPPER_ARRAY when typeIdDef.id == null #1356

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

Merged
merged 4 commits into from
Nov 9, 2024
+91 −49
Merged

Make JsonGenerator::writeTypePrefix method to not make a WRAPPER_ARRAY when typeIdDef.id == null #1356

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5cd1043
fix: Make JsonGenerator::writeTypePrefix method to not make a WRAPPER…
Gems Nov 5, 2024
c6bc936
feat: Skip writing type prefix wrapper in case typeDef.is is null
Gems Nov 7, 2024
201ed2b
Add release notes; streamline code; minor logic changes (since I'm fa…
cowtowncoder Nov 8, 2024
a5f17c3
Revert my earlier misguided simplification (need START_OBJECT/ARRAY f…
cowtowncoder Nov 9, 2024
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
4 changes: 3 additions & 1 deletion src/main/java/com/fasterxml/jackson/core/JsonGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.Objects;

import com.fasterxml.jackson.core.JsonParser.NumberType;
import com.fasterxml.jackson.core.exc.StreamWriteException;
Expand Down Expand Up @@ -1978,12 +1979,13 @@ public WritableTypeId writeTypePrefix(WritableTypeId typeIdDef) throws IOExcepti
} else {
// No native type id; write wrappers
// Normally we only support String type ids (non-String reserved for native type ids)
String idStr = (id instanceof String) ? (String) id : String.valueOf(id);
String idStr = (id instanceof String) ? (String) id : Objects.toString(id, null);
typeIdDef.wrapperWritten = true;

Inclusion incl = typeIdDef.include;
// first: can not output "as property" if value not Object; if so, must do "as array"
if ((valueShape != JsonToken.START_OBJECT)
&& idStr != null
&& incl.requiresObjectContext()) {
typeIdDef.include = incl = WritableTypeId.Inclusion.WRAPPER_ARRAY;
}
Expand Down