Skip to content

Commit ac78790

Browse files
cowtowncodercowtowncoder
committed
Fix #2428 
1 parent 9051c79 commit ac78790

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+132
-137
lines changed

‎release-notes/VERSION-2.x

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Project: jackson-databind
2323
#2422: `scala.collection.immutable.ListMap` fails to serialize since 2.9.3
2424
(reported by dejanlokar1@github)
2525
#2425: Add global config override setting for `@JsonFormat.lenient()`
26+
#2428: Use "activateDefaultTyping" over "enableDefaultTyping" in 2.10 with new methods
2627

2728
2.10.0.pr1 (19-Jul-2019)
2829

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

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public class ObjectMapper
130130
*/
131131

132132
/**
133-
* Enumeration used with {@link ObjectMapper#enableDefaultTyping()}
133+
* Enumeration used with {@link ObjectMapper#activateDefaultTyping(PolymorphicTypeValidator)}
134134
* to specify what kind of types (classes) default typing should
135135
* be used for. It will only be used if no explicit type information
136136
* is found, but this enumeration further limits subset of those types.
@@ -143,9 +143,9 @@ public class ObjectMapper
143143
*<p>
144144
* NOTE: use of Default Typing can be a potential security risk if incoming
145145
* content comes from untrusted sources, and it is recommended that this
146-
* is either not done, or, if enabled, use {@link #setDefaultTyping}
147-
* passing a custom {@link TypeResolverBuilder} implementation that white-lists
148-
* legal types to use.
146+
* is either not done, or, if enabled, make sure to {@code activateDefaultTyping(...)}
147+
* methods that take {@link PolymorphicTypeValidator} that limits applicability
148+
* to known trusted types.
149149
*/
150150
public enum DefaultTyping {
151151
/**
@@ -190,7 +190,7 @@ public enum DefaultTyping {
190190
/**
191191
* Customized {@link TypeResolverBuilder} that provides type resolver builders
192192
* used with so-called "default typing"
193-
* (see {@link ObjectMapper#enableDefaultTyping(PolymorphicTypeValidator)} for details).
193+
* (see {@link ObjectMapper#activateDefaultTyping(PolymorphicTypeValidator)} for details).
194194
*<p>
195195
* Type resolver construction is based on configuration: implementation takes care
196196
* of only providing builders in cases where type information should be applied.
@@ -1412,7 +1412,7 @@ public void setVisibilityChecker(VisibilityChecker<?> vc) {
14121412
/**
14131413
* Method for specifying {@link PolymorphicTypeValidator} to use for validating
14141414
* polymorphic subtypes used with explicit polymorphic types (annotation-based),
1415-
* but NOT one with "default typing" (see {@link #enableDefaultTyping(PolymorphicTypeValidator)}
1415+
* but NOT one with "default typing" (see {@link #activateDefaultTyping(PolymorphicTypeValidator)}
14161416
* for details).
14171417
*
14181418
* @since 2.10
@@ -1426,7 +1426,7 @@ public ObjectMapper setPolymorphicTypeValidator(PolymorphicTypeValidator ptv) {
14261426
/**
14271427
* Accessor for configured {@link PolymorphicTypeValidator} used for validating
14281428
* polymorphic subtypes used with explicit polymorphic types (annotation-based),
1429-
* but NOT one with "default typing" (see {@link #enableDefaultTyping(PolymorphicTypeValidator)}
1429+
* but NOT one with "default typing" (see {@link #activateDefaultTyping(PolymorphicTypeValidator)}
14301430
* for details).
14311431
*
14321432
* @since 2.10
@@ -1590,8 +1590,8 @@ public void registerSubtypes(Collection<Class<?>> subtypes) {
15901590
*
15911591
* @since 2.10
15921592
*/
1593-
public ObjectMapper enableDefaultTyping(PolymorphicTypeValidator ptv) {
1594-
return enableDefaultTyping(ptv, DefaultTyping.OBJECT_AND_NON_CONCRETE);
1593+
public ObjectMapper activateDefaultTyping(PolymorphicTypeValidator ptv) {
1594+
return activateDefaultTyping(ptv, DefaultTyping.OBJECT_AND_NON_CONCRETE);
15951595
}
15961596

15971597
/**
@@ -1610,9 +1610,9 @@ public ObjectMapper enableDefaultTyping(PolymorphicTypeValidator ptv) {
16101610
*
16111611
* @since 2.10
16121612
*/
1613-
public ObjectMapper enableDefaultTyping(PolymorphicTypeValidator ptv,
1613+
public ObjectMapper activateDefaultTyping(PolymorphicTypeValidator ptv,
16141614
DefaultTyping applicability) {
1615-
return enableDefaultTyping(ptv, applicability, JsonTypeInfo.As.WRAPPER_ARRAY);
1615+
return activateDefaultTyping(ptv, applicability, JsonTypeInfo.As.WRAPPER_ARRAY);
16161616
}
16171617

16181618
/**
@@ -1635,7 +1635,7 @@ public ObjectMapper enableDefaultTyping(PolymorphicTypeValidator ptv,
16351635
*
16361636
* @since 2.10
16371637
*/
1638-
public ObjectMapper enableDefaultTyping(PolymorphicTypeValidator ptv,
1638+
public ObjectMapper activateDefaultTyping(PolymorphicTypeValidator ptv,
16391639
DefaultTyping applicability, JsonTypeInfo.As includeAs)
16401640
{
16411641
// 18-Sep-2014, tatu: Let's add explicit check to ensure no one tries to
@@ -1670,7 +1670,7 @@ public ObjectMapper enableDefaultTyping(PolymorphicTypeValidator ptv,
16701670
*
16711671
* @since 2.10
16721672
*/
1673-
public ObjectMapper enableDefaultTypingAsProperty(PolymorphicTypeValidator ptv,
1673+
public ObjectMapper activateDefaultTypingAsProperty(PolymorphicTypeValidator ptv,
16741674
DefaultTyping applicability, String propertyName)
16751675
{
16761676
TypeResolverBuilder<?> typer = _constructDefaultTypeResolverBuilder(applicability,
@@ -1689,7 +1689,7 @@ public ObjectMapper enableDefaultTypingAsProperty(PolymorphicTypeValidator ptv,
16891689
* {@link com.fasterxml.jackson.annotation.JsonTypeInfo}) will have
16901690
* additional embedded type information.
16911691
*/
1692-
public ObjectMapper disableDefaultTyping() {
1692+
public ObjectMapper deactivateDefaultTyping() {
16931693
return setDefaultTyping(null);
16941694
}
16951695

@@ -1701,7 +1701,10 @@ public ObjectMapper disableDefaultTyping() {
17011701
* NOTE: use of Default Typing can be a potential security risk if incoming
17021702
* content comes from untrusted sources, so care should be taken to use
17031703
* a {@link TypeResolverBuilder} that can limit allowed classes to
1704-
* deserialize.
1704+
* deserialize. Note in particular that
1705+
* {@link com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder}
1706+
* DOES NOT limit applicability but creates type (de)serializers for all
1707+
* types.
17051708
*
17061709
* @param typer Type information inclusion handler
17071710
*/
@@ -1718,35 +1721,43 @@ public ObjectMapper setDefaultTyping(TypeResolverBuilder<?> typer) {
17181721
*/
17191722

17201723
/**
1721-
* @deprecated Since 2.10 use {@link #enableDefaultTyping(PolymorphicTypeValidator)} instead
1724+
* @deprecated Since 2.10 use {@link #activateDefaultTyping(PolymorphicTypeValidator)} instead
17221725
*/
17231726
@Deprecated
17241727
public ObjectMapper enableDefaultTyping() {
1725-
return enableDefaultTyping(getPolymorphicTypeValidator());
1728+
return activateDefaultTyping(getPolymorphicTypeValidator());
17261729
}
17271730

17281731
/**
1729-
* @deprecated Since 2.10 use {@link #enableDefaultTyping(PolymorphicTypeValidator,DefaultTyping)} instead
1732+
* @deprecated Since 2.10 use {@link #activateDefaultTyping(PolymorphicTypeValidator,DefaultTyping)} instead
17301733
*/
17311734
@Deprecated
17321735
public ObjectMapper enableDefaultTyping(DefaultTyping dti) {
17331736
return enableDefaultTyping(dti, JsonTypeInfo.As.WRAPPER_ARRAY);
17341737
}
17351738

17361739
/**
1737-
* @deprecated Since 2.10 use {@link #enableDefaultTyping(PolymorphicTypeValidator,DefaultTyping,JsonTypeInfo.As)} instead
1740+
* @deprecated Since 2.10 use {@link #activateDefaultTyping(PolymorphicTypeValidator,DefaultTyping,JsonTypeInfo.As)} instead
17381741
*/
17391742
@Deprecated
17401743
public ObjectMapper enableDefaultTyping(DefaultTyping applicability, JsonTypeInfo.As includeAs) {
1741-
return enableDefaultTyping(getPolymorphicTypeValidator(), applicability, includeAs);
1744+
return activateDefaultTyping(getPolymorphicTypeValidator(), applicability, includeAs);
17421745
}
17431746

17441747
/**
1745-
* @deprecated Since 2.10 use {@link #enableDefaultTypingAsProperty(PolymorphicTypeValidator,DefaultTyping,String)} instead
1748+
* @deprecated Since 2.10 use {@link #activateDefaultTypingAsProperty(PolymorphicTypeValidator,DefaultTyping,String)} instead
17461749
*/
17471750
@Deprecated
17481751
public ObjectMapper enableDefaultTypingAsProperty(DefaultTyping applicability, String propertyName) {
1749-
return enableDefaultTypingAsProperty(getPolymorphicTypeValidator(), applicability, propertyName);
1752+
return activateDefaultTypingAsProperty(getPolymorphicTypeValidator(), applicability, propertyName);
1753+
}
1754+
1755+
/**
1756+
* @deprecated Since 2.10 use {@link #deactivateDefaultTyping} instead
1757+
*/
1758+
@Deprecated
1759+
public ObjectMapper disableDefaultTyping() {
1760+
return setDefaultTyping(null);
17501761
}
17511762

17521763
/*

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -605,8 +605,8 @@ public B polymorphicTypeValidator(PolymorphicTypeValidator ptv) {
605605
* NOTE: choice of {@link PolymorphicTypeValidator} to pass is critical for security
606606
* as allowing all subtypes can be risky for untrusted content.
607607
*/
608-
public B enableDefaultTyping(PolymorphicTypeValidator subtypeValidator) {
609-
_mapper.enableDefaultTyping(subtypeValidator);
608+
public B activateDefaultTyping(PolymorphicTypeValidator subtypeValidator) {
609+
_mapper.activateDefaultTyping(subtypeValidator);
610610
return _this();
611611
}
612612

@@ -619,9 +619,9 @@ public B enableDefaultTyping(PolymorphicTypeValidator subtypeValidator) {
619619
* NOTE: choice of {@link PolymorphicTypeValidator} to pass is critical for security
620620
* as allowing all subtypes can be risky for untrusted content.
621621
*/
622-
public B enableDefaultTyping(PolymorphicTypeValidator subtypeValidator,
622+
public B activateDefaultTyping(PolymorphicTypeValidator subtypeValidator,
623623
DefaultTyping dti) {
624-
_mapper.enableDefaultTyping(subtypeValidator, dti);
624+
_mapper.activateDefaultTyping(subtypeValidator, dti);
625625
return _this();
626626
}
627627

@@ -640,10 +640,10 @@ public B enableDefaultTyping(PolymorphicTypeValidator subtypeValidator,
640640
* @param applicability Defines kinds of types for which additional type information
641641
* is added; see {@link DefaultTyping} for more information.
642642
*/
643-
public B enableDefaultTyping(PolymorphicTypeValidator subtypeValidator,
643+
public B activateDefaultTyping(PolymorphicTypeValidator subtypeValidator,
644644
DefaultTyping applicability, JsonTypeInfo.As includeAs)
645645
{
646-
_mapper.enableDefaultTyping(subtypeValidator, applicability, includeAs);
646+
_mapper.activateDefaultTyping(subtypeValidator, applicability, includeAs);
647647
return _this();
648648
}
649649

@@ -658,10 +658,10 @@ public B enableDefaultTyping(PolymorphicTypeValidator subtypeValidator,
658658
* NOTE: choice of {@link PolymorphicTypeValidator} to pass is critical for security
659659
* as allowing all subtypes can be risky for untrusted content.
660660
*/
661-
public B enableDefaultTypingAsProperty(PolymorphicTypeValidator subtypeValidator,
661+
public B activateDefaultTypingAsProperty(PolymorphicTypeValidator subtypeValidator,
662662
DefaultTyping applicability, String propertyName)
663663
{
664-
_mapper.enableDefaultTypingAsProperty(subtypeValidator, applicability, propertyName);
664+
_mapper.activateDefaultTypingAsProperty(subtypeValidator, applicability, propertyName);
665665
return _this();
666666
}
667667

@@ -671,8 +671,8 @@ public B enableDefaultTypingAsProperty(PolymorphicTypeValidator subtypeValidator
671671
* {@link com.fasterxml.jackson.annotation.JsonTypeInfo}) will have
672672
* additional embedded type information.
673673
*/
674-
public B disableDefaultTyping() {
675-
_mapper.disableDefaultTyping();
674+
public B deactivateDefaultTyping() {
675+
_mapper.deactivateDefaultTyping();
676676
return _this();
677677
}
678678

‎src/test/java/com/fasterxml/jackson/databind/deser/creators/ArrayDelegatorCreatorForCollectionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void testUnmodifiable() throws Exception
2323
ObjectMapper mapper = new ObjectMapper();
2424
Class<?> unmodSetType = Collections.unmodifiableSet(Collections.<String>emptySet()).getClass();
2525
mapper.addMixIn(unmodSetType, UnmodifiableSetMixin.class);
26-
mapper.enableDefaultTyping(NoCheckSubTypeValidator.instance,
26+
mapper.activateDefaultTyping(NoCheckSubTypeValidator.instance,
2727
ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY);
2828

2929
final String EXPECTED_JSON = "[\""+unmodSetType.getName()+"\",[]]";

‎src/test/java/com/fasterxml/jackson/databind/deser/filter/ProblemHandlerUnknownTypeId2221Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public String toString() {
8585

8686
public void testWithDeserializationProblemHandler() throws Exception {
8787
final ObjectMapper mapper = new ObjectMapper()
88-
.enableDefaultTyping(NoCheckSubTypeValidator.instance);
88+
.activateDefaultTyping(NoCheckSubTypeValidator.instance);
8989
mapper.addHandler(new DeserializationProblemHandler() {
9090
@Override
9191
public JavaType handleUnknownTypeId(DeserializationContext ctxt, JavaType baseType, String subTypeId, TypeIdResolver idResolver, String failureMsg) throws IOException {
@@ -101,7 +101,7 @@ public JavaType handleUnknownTypeId(DeserializationContext ctxt, JavaType baseTy
101101
public void testWithDisabledFAIL_ON_INVALID_SUBTYPE() throws Exception {
102102
final ObjectMapper mapper = new ObjectMapper()
103103
.disable(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE)
104-
.enableDefaultTyping(NoCheckSubTypeValidator.instance)
104+
.activateDefaultTyping(NoCheckSubTypeValidator.instance)
105105
;
106106
GenericContent processableContent = mapper.readValue(JSON, GenericContent.class);
107107
assertNotNull(processableContent.getInnerObjects());

‎src/test/java/com/fasterxml/jackson/databind/deser/jdk/EnumMapDeserializationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public void testEnumMapAsPolymorphic() throws Exception
160160
Pojo1859 input = new Pojo1859(enumMap);
161161

162162
ObjectMapper mapper = JsonMapper.builder()
163-
.enableDefaultTypingAsProperty(NoCheckSubTypeValidator.instance,
163+
.activateDefaultTypingAsProperty(NoCheckSubTypeValidator.instance,
164164
ObjectMapper.DefaultTyping.NON_FINAL, "@type")
165165
.build();
166166

‎src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKCollectionsDeserTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void testSingletonCollections() throws Exception
5151
public void testUnmodifiableSet() throws Exception
5252
{
5353
ObjectMapper mapper = jsonMapperBuilder()
54-
.enableDefaultTyping(NoCheckSubTypeValidator.instance,
54+
.activateDefaultTyping(NoCheckSubTypeValidator.instance,
5555
ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY)
5656
.build();
5757

‎src/test/java/com/fasterxml/jackson/databind/deser/jdk/UntypedDeserializationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public void testNestedUntypes() throws IOException
226226
public void testObjectSerializeWithLong() throws IOException
227227
{
228228
final ObjectMapper mapper = new ObjectMapper();
229-
mapper.enableDefaultTyping(NoCheckSubTypeValidator.instance,
229+
mapper.activateDefaultTyping(NoCheckSubTypeValidator.instance,
230230
DefaultTyping.JAVA_LANG_OBJECT, As.PROPERTY);
231231
final long VALUE = 1337800584532L;
232232

‎src/test/java/com/fasterxml/jackson/databind/deser/jdk/UtilCollectionsTypesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
public class UtilCollectionsTypesTest extends BaseMapTest
1313
{
1414
private final ObjectMapper DEFAULT_MAPPER = JsonMapper.builder()
15-
.enableDefaultTyping(NoCheckSubTypeValidator.instance,
15+
.activateDefaultTyping(NoCheckSubTypeValidator.instance,
1616
ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY)
1717
.build();
1818

‎src/test/java/com/fasterxml/jackson/databind/ext/TestJava7Types.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping;
88
import com.fasterxml.jackson.databind.testutil.NoCheckSubTypeValidator;
99

10-
/**
11-
* @since 2.7
12-
*/
1310
public class TestJava7Types extends BaseMapTest
1411
{
1512
public void testPathRoundtrip() throws Exception
@@ -32,7 +29,7 @@ public void testPathRoundtrip() throws Exception
3229
public void testPolymorphicPath() throws Exception
3330
{
3431
ObjectMapper mapper = jsonMapperBuilder()
35-
.enableDefaultTyping(NoCheckSubTypeValidator.instance,
32+
.activateDefaultTyping(NoCheckSubTypeValidator.instance,
3633
DefaultTyping.NON_FINAL)
3734
.build();
3835
Path input = Paths.get("/tmp", "foo.txt");

‎src/test/java/com/fasterxml/jackson/databind/interop/IllegalTypesCheckTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void testXalanTypes1599() throws Exception
5858
+"}"
5959
);
6060
ObjectMapper mapper = new ObjectMapper();
61-
mapper.enableDefaultTyping(NoCheckSubTypeValidator.instance);
61+
mapper.activateDefaultTyping(NoCheckSubTypeValidator.instance);
6262
try {
6363
mapper.readValue(JSON, Bean1599.class);
6464
fail("Should not pass");
@@ -106,7 +106,7 @@ public void testSpringTypes1737() throws Exception
106106
public void testJDKTypes1872() throws Exception
107107
{
108108
ObjectMapper mapper = jsonMapperBuilder()
109-
.enableDefaultTyping(NoCheckSubTypeValidator.instance,
109+
.activateDefaultTyping(NoCheckSubTypeValidator.instance,
110110
ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY)
111111
.build();
112112

‎src/test/java/com/fasterxml/jackson/databind/jsontype/NoTypeInfoTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ final static class NoType implements NoTypeInterface {
2626
public void testWithIdNone() throws Exception
2727
{
2828
final ObjectMapper mapper = jsonMapperBuilder()
29-
.enableDefaultTyping(NoCheckSubTypeValidator.instance)
29+
.activateDefaultTyping(NoCheckSubTypeValidator.instance)
3030
.build();
3131
// serialize without type info
3232
String json = mapper.writeValueAsString(new NoType());

‎src/test/java/com/fasterxml/jackson/databind/jsontype/PolymorphicViaRefTypeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void testPolymorphicAtomicRefProperty() throws Exception
6363
public void testAtomicRefViaDefaultTyping() throws Exception
6464
{
6565
ObjectMapper mapper = jsonMapperBuilder()
66-
.enableDefaultTyping(NoCheckSubTypeValidator.instance,
66+
.activateDefaultTyping(NoCheckSubTypeValidator.instance,
6767
DefaultTyping.NON_FINAL)
6868
.build();
6969
AtomicStringWrapper data = new AtomicStringWrapper("foo");

‎src/test/java/com/fasterxml/jackson/databind/jsontype/TestAbstractTypeNames.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public void testEmptyCollection() throws Exception
128128
public void testInnerClassWithType() throws Exception
129129
{
130130
ObjectMapper mapper = jsonMapperBuilder()
131-
.enableDefaultTyping(NoCheckSubTypeValidator.instance,
131+
.activateDefaultTyping(NoCheckSubTypeValidator.instance,
132132
DefaultTyping.NON_FINAL)
133133
.build();
134134
String json = mapper.writeValueAsString(new BeanWithAnon());

‎src/test/java/com/fasterxml/jackson/databind/jsontype/TestSubtypes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ public void testEmptyBean() throws Exception
263263

264264
// and then with defaults
265265
mapper = new ObjectMapper();
266-
mapper.enableDefaultTyping(NoCheckSubTypeValidator.instance,
266+
mapper.activateDefaultTyping(NoCheckSubTypeValidator.instance,
267267
ObjectMapper.DefaultTyping.NON_FINAL);
268268
mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
269269
json = mapper.writeValueAsString(new EmptyNonFinal());

‎src/test/java/com/fasterxml/jackson/databind/jsontype/TestTypedSerialization.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public void testInArray() throws Exception
151151
// ensure we'll use mapper with default configs
152152
ObjectMapper m = new ObjectMapper();
153153
// ... so this should NOT be needed...
154-
m.disableDefaultTyping();
154+
m.deactivateDefaultTyping();
155155

156156
Animal[] animals = new Animal[] { new Cat("Miuku", "white"), new Dog("Murre", 9) };
157157
Map<String,Object> map = new HashMap<String,Object>();

‎src/test/java/com/fasterxml/jackson/databind/jsontype/TestWithGenerics.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public void testWrapperWithExplicitType() throws Exception
167167
public void testJackson387() throws Exception
168168
{
169169
ObjectMapper om = new ObjectMapper();
170-
om.enableDefaultTyping(NoCheckSubTypeValidator.instance,
170+
om.activateDefaultTyping(NoCheckSubTypeValidator.instance,
171171
ObjectMapper.DefaultTyping.JAVA_LANG_OBJECT, JsonTypeInfo.As.PROPERTY );
172172
om.setSerializationInclusion(JsonInclude.Include.NON_NULL );
173173
om.enable( SerializationFeature.INDENT_OUTPUT);

‎src/test/java/com/fasterxml/jackson/databind/jsontype/TypeRefinementForMapTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public void testMapKeyRefinement1384() throws Exception
122122
final String TEST_INSTANCE_SERIALIZED =
123123
"{\"mapProperty\":[\"java.util.HashMap\",{\"Compound|Key\":\"Value\"}]}";
124124
ObjectMapper mapper = jsonMapperBuilder()
125-
.enableDefaultTyping(NoCheckSubTypeValidator.instance,
125+
.activateDefaultTyping(NoCheckSubTypeValidator.instance,
126126
ObjectMapper.DefaultTyping.NON_FINAL)
127127
.build();
128128

0 commit comments

Comments
 (0)