Merge pull request #3674 from swagger-api/ticket-3673

refs #3673 - Null check getIgnoredProperties
swagger-api · Aug 3, 2020 · 0144bff · 0144bff
2 parents db45dc4 + eb09692
commit 0144bff
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java b/modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java
@@ -2013,7 +2013,11 @@ protected boolean shouldIgnoreClass(Type type) {
 
     private List<String> getIgnoredProperties(BeanDescription beanDescription) {
         AnnotationIntrospector introspector = _mapper.getSerializationConfig().getAnnotationIntrospector();
-        Set<String> ignored = introspector.findPropertyIgnorals(beanDescription.getClassInfo()).findIgnoredForSerialization();
+        JsonIgnoreProperties.Value v = introspector.findPropertyIgnorals(beanDescription.getClassInfo());
+        Set<String> ignored = null;
+        if (v != null) {
+            ignored = v.findIgnoredForSerialization();
+        }
         return ignored == null ? Collections.emptyList() : new ArrayList<>(ignored);
     }