Skip to content

Commit fa31ccf

Browse files
committed
Merge branch '2.15' into 2.16
2 parents a4294ab + ff57898 commit fa31ccf

File tree

3 files changed

+30
-2
lines changed

3 files changed

+30
-2
lines changed

release-notes/CREDITS-2.x

+5
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,11 @@ Dai Mikurube (dmikurube@github)
384384
from `FilteringParserDelegate`
385385
(2.15.3)
386386

387+
Simon Baslé (simonbasle@github)
388+
* Reported #1146: `JsonParserDelegate` missing overrides for `canParseAsync()`,
389+
`getNonBlockingInputFeeder()`
390+
(2.15.4)
391+
387392
Armin Samii (@artoonie)
388393
* Contributed #1050: Compare `_snapshotInfo` in `Version`
389394
(2.16.0)

release-notes/VERSION-2.x

+6
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ a pure JSON library.
5757
#1136: Change parsing error message to mention `-INF`
5858
- Make `JacksonFeatureSet` serializable
5959

60+
2.15.4 (not yet released)
61+
62+
#1146: `JsonParserDelegate` missing overrides for `canParseAsync()`,
63+
`getNonBlockingInputFeeder()`
64+
(reported by Simon B)
65+
6066
2.15.3 (12-Oct-2023)
6167

6268
#1111: Call the right `filterFinishArray()`/`filterFinishObject()`

src/main/java/com/fasterxml/jackson/core/util/JsonParserDelegate.java

+19-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.math.BigInteger;
88

99
import com.fasterxml.jackson.core.*;
10+
import com.fasterxml.jackson.core.async.NonBlockingInputFeeder;
1011

1112
/**
1213
* Helper class that implements
@@ -92,9 +93,25 @@ public StreamReadConstraints streamReadConstraints() {
9293
/**********************************************************************
9394
*/
9495

95-
@Override public boolean requiresCustomCodec() { return delegate.requiresCustomCodec(); }
96+
@Override
97+
public boolean canParseAsync() {
98+
return delegate.canParseAsync();
99+
}
100+
101+
@Override
102+
public NonBlockingInputFeeder getNonBlockingInputFeeder() {
103+
return delegate.getNonBlockingInputFeeder();
104+
}
96105

97-
@Override public JacksonFeatureSet<StreamReadCapability> getReadCapabilities() { return delegate.getReadCapabilities(); }
106+
@Override
107+
public JacksonFeatureSet<StreamReadCapability> getReadCapabilities() {
108+
return delegate.getReadCapabilities();
109+
}
110+
111+
@Override
112+
public boolean requiresCustomCodec() {
113+
return delegate.requiresCustomCodec();
114+
}
98115

99116
/*
100117
/**********************************************************************

0 commit comments

Comments
 (0)