Skip to content

Commit 3942c2e

Browse files
committed
Remove reference to (now-)deprecated UntypedObjectDeserializer.Vanilla
1 parent 8238ab4 commit 3942c2e

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/main/java/com/fasterxml/jackson/databind/deser/std/ThrowableDeserializer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.fasterxml.jackson.databind.deser.std;
22

33
import java.io.IOException;
4-
import java.util.Iterator;
54

65
import com.fasterxml.jackson.core.*;
76

src/test/java/com/fasterxml/jackson/databind/introspect/IntrospectorPairTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
import com.fasterxml.jackson.databind.*;
1616
import com.fasterxml.jackson.databind.cfg.MapperConfig;
17+
import com.fasterxml.jackson.databind.deser.std.NumberDeserializers;
1718
import com.fasterxml.jackson.databind.deser.std.StringDeserializer;
18-
import com.fasterxml.jackson.databind.deser.std.UntypedObjectDeserializer;
1919
import com.fasterxml.jackson.databind.json.JsonMapper;
2020
import com.fasterxml.jackson.databind.jsontype.NamedType;
2121
import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
@@ -482,16 +482,16 @@ public void testHasAnyGetter() throws Exception
482482
public void testFindDeserializer() throws Exception
483483
{
484484
final JsonDeserializer<?> deserString = StringDeserializer.instance;
485-
final JsonDeserializer<?> deserObject = UntypedObjectDeserializer.Vanilla.std;
485+
final JsonDeserializer<?> deserBoolean = NumberDeserializers.find(Boolean.TYPE, "b");
486486

487487
AnnotationIntrospector intr1 = new IntrospectorWithHandlers(deserString, null);
488-
AnnotationIntrospector intr2 = new IntrospectorWithHandlers(deserObject, null);
488+
AnnotationIntrospector intr2 = new IntrospectorWithHandlers(deserBoolean, null);
489489
AnnotationIntrospector nop = AnnotationIntrospector.nopInstance();
490490
AnnotationIntrospector nop2 = new IntrospectorWithHandlers(JsonDeserializer.None.class, null);
491491

492492
assertSame(deserString,
493493
new AnnotationIntrospectorPair(intr1, intr2).findDeserializer(null));
494-
assertSame(deserObject,
494+
assertSame(deserBoolean,
495495
new AnnotationIntrospectorPair(intr2, intr1).findDeserializer(null));
496496
// also: no-op instance should not block real one, regardless
497497
assertSame(deserString,

0 commit comments

Comments
 (0)