Skip to content

Commit f258201

Browse files
cowtowncodercowtowncoder
committed
Merge branch '2.x' into 3.0
2 parents d295931 + 84ff962 commit f258201

19 files changed

+999
-65
lines changed

‎attic/ImmutableBitSet.java‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
package com.fasterxml.jackson.databind.util;
2+
3+
import java.util.BitSet;
4+
5+
public class ImmutableBitSet extends BitSet
6+
{
7+
private static final long serialVersionUID = 1L;
8+
9+
private ImmutableBitSet(BitSet bits) {
10+
super();
11+
_parentOr(bits);
12+
}
13+
14+
public static ImmutableBitSet of(BitSet bits) {
15+
return new ImmutableBitSet(bits);
16+
}
17+
18+
private void _parentOr(BitSet set) {
19+
super.or(set);
20+
}
21+
22+
@Override
23+
public void and(BitSet set) {
24+
_failMutableOperation();
25+
}
26+
27+
@Override
28+
public void andNot(BitSet set) {
29+
_failMutableOperation();
30+
}
31+
32+
@Override
33+
public void or(BitSet set) {
34+
_failMutableOperation();
35+
}
36+
37+
@Override
38+
public void xor(BitSet set) {
39+
_failMutableOperation();
40+
}
41+
42+
@Override
43+
public void clear() {
44+
_failMutableOperation();
45+
}
46+
47+
@Override
48+
public void clear(int ix) {
49+
_failMutableOperation();
50+
}
51+
52+
@Override
53+
public void clear(int from, int to) {
54+
_failMutableOperation();
55+
}
56+
57+
@Override
58+
public void flip(int bitIndex) {
59+
_failMutableOperation();
60+
}
61+
62+
@Override
63+
public void flip(int from, int to) {
64+
_failMutableOperation();
65+
}
66+
67+
@Override
68+
public void set(int bitIndex) {
69+
_failMutableOperation();
70+
}
71+
72+
@Override
73+
public void set(int bitIndex, boolean state) {
74+
_failMutableOperation();
75+
}
76+
77+
@Override
78+
public void set(int from, int to) {
79+
_failMutableOperation();
80+
}
81+
82+
private void _failMutableOperation() {
83+
throw new UnsupportedOperationException("ImmutableBitSet does not support modification");
84+
}
85+
}

‎release-notes/CREDITS-2.x‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1966,6 +1966,8 @@ Giulio Longfils (@giulong)
19661966
* Contributed #4218: If `@JacksonInject` is specified for field and deserialized by
19671967
the Creator, the inject process will be executed twice
19681968
(2.20.0)
1969+
* Contributed #1381: Add a way to specify "inject-only" with `@JacksonInject`
1970+
(2.21.0)
19691971

19701972
Plamen Tanov (@ptanov)
19711973
* Reported #2678: `@JacksonInject` added to property overrides value from the JSON

‎release-notes/VERSION-2.x‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Project: jackson-databind
66

77
2.21.0 (not yet released)
88

9+
#1381: Add a way to specify "inject-only" with `@JacksonInject`
10+
(fix by Giulio L)
911
#1547: Un-deprecate `SerializationFeature.WRITE_EMPTY_JSON_ARRAYS`
1012
#5045: If there is a no-parameter constructor marked as `JsonCreator` and
1113
a constructor reported as `DefaultCreator`, latter is incorrectly used

‎src/main/java/tools/jackson/databind/DeserializationContext.java‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import java.text.ParseException;
55
import java.util.*;
66

7-
import com.fasterxml.jackson.annotation.JacksonInject;
87
import com.fasterxml.jackson.annotation.JsonFormat;
98
import com.fasterxml.jackson.annotation.ObjectIdGenerator;
109
import com.fasterxml.jackson.annotation.ObjectIdResolver;
@@ -476,18 +475,11 @@ public final boolean isEnabled(StreamReadCapability cap) {
476475
public final Object findInjectableValue(Object valueId,
477476
BeanProperty forProperty, Object beanInstance, Boolean optional, Boolean useInput)
478477
{
479-
if (_injectableValues == null) {
480-
// `optional` comes from property annotation (if any); has precedence
481-
// over global setting.
482-
if (Boolean.TRUE.equals(optional)
483-
|| (optional == null && !isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_INJECT_VALUE))) {
484-
return JacksonInject.Value.empty();
485-
}
486-
throw missingInjectableValueException(String.format(
487-
"No 'injectableValues' configured, cannot inject value with id '%s'", valueId),
488-
valueId, forProperty, beanInstance);
478+
InjectableValues injectables = _injectableValues;
479+
if (injectables == null) {
480+
injectables = InjectableValues.empty();
489481
}
490-
return _injectableValues.findInjectableValue(this, valueId, forProperty, beanInstance,
482+
return injectables.findInjectableValue(this, valueId, forProperty, beanInstance,
491483
optional, useInput);
492484
}
493485

‎src/main/java/tools/jackson/databind/InjectableValues.java‎

Lines changed: 93 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
public abstract class InjectableValues
1414
implements Snapshottable<InjectableValues>
1515
{
16+
public static InjectableValues empty() {
17+
return InjectableValues.Empty.INSTANCE;
18+
}
19+
1620
/**
1721
* Method called to find value identified by id <code>valueId</code> to
1822
* inject as value of specified property during deserialization, passing
@@ -36,17 +40,99 @@ public abstract Object findInjectableValue(DeserializationContext ctxt,
3640
throws JacksonException;
3741

3842
/*
39-
/**********************************************************
40-
/* Standard implementation
41-
/**********************************************************
43+
/**********************************************************************
44+
/* Standard implementations
45+
/**********************************************************************
4246
*/
4347

48+
/**
49+
* Shared intermediate base class for standard implementations.
50+
*/
51+
public abstract static class Base
52+
extends InjectableValues
53+
implements java.io.Serializable
54+
{
55+
private static final long serialVersionUID = 1L;
56+
57+
protected String _validateKey(DeserializationContext ctxt, Object valueId,
58+
BeanProperty forProperty, Object beanInstance)
59+
throws JacksonException
60+
{
61+
if (!(valueId instanceof String)) {
62+
throw ctxt.missingInjectableValueException(
63+
String.format(
64+
"Unsupported injectable value id type (%s), expecting String",
65+
ClassUtil.classNameOf(valueId)),
66+
valueId, forProperty, beanInstance);
67+
}
68+
return (String) valueId;
69+
}
70+
71+
protected Object _handleMissingValue(DeserializationContext ctxt, String key,
72+
BeanProperty forProperty, Object beanInstance,
73+
Boolean optionalConfig, Boolean useInputConfig)
74+
throws JacksonException
75+
{
76+
// Different defaulting fo "optional" (default to FALSE) and
77+
// "useInput" (default to TRUE)
78+
79+
final boolean optional = Boolean.TRUE.equals(optionalConfig);
80+
final boolean useInput = Boolean.TRUE.equals(useInputConfig);
81+
82+
// [databind#1381]: 14-Nov-2025, tatu: This is a mess: (1) and (2) make sense
83+
// but (3) is debatable. However, for backward compatibility this is what
84+
// passes tests we have.
85+
86+
// Missing ok if:
87+
//
88+
// 1. `optional` is TRUE
89+
// 2. FAIL_ON_UNKNOWN_INJECT_VALUE is disabled
90+
// 3. `useInput` is TRUE and injection is NOT via constructor (implied
91+
// by beanInstance being non-null)
92+
if (optional
93+
|| !ctxt.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_INJECT_VALUE)
94+
|| (useInput && beanInstance != null)
95+
) {
96+
return null;
97+
}
98+
throw ctxt.missingInjectableValueException(
99+
String.format("No injectable value with id '%s' found (for property '%s')",
100+
key, forProperty.getName()),
101+
key, forProperty, beanInstance);
102+
}
103+
}
104+
105+
private static final class Empty
106+
extends Base
107+
implements java.io.Serializable
108+
{
109+
private static final long serialVersionUID = 1L;
110+
111+
final static Empty INSTANCE = new Empty();
112+
113+
@Override
114+
public Empty snapshot() {
115+
return this;
116+
}
117+
118+
@Override
119+
public Object findInjectableValue(DeserializationContext ctxt, Object valueId,
120+
BeanProperty forProperty, Object beanInstance,
121+
Boolean optional, Boolean useInput)
122+
throws JacksonException
123+
{
124+
final String key = _validateKey(ctxt, valueId, forProperty, beanInstance);
125+
return _handleMissingValue(ctxt, key, forProperty, beanInstance,
126+
optional, useInput);
127+
}
128+
}
129+
44130
/**
45131
* Simple standard implementation which uses a simple Map to
46132
* store values to inject, identified by simple String keys.
47133
*/
48134
public static class Std
49-
extends InjectableValues
135+
extends Base
50136
implements java.io.Serializable
51137
{
52138
private static final long serialVersionUID = 1L;
@@ -85,24 +171,11 @@ public Object findInjectableValue(DeserializationContext ctxt,
85171
BeanProperty forProperty, Object beanInstance,
86172
Boolean optional, Boolean useInput)
87173
{
88-
if (!(valueId instanceof String)) {
89-
throw ctxt.missingInjectableValueException(
90-
String.format(
91-
"Unsupported injectable value id type (%s), expecting String",
92-
ClassUtil.classNameOf(valueId)),
93-
valueId, forProperty, beanInstance);
94-
}
95-
String key = (String) valueId;
174+
String key = _validateKey(ctxt, valueId, forProperty, beanInstance);
96175
Object ob = _values.get(key);
97176
if (ob == null && !_values.containsKey(key)) {
98-
if (Boolean.FALSE.equals(optional)
99-
|| ((optional == null)
100-
&& ctxt.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_INJECT_VALUE))) {
101-
throw ctxt.missingInjectableValueException(
102-
String.format("No injectable value with id '%s' found (for property '%s')",
103-
key, forProperty.getName()),
104-
valueId, forProperty, beanInstance);
105-
}
177+
return _handleMissingValue(ctxt, key, forProperty, beanInstance,
178+
optional, useInput);
106179
}
107180
return ob;
108181
}

‎src/main/java/tools/jackson/databind/deser/CreatorProperty.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,11 @@ public class CreatorProperty
3737
protected final AnnotatedParameter _annotated;
3838

3939
/**
40-
* Id of value to inject, if value injection should be used for this parameter
40+
* Injection settings, if value injection should be used for this parameter
4141
* (in addition to, or instead of, regular deserialization).
42+
*<p>
43+
* NOTE: badly named, should be more like "_injectionDefinition" but
44+
* renaming would be a breaking (internal) change.
4245
*/
4346
protected final JacksonInject.Value _injectableValue;
4447

‎src/main/java/tools/jackson/databind/deser/bean/BeanAsArrayBuilderDeserializer.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,13 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p,
300300
continue;
301301
}
302302
if (creatorProp != null) {
303+
// [databind#1381]: if useInput=FALSE, skip deserialization from input
304+
if (creatorProp.isInjectionOnly()) {
305+
// Skip the input value, will be injected later in PropertyValueBuffer
306+
p.skipChildren();
307+
continue;
308+
}
309+
303310
// Last creator property to set?
304311
if (buffer.assignParameter(creatorProp, creatorProp.deserialize(p, ctxt))) {
305312
try {

‎src/main/java/tools/jackson/databind/deser/bean/BeanAsArrayDeserializer.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,13 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p, final
415415
continue;
416416
}
417417
if (creatorProp != null) {
418+
// [databind#1381]: if useInput=FALSE, skip deserialization from input
419+
if (creatorProp.isInjectionOnly()) {
420+
// Skip the input value, will be injected later in PropertyValueBuffer
421+
p.skipChildren();
422+
continue;
423+
}
424+
418425
// Last creator property to set?
419426
if (buffer.assignParameter(creatorProp, creatorProp.deserialize(p, ctxt))) {
420427
try {

‎src/main/java/tools/jackson/databind/deser/bean/BeanDeserializer.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,12 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
589589
p.skipChildren();
590590
continue;
591591
}
592+
// [databind#1381]: if useInput=FALSE, skip deserialization from input
593+
if (creatorProp.isInjectionOnly()) {
594+
// Skip the input value, will be injected later in PropertyValueBuffer
595+
p.skipChildren();
596+
continue;
597+
}
592598
value = _deserializeWithErrorWrapping(p, ctxt, creatorProp);
593599
// Last creator property to set?
594600
if (buffer.assignParameter(creatorProp, value)) {
@@ -1048,6 +1054,13 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p, Deseri
10481054
continue;
10491055
}
10501056
if (creatorProp != null) {
1057+
// [databind#1381]: if useInput=FALSE, skip deserialization from input
1058+
if (creatorProp.isInjectionOnly()) {
1059+
// Skip the input value, will be injected later in PropertyValueBuffer
1060+
p.skipChildren();
1061+
continue;
1062+
}
1063+
10511064
// Last creator property to set?
10521065
if (buffer.assignParameter(creatorProp,
10531066
_deserializeWithErrorWrapping(p, ctxt, creatorProp))) {
@@ -1259,6 +1272,13 @@ protected Object deserializeUsingPropertyBasedWithExternalTypeId(JsonParser p, D
12591272
continue;
12601273
}
12611274
if (creatorProp != null) {
1275+
// [databind#1381]: if useInput=FALSE, skip deserialization from input
1276+
if (creatorProp.isInjectionOnly()) {
1277+
// Skip the input value, will be injected later in PropertyValueBuffer
1278+
p.skipChildren();
1279+
continue;
1280+
}
1281+
12621282
// first: let's check to see if this might be part of value with external type id:
12631283
// 11-Sep-2015, tatu: Important; do NOT pass buffer as last arg, but null,
12641284
// since it is not the bean

‎src/main/java/tools/jackson/databind/deser/bean/BuilderBasedDeserializer.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,12 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p,
421421
p.skipChildren();
422422
continue;
423423
}
424+
// [databind#1381]: if useInput=FALSE, skip deserialization from input
425+
if (creatorProp.isInjectionOnly()) {
426+
// Skip the input value, will be injected later in PropertyValueBuffer
427+
p.skipChildren();
428+
continue;
429+
}
424430
// Last creator property to set?
425431
if (buffer.assignParameter(creatorProp, creatorProp.deserialize(p, ctxt))) {
426432
p.nextToken(); // to move to following FIELD_NAME/END_OBJECT
@@ -759,6 +765,13 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p,
759765
continue;
760766
}
761767
if (creatorProp != null) {
768+
// [databind#1381]: if useInput=FALSE, skip deserialization from input
769+
if (creatorProp.isInjectionOnly()) {
770+
// Skip the input value, will be injected later in PropertyValueBuffer
771+
p.skipChildren();
772+
continue;
773+
}
774+
762775
// Last creator property to set?
763776
if (buffer.assignParameter(creatorProp, creatorProp.deserialize(p, ctxt))) {
764777
t = p.nextToken(); // to move to following FIELD_NAME/END_OBJECT

0 commit comments

Comments
 (0)