Skip to content

Commit 45e1541

Browse files
committed
refs #4212 - update jackson API usage to support Jackson < 2.9
1 parent 7c778d2 commit 45e1541

File tree

3 files changed

+8
-23
lines changed

3 files changed

+8
-23
lines changed

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
2424
import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
2525
import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
26-
import com.fasterxml.jackson.databind.introspect.AnnotationMap;
2726
import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
2827
import com.fasterxml.jackson.databind.introspect.POJOPropertyBuilder;
2928
import com.fasterxml.jackson.databind.jsontype.NamedType;
@@ -577,11 +576,8 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
577576
if (member != null && !ignore(member, xmlAccessorTypeAnnotation, propName, propertiesToIgnore, propDef)) {
578577

579578
List<Annotation> annotationList = new ArrayList<>();
580-
AnnotationMap annotationMap = member.getAllAnnotations();
581-
if (annotationMap != null) {
582-
for (Annotation a : annotationMap.annotations()) {
583-
annotationList.add(a);
584-
}
579+
for (Annotation a : member.annotations()) {
580+
annotationList.add(a);
585581
}
586582

587583
annotations = annotationList.toArray(new Annotation[annotationList.size()]);
@@ -1120,11 +1116,8 @@ protected Schema processAsId(String propertyName, AnnotatedType type,
11201116
return PrimitiveType.createProperty(propType);
11211117
} else {
11221118
List<Annotation> list = new ArrayList<>();
1123-
AnnotationMap annotationMap = propMember.getAllAnnotations();
1124-
if (annotationMap != null) {
1125-
for (Annotation a : annotationMap.annotations()) {
1126-
list.add(a);
1127-
}
1119+
for (Annotation a : propMember.annotations()) {
1120+
list.add(a);
11281121
}
11291122
Annotation[] annotations = list.toArray(new Annotation[list.size()]);
11301123
AnnotatedType aType = new AnnotatedType()

modules/swagger-project-jakarta/pom.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -575,12 +575,8 @@
575575
<servlet-api-version>5.0.0</servlet-api-version>
576576
<jersey2-version>3.0.1</jersey2-version>
577577
<junit-version>4.13.1</junit-version>
578-
<jackson-version>2.13.2</jackson-version>
579-
<!--
580-
2.13.2 is still affected by CVE-2020-36518.
581-
This version pin for jackson-databind can be removed when bumping jackson to 2.14
582-
-->
583-
<jackson-databind-version>2.13.2.2</jackson-databind-version>
578+
<jackson-version>2.13.3</jackson-version>
579+
<jackson-databind-version>2.13.3</jackson-databind-version>
584580
<logback-version>1.2.9</logback-version>
585581
<classgraph-version>4.8.138</classgraph-version>
586582
<guava-version>31.0.1-jre</guava-version>

pom.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -655,12 +655,8 @@
655655
<servlet-api-version>4.0.3</servlet-api-version>
656656
<jersey2-version>2.26</jersey2-version>
657657
<junit-version>4.13.1</junit-version>
658-
<jackson-version>2.13.2</jackson-version>
659-
<!--
660-
jackson-databind 2.13.2 is still affected by CVE-2020-36518.
661-
This version pin for jackson-databind can be removed when bumping jackson to 2.14
662-
-->
663-
<jackson-databind-version>2.13.2.2</jackson-databind-version>
658+
<jackson-version>2.13.3</jackson-version>
659+
<jackson-databind-version>2.13.3</jackson-databind-version>
664660
<logback-version>1.2.9</logback-version>
665661
<classgraph-version>4.8.138</classgraph-version>
666662
<guava-version>31.0.1-jre</guava-version>

0 commit comments

Comments
 (0)