Skip to content

Commit 02583aa

Browse files
committed
refs #3554 - update jackson to 2.11.1
1 parent 072d54b commit 02583aa

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

modules/swagger-core/src/main/java/io/swagger/jackson/ModelResolver.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ protected void _addEnumProps(Class<?> propClass, StringProperty property) {
220220
}
221221
property._enum(n);
222222
}
223-
223+
224224
if (!useIndex && !useToString) {
225225
property._enum(Arrays.asList(_intr.findEnumValues(propClass, enumClass.getEnumConstants(), property.getEnum().toArray(new String[0]))));
226226
}
@@ -422,7 +422,7 @@ public Model resolve(JavaType type, ModelConverterContext context, Iterator<Mode
422422
allowEmptyValue = null;
423423
}
424424

425-
JavaType propType = member.getType(beanDesc.bindingsForBeanType());
425+
JavaType propType = member.getType();
426426

427427
// allow override of name from annotation
428428
if (mp != null && !mp.name().isEmpty()) {
@@ -755,7 +755,7 @@ protected Property processAsId(String propertyName, JavaType type,
755755
final String name = def.getName();
756756
if (name != null && name.equals(propertyName)) {
757757
final AnnotatedMember propMember = def.getPrimaryMember();
758-
final JavaType propType = propMember.getType(beanDesc.bindingsForBeanType());
758+
final JavaType propType = propMember.getType();
759759
if (PrimitiveType.fromType(propType) != null) {
760760
return PrimitiveType.createProperty(propType);
761761
} else {

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@
600600
<servlet-api-version>2.5</servlet-api-version>
601601
<jersey-version>1.13</jersey-version>
602602
<jersey2-version>2.25.1</jersey2-version>
603-
<jackson-version>2.10.1</jackson-version>
603+
<jackson-version>2.11.1</jackson-version>
604604
<logback-version>1.2.3</logback-version>
605605
<reflections-version>0.9.11</reflections-version>
606606
<guava-version>27.0.1-android</guava-version>

0 commit comments

Comments
 (0)