Skip to content

Commit

Permalink
Remove reference to (now-)deprecated UntypedObjectDeserializer.Vanilla
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed May 31, 2022
1 parent 8238ab4 commit 3942c2e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.fasterxml.jackson.databind.deser.std;

import java.io.IOException;
import java.util.Iterator;

import com.fasterxml.jackson.core.*;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.cfg.MapperConfig;
import com.fasterxml.jackson.databind.deser.std.NumberDeserializers;
import com.fasterxml.jackson.databind.deser.std.StringDeserializer;
import com.fasterxml.jackson.databind.deser.std.UntypedObjectDeserializer;
import com.fasterxml.jackson.databind.json.JsonMapper;
import com.fasterxml.jackson.databind.jsontype.NamedType;
import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
Expand Down Expand Up @@ -482,16 +482,16 @@ public void testHasAnyGetter() throws Exception
public void testFindDeserializer() throws Exception
{
final JsonDeserializer<?> deserString = StringDeserializer.instance;
final JsonDeserializer<?> deserObject = UntypedObjectDeserializer.Vanilla.std;
final JsonDeserializer<?> deserBoolean = NumberDeserializers.find(Boolean.TYPE, "b");

AnnotationIntrospector intr1 = new IntrospectorWithHandlers(deserString, null);
AnnotationIntrospector intr2 = new IntrospectorWithHandlers(deserObject, null);
AnnotationIntrospector intr2 = new IntrospectorWithHandlers(deserBoolean, null);
AnnotationIntrospector nop = AnnotationIntrospector.nopInstance();
AnnotationIntrospector nop2 = new IntrospectorWithHandlers(JsonDeserializer.None.class, null);

assertSame(deserString,
new AnnotationIntrospectorPair(intr1, intr2).findDeserializer(null));
assertSame(deserObject,
assertSame(deserBoolean,
new AnnotationIntrospectorPair(intr2, intr1).findDeserializer(null));
// also: no-op instance should not block real one, regardless
assertSame(deserString,
Expand Down

0 comments on commit 3942c2e

Please sign in to comment.