Skip to content

(WIP) Fix #1418: last test passes #1499

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

Closed
wants to merge 3 commits into from
Closed

(WIP) Fix #1418: last test passes #1499

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
7301d3c
(WIP) Fix #1418: last test passes
cowtowncoder Nov 3, 2025
d9c3182
Merge branch '2.x' into tatu-claude/2.21/1418-fix-filteri
cowtowncoder Nov 4, 2025
6ad7821
Remove extra import stmts
cowtowncoder Nov 13, 2025
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
23 changes: 23 additions & 0 deletions src/main/java/com/fasterxml/jackson/core/filter/FilteringParserDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,8 +672,22 @@ protected final JsonToken _nextToken2() throws IOException
f = _headContext.getFilter();
if ((f != null) && (f != TokenFilter.INCLUDE_ALL)) {
boolean includeEmpty = f.includeEmptyObject(_headContext.hasCurrentName());
// [core#1418]: If object is empty (start not handled), parent is an array,
// and parent wants to include empty arrays, include this empty object
// to preserve array structure
if (!includeEmpty && !returnEnd && _headContext._parent != null
&& _headContext._parent.inArray()) {
TokenFilter parentFilter = _headContext._parent.getFilter();
if ((parentFilter != null) && (parentFilter != TokenFilter.INCLUDE_ALL)) {
includeEmpty = parentFilter.includeEmptyArray(_headContext._parent.hasCurrentIndex());
}
}
f.filterFinishObject();
if (includeEmpty) {
_headContext._currentName = _headContext._parent == null
? null
: _headContext._parent._currentName;
_headContext._needToHandleName = false;
return _nextBuffered(_headContext);
} }
_headContext = _headContext.getParent();
Expand Down Expand Up @@ -847,6 +861,15 @@ protected final JsonToken _nextTokenWithBuffering(final TokenFilterContext buffR
f = _headContext.getFilter();
if ((f != null) && (f != TokenFilter.INCLUDE_ALL)) {
boolean includeEmpty = f.includeEmptyObject(_headContext.hasCurrentName());
// [core#1418]: If parent is an array and wants to include empty arrays,
// include this empty object to preserve array structure
if (!includeEmpty && _headContext._parent != null
&& _headContext._parent.inArray()) {
TokenFilter parentFilter = _headContext._parent.getFilter();
if ((parentFilter != null) && (parentFilter != TokenFilter.INCLUDE_ALL)) {
includeEmpty = parentFilter.includeEmptyArray(_headContext._parent.hasCurrentIndex());
}
}
f.filterFinishObject();
if (includeEmpty) {
_headContext._currentName = _headContext._parent == null
Expand Down
8 changes: 2 additions & 6 deletions ...core/tofix/ParserFilterEmpty1418Test.java → ...ore/filter/ParserFilterEmpty1418Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
package com.fasterxml.jackson.core.tofix;
package com.fasterxml.jackson.core.filter;

import org.junit.jupiter.api.Test;

import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.core.filter.FilteringParserDelegate;
import com.fasterxml.jackson.core.filter.TokenFilter;
import com.fasterxml.jackson.core.filter.TokenFilter.Inclusion;
import com.fasterxml.jackson.core.testutil.failure.JacksonTestFailureExpected;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
Expand Down Expand Up @@ -39,8 +36,7 @@ public boolean includeEmptyArray(boolean contentsFiltered) {

private final JsonFactory JSON_F = newStreamFactory();

// [core#1418]: case #1: failing
@JacksonTestFailureExpected
// [core#1418]: case #1
@Test
void filterArrayWithObjectsEndingWithFilteredProperty1() throws Exception
{
Expand Down