Skip to content

Commit 2e494a9

Browse files
cowtowncodercowtowncoder
committed
More work on #2800, wiring mostly in place
1 parent 2ad1d95 commit 2e494a9

File tree

10 files changed

+117
-37
lines changed

10 files changed

+117
-37
lines changed

‎src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import com.fasterxml.jackson.core.Version;
88
import com.fasterxml.jackson.core.Versioned;
99

10-
import com.fasterxml.jackson.databind.JsonDeserializer;
11-
import com.fasterxml.jackson.databind.JsonSerializer;
1210
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
1311
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
1412
import com.fasterxml.jackson.databind.cfg.MapperConfig;

‎src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,9 @@ public boolean useForType(JavaType t)
366366
null, // to indicate "use Jackson default TimeZone" (UTC since Jackson 2.7)
367367
Base64Variants.getDefaultVariant(),
368368
// Only for 2.x; 3.x will use more restrictive default
369-
LaissezFaireSubTypeValidator.instance
369+
LaissezFaireSubTypeValidator.instance,
370+
// Since 2.12:
371+
new DefaultAccessorNamingStrategy.Provider()
370372
);
371373

372374
/*
@@ -1648,7 +1650,7 @@ public ObjectMapper setAnnotationIntrospectors(AnnotationIntrospector serializer
16481650
_deserializationConfig = _deserializationConfig.with(deserializerAI);
16491651
return this;
16501652
}
1651-
1653+
16521654
/**
16531655
* Method for setting custom property naming strategy to use.
16541656
*/
@@ -1666,6 +1668,17 @@ public PropertyNamingStrategy getPropertyNamingStrategy() {
16661668
return _serializationConfig.getPropertyNamingStrategy();
16671669
}
16681670

1671+
/**
1672+
* Method for setting custom accessor naming strategy to use.
1673+
*
1674+
* @since 2.12
1675+
*/
1676+
public ObjectMapper setAccessorNaming(AccessorNamingStrategy.Provider s) {
1677+
_serializationConfig = _serializationConfig.with(s);
1678+
_deserializationConfig = _deserializationConfig.with(s);
1679+
return this;
1680+
}
1681+
16691682
/**
16701683
* Method for specifying {@link PrettyPrinter} to use when "default pretty-printing"
16711684
* is enabled (by enabling {@link SerializationFeature#INDENT_OUTPUT})

‎src/main/java/com/fasterxml/jackson/databind/cfg/BaseSettings.java‎

Lines changed: 51 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@
55
import java.util.TimeZone;
66

77
import com.fasterxml.jackson.core.Base64Variant;
8+
89
import com.fasterxml.jackson.databind.*;
10+
import com.fasterxml.jackson.databind.introspect.AccessorNamingStrategy;
911
import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
1012
import com.fasterxml.jackson.databind.introspect.ClassIntrospector;
13+
import com.fasterxml.jackson.databind.introspect.DefaultAccessorNamingStrategy;
1114
import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
1215
import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
1316
import com.fasterxml.jackson.databind.type.TypeFactory;
@@ -39,7 +42,14 @@ public final class BaseSettings
3942
/* Configuration settings; introspection, related
4043
/**********************************************************
4144
*/
42-
45+
46+
/**
47+
* Specific factory used for creating {@link JavaType} instances;
48+
* needed to allow modules to add more custom type handling
49+
* (mostly to support types of non-Java JVM languages)
50+
*/
51+
protected final TypeFactory _typeFactory;
52+
4353
/**
4454
* Introspector used to figure out Bean properties needed for bean serialization
4555
* and deserialization. Overridable so that it is possible to change low-level
@@ -58,15 +68,15 @@ public final class BaseSettings
5868
protected final PropertyNamingStrategy _propertyNamingStrategy;
5969

6070
/**
61-
* Specific factory used for creating {@link JavaType} instances;
62-
* needed to allow modules to add more custom type handling
63-
* (mostly to support types of non-Java JVM languages)
71+
* Provider for creating {@link AccessorNamingStrategy} instances to use
72+
*
73+
* @since 2.12
6474
*/
65-
protected final TypeFactory _typeFactory;
75+
protected final AccessorNamingStrategy.Provider _accessorNaming;
6676

6777
/*
6878
/**********************************************************
69-
/* Configuration settings; poly type resolution
79+
/* Configuration settings; polymorphic type resolution
7080
/**********************************************************
7181
*/
7282

@@ -140,13 +150,13 @@ public final class BaseSettings
140150
*/
141151

142152
/**
143-
* @since 2.10
153+
* @since 2.12
144154
*/
145155
public BaseSettings(ClassIntrospector ci, AnnotationIntrospector ai,
146156
PropertyNamingStrategy pns, TypeFactory tf,
147157
TypeResolverBuilder<?> typer, DateFormat dateFormat, HandlerInstantiator hi,
148158
Locale locale, TimeZone tz, Base64Variant defaultBase64,
149-
PolymorphicTypeValidator ptv)
159+
PolymorphicTypeValidator ptv, AccessorNamingStrategy.Provider accNaming)
150160
{
151161
_classIntrospector = ci;
152162
_annotationIntrospector = ai;
@@ -159,15 +169,18 @@ public BaseSettings(ClassIntrospector ci, AnnotationIntrospector ai,
159169
_timeZone = tz;
160170
_defaultBase64 = defaultBase64;
161171
_typeValidator = ptv;
172+
_accessorNaming = accNaming;
162173
}
163174

164-
@Deprecated // since 2.10
175+
@Deprecated // since 2.12
165176
public BaseSettings(ClassIntrospector ci, AnnotationIntrospector ai,
166177
PropertyNamingStrategy pns, TypeFactory tf,
167178
TypeResolverBuilder<?> typer, DateFormat dateFormat, HandlerInstantiator hi,
168-
Locale locale, TimeZone tz, Base64Variant defaultBase64)
179+
Locale locale, TimeZone tz, Base64Variant defaultBase64,
180+
PolymorphicTypeValidator ptv)
169181
{
170-
this(ci, ai, pns, tf, typer, dateFormat, hi, locale, tz, defaultBase64, null);
182+
this(ci, ai, pns, tf, typer, dateFormat, hi, locale, tz, defaultBase64, ptv,
183+
new DefaultAccessorNamingStrategy.Provider());
171184
}
172185

173186
/**
@@ -187,8 +200,8 @@ public BaseSettings copy() {
187200
_locale,
188201
_timeZone,
189202
_defaultBase64,
190-
_typeValidator);
191-
203+
_typeValidator,
204+
_accessorNaming);
192205
}
193206

194207
/*
@@ -203,7 +216,7 @@ public BaseSettings withClassIntrospector(ClassIntrospector ci) {
203216
}
204217
return new BaseSettings(ci, _annotationIntrospector, _propertyNamingStrategy, _typeFactory,
205218
_typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
206-
_timeZone, _defaultBase64, _typeValidator);
219+
_timeZone, _defaultBase64, _typeValidator, _accessorNaming);
207220
}
208221

209222
public BaseSettings withAnnotationIntrospector(AnnotationIntrospector ai) {
@@ -212,7 +225,7 @@ public BaseSettings withAnnotationIntrospector(AnnotationIntrospector ai) {
212225
}
213226
return new BaseSettings(_classIntrospector, ai, _propertyNamingStrategy, _typeFactory,
214227
_typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
215-
_timeZone, _defaultBase64, _typeValidator);
228+
_timeZone, _defaultBase64, _typeValidator, _accessorNaming);
216229
}
217230

218231
public BaseSettings withInsertedAnnotationIntrospector(AnnotationIntrospector ai) {
@@ -239,7 +252,17 @@ public BaseSettings withPropertyNamingStrategy(PropertyNamingStrategy pns) {
239252
}
240253
return new BaseSettings(_classIntrospector, _annotationIntrospector, pns, _typeFactory,
241254
_typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
242-
_timeZone, _defaultBase64, _typeValidator);
255+
_timeZone, _defaultBase64, _typeValidator, _accessorNaming);
256+
}
257+
258+
// @since 2.12
259+
public BaseSettings withAccessorNaming(AccessorNamingStrategy.Provider p) {
260+
if (_accessorNaming == p) {
261+
return this;
262+
}
263+
return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, _typeFactory,
264+
_typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
265+
_timeZone, _defaultBase64, _typeValidator, _accessorNaming);
243266
}
244267

245268
public BaseSettings withTypeFactory(TypeFactory tf) {
@@ -248,7 +271,7 @@ public BaseSettings withTypeFactory(TypeFactory tf) {
248271
}
249272
return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, tf,
250273
_typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
251-
_timeZone, _defaultBase64, _typeValidator);
274+
_timeZone, _defaultBase64, _typeValidator, _accessorNaming);
252275
}
253276

254277
public BaseSettings withTypeResolverBuilder(TypeResolverBuilder<?> typer) {
@@ -257,7 +280,7 @@ public BaseSettings withTypeResolverBuilder(TypeResolverBuilder<?> typer) {
257280
}
258281
return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, _typeFactory,
259282
typer, _dateFormat, _handlerInstantiator, _locale,
260-
_timeZone, _defaultBase64, _typeValidator);
283+
_timeZone, _defaultBase64, _typeValidator, _accessorNaming);
261284
}
262285

263286
public BaseSettings withDateFormat(DateFormat df) {
@@ -271,7 +294,7 @@ public BaseSettings withDateFormat(DateFormat df) {
271294
}
272295
return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, _typeFactory,
273296
_typeResolverBuilder, df, _handlerInstantiator, _locale,
274-
_timeZone, _defaultBase64, _typeValidator);
297+
_timeZone, _defaultBase64, _typeValidator, _accessorNaming);
275298
}
276299

277300
public BaseSettings withHandlerInstantiator(HandlerInstantiator hi) {
@@ -280,7 +303,7 @@ public BaseSettings withHandlerInstantiator(HandlerInstantiator hi) {
280303
}
281304
return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, _typeFactory,
282305
_typeResolverBuilder, _dateFormat, hi, _locale,
283-
_timeZone, _defaultBase64, _typeValidator);
306+
_timeZone, _defaultBase64, _typeValidator, _accessorNaming);
284307
}
285308

286309
public BaseSettings with(Locale l) {
@@ -289,7 +312,7 @@ public BaseSettings with(Locale l) {
289312
}
290313
return new BaseSettings(_classIntrospector, _annotationIntrospector, _propertyNamingStrategy, _typeFactory,
291314
_typeResolverBuilder, _dateFormat, _handlerInstantiator, l,
292-
_timeZone, _defaultBase64, _typeValidator);
315+
_timeZone, _defaultBase64, _typeValidator, _accessorNaming);
293316
}
294317

295318
/**
@@ -310,7 +333,7 @@ public BaseSettings with(TimeZone tz)
310333
return new BaseSettings(_classIntrospector, _annotationIntrospector,
311334
_propertyNamingStrategy, _typeFactory,
312335
_typeResolverBuilder, df, _handlerInstantiator, _locale,
313-
tz, _defaultBase64, _typeValidator);
336+
tz, _defaultBase64, _typeValidator, _accessorNaming);
314337
}
315338

316339
/**
@@ -323,7 +346,7 @@ public BaseSettings with(Base64Variant base64) {
323346
return new BaseSettings(_classIntrospector, _annotationIntrospector,
324347
_propertyNamingStrategy, _typeFactory,
325348
_typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
326-
_timeZone, base64, _typeValidator);
349+
_timeZone, base64, _typeValidator, _accessorNaming);
327350
}
328351

329352
/**
@@ -336,7 +359,7 @@ public BaseSettings with(PolymorphicTypeValidator v) {
336359
return new BaseSettings(_classIntrospector, _annotationIntrospector,
337360
_propertyNamingStrategy, _typeFactory,
338361
_typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
339-
_timeZone, _defaultBase64, v);
362+
_timeZone, _defaultBase64, v, _accessorNaming);
340363
}
341364

342365
/*
@@ -357,6 +380,10 @@ public PropertyNamingStrategy getPropertyNamingStrategy() {
357380
return _propertyNamingStrategy;
358381
}
359382

383+
public AccessorNamingStrategy.Provider getAccessorNaming() {
384+
return _accessorNaming;
385+
}
386+
360387
public TypeFactory getTypeFactory() {
361388
return _typeFactory;
362389
}

‎src/main/java/com/fasterxml/jackson/databind/cfg/MapperBuilder.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import com.fasterxml.jackson.databind.*;
1515
import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping;
1616
import com.fasterxml.jackson.databind.deser.*;
17+
import com.fasterxml.jackson.databind.introspect.AccessorNamingStrategy;
18+
import com.fasterxml.jackson.databind.introspect.DefaultAccessorNamingStrategy;
1719
import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
1820
import com.fasterxml.jackson.databind.jsontype.NamedType;
1921
import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
@@ -373,17 +375,45 @@ public B visibility(PropertyAccessor forMethod, JsonAutoDetect.Visibility visibi
373375
* id resolvers), given a class.
374376
*
375377
* @param hi Instantiator to use; if null, use the default implementation
378+
*
379+
* @return Builder instance itself to allow chaining
376380
*/
377381
public B handlerInstantiator(HandlerInstantiator hi) {
378382
_mapper.setHandlerInstantiator(hi);
379383
return _this();
380384
}
381385

386+
/**
387+
* Method for configuring {@link PropertyNamingStrategy} to use for adapting
388+
* POJO property names (internal) into content property names (external)
389+
*
390+
* @param s Strategy instance to use; if null, use the default implementation
391+
*
392+
* @return Builder instance itself to allow chaining
393+
*/
382394
public B propertyNamingStrategy(PropertyNamingStrategy s) {
383395
_mapper.setPropertyNamingStrategy(s);
384396
return _this();
385397
}
386398

399+
/**
400+
* Method for configuring {@link AccessorNamingStrategy} to use for auto-detecting
401+
* accessor ("getter") and mutator ("setter") methods based on naming of methods.
402+
*
403+
* @param s Strategy instance to use; if null, use the default implementation
404+
*
405+
* @return Builder instance itself to allow chaining
406+
*
407+
* @since 2.12
408+
*/
409+
public B accessorNaming(AccessorNamingStrategy.Provider s) {
410+
if (s == null) {
411+
s = new DefaultAccessorNamingStrategy.Provider();
412+
}
413+
_mapper.setAccessorNaming(s);
414+
return _this();
415+
}
416+
387417
/*
388418
/**********************************************************************
389419
/* Changing factories, serialization

‎src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfig.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.fasterxml.jackson.core.io.SerializedString;
1111
import com.fasterxml.jackson.core.type.TypeReference;
1212
import com.fasterxml.jackson.databind.*;
13+
import com.fasterxml.jackson.databind.introspect.AccessorNamingStrategy;
1314
import com.fasterxml.jackson.databind.introspect.Annotated;
1415
import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
1516
import com.fasterxml.jackson.databind.introspect.ClassIntrospector;
@@ -246,6 +247,11 @@ public final PropertyNamingStrategy getPropertyNamingStrategy() {
246247
return _base.getPropertyNamingStrategy();
247248
}
248249

250+
// @since 2.12
251+
public final AccessorNamingStrategy.Provider getAccessorNaming() {
252+
return _base.getAccessorNaming();
253+
}
254+
249255
public final HandlerInstantiator getHandlerInstantiator() {
250256
return _base.getHandlerInstantiator();
251257
}

‎src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfigBase.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.fasterxml.jackson.databind.*;
1111
import com.fasterxml.jackson.databind.introspect.ClassIntrospector;
1212
import com.fasterxml.jackson.databind.introspect.ClassIntrospector.MixInResolver;
13+
import com.fasterxml.jackson.databind.introspect.AccessorNamingStrategy;
1314
import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
1415
import com.fasterxml.jackson.databind.introspect.SimpleMixInResolver;
1516
import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
@@ -457,6 +458,17 @@ public final T with(PropertyNamingStrategy pns) {
457458
return _withBase(_base.withPropertyNamingStrategy(pns));
458459
}
459460

461+
/**
462+
* Method for constructing and returning a new instance with different
463+
* {@link PropertyNamingStrategy}
464+
* to use.
465+
*
466+
* @since 2.12
467+
*/
468+
public final T with(AccessorNamingStrategy.Provider p) {
469+
return _withBase(_base.withAccessorNaming(p));
470+
}
471+
460472
/**
461473
* Method for constructing and returning a new instance with different
462474
* {@link HandlerInstantiator}

‎src/main/java/com/fasterxml/jackson/databind/deser/impl/JavaUtilCollectionsDeserializers.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ private static class JavaUtilCollectionsConverter implements Converter<Object,Ob
121121

122122
private final int _kind;
123123

124-
private JavaUtilCollectionsConverter(int kind, JavaType inputType) {
124+
JavaUtilCollectionsConverter(int kind, JavaType inputType) {
125125
_inputType = inputType;
126126
_kind = kind;
127127
}

‎src/main/java/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
1212
import com.fasterxml.jackson.databind.deser.*;
1313
import com.fasterxml.jackson.databind.deser.impl.ReadableObjectId.Referring;
14-
import com.fasterxml.jackson.databind.deser.std.ContainerDeserializerBase;
1514
import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
1615
import com.fasterxml.jackson.databind.type.LogicalType;
1716
import com.fasterxml.jackson.databind.util.ClassUtil;

0 commit comments

Comments
 (0)