|
23 | 23 | import com.fasterxml.jackson.databind.introspect.AnnotatedClass; |
24 | 24 | import com.fasterxml.jackson.databind.introspect.AnnotatedMember; |
25 | 25 | import com.fasterxml.jackson.databind.introspect.AnnotatedMethod; |
26 | | -import com.fasterxml.jackson.databind.introspect.AnnotationMap; |
27 | 26 | import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition; |
28 | 27 | import com.fasterxml.jackson.databind.introspect.POJOPropertyBuilder; |
29 | 28 | import com.fasterxml.jackson.databind.jsontype.NamedType; |
@@ -577,11 +576,8 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context |
577 | 576 | if (member != null && !ignore(member, xmlAccessorTypeAnnotation, propName, propertiesToIgnore, propDef)) { |
578 | 577 |
|
579 | 578 | 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); |
585 | 581 | } |
586 | 582 |
|
587 | 583 | annotations = annotationList.toArray(new Annotation[annotationList.size()]); |
@@ -1120,11 +1116,8 @@ protected Schema processAsId(String propertyName, AnnotatedType type, |
1120 | 1116 | return PrimitiveType.createProperty(propType); |
1121 | 1117 | } else { |
1122 | 1118 | 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); |
1128 | 1121 | } |
1129 | 1122 | Annotation[] annotations = list.toArray(new Annotation[list.size()]); |
1130 | 1123 | AnnotatedType aType = new AnnotatedType() |
|
0 commit comments