Skip to content

Commit f203048

Browse files
committed
Minor improvement to default type resolver builder construction
1 parent 4bbce44 commit f203048

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/main/java/com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder.java

+9-10
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
public interface TypeResolverBuilder<T extends TypeResolverBuilder<T>>
4040
{
4141
/*
42-
/**********************************************************
42+
/**********************************************************************
4343
/* Accessors
44-
/**********************************************************
44+
/**********************************************************************
4545
*/
4646

4747
/**
@@ -52,9 +52,9 @@ public interface TypeResolverBuilder<T extends TypeResolverBuilder<T>>
5252
public Class<?> getDefaultImpl();
5353

5454
/*
55-
/**********************************************************
55+
/**********************************************************************
5656
/* Actual builder methods
57-
/**********************************************************
57+
/**********************************************************************
5858
*/
5959

6060
/**
@@ -79,10 +79,9 @@ public TypeDeserializer buildTypeDeserializer(DeserializationConfig config,
7979
JavaType baseType, Collection<NamedType> subtypes);
8080

8181
/*
82-
/**********************************************************
83-
/* Initialization method(s) that must be called before other
84-
/* configuration
85-
/**********************************************************
82+
/**********************************************************************
83+
/* Initialization method(s) that must be called before other configuration
84+
/**********************************************************************
8685
*/
8786

8887
/**
@@ -98,9 +97,9 @@ public TypeDeserializer buildTypeDeserializer(DeserializationConfig config,
9897
public T init(JsonTypeInfo.Value settings, TypeIdResolver res);
9998

10099
/*
101-
/**********************************************************
100+
/**********************************************************************
102101
/* Methods for configuring resolver to build
103-
/**********************************************************
102+
/**********************************************************************
104103
*/
105104

106105
/**

src/main/java/com/fasterxml/jackson/databind/jsontype/TypeResolverProvider.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ protected TypeResolverBuilder<?> _findTypeResolver(MapperConfig<?> config,
247247
typeInfo = typeInfo.withInclusionType(JsonTypeInfo.As.PROPERTY);
248248
}
249249
}
250-
b = _constructStdTypeResolverBuilder(typeInfo);
250+
b = _constructStdTypeResolverBuilder(config, typeInfo, baseType);
251251
}
252252
// Does it define a custom type id resolver?
253253
Object customIdResolverOb = ai.findTypeIdResolver(config, ann);
@@ -265,7 +265,8 @@ protected TypeResolverBuilder<?> _findTypeResolver(MapperConfig<?> config,
265265
return b;
266266
}
267267

268-
protected StdTypeResolverBuilder _constructStdTypeResolverBuilder(JsonTypeInfo.Value typeInfo) {
268+
protected StdTypeResolverBuilder _constructStdTypeResolverBuilder(MapperConfig<?> config,
269+
JsonTypeInfo.Value typeInfo, JavaType baseType) {
269270
return new StdTypeResolverBuilder(typeInfo);
270271
}
271272
}

0 commit comments

Comments
 (0)