refactor: annotation parsing as methods

Author: Mattias-Sehlstedt

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

@@ -179,19 +179,9 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
         }
 
         final Annotation resolvedSchemaOrArrayAnnotation = AnnotationsUtils.mergeSchemaAnnotations(annotatedType.getCtxAnnotations(), type);
-        final io.swagger.v3.oas.annotations.media.Schema resolvedSchemaAnnotation =
-                resolvedSchemaOrArrayAnnotation == null ?
-                        null :
-                        resolvedSchemaOrArrayAnnotation instanceof io.swagger.v3.oas.annotations.media.ArraySchema ?
-                                ((io.swagger.v3.oas.annotations.media.ArraySchema) resolvedSchemaOrArrayAnnotation).schema() :
-                                (io.swagger.v3.oas.annotations.media.Schema) resolvedSchemaOrArrayAnnotation;
-
-        final io.swagger.v3.oas.annotations.media.ArraySchema resolvedArrayAnnotation =
-                resolvedSchemaOrArrayAnnotation == null ?
-                        null :
-                        resolvedSchemaOrArrayAnnotation instanceof io.swagger.v3.oas.annotations.media.ArraySchema ?
-                                (io.swagger.v3.oas.annotations.media.ArraySchema) resolvedSchemaOrArrayAnnotation :
-                                null;
+        final io.swagger.v3.oas.annotations.media.Schema resolvedSchemaAnnotation = getSchemaAnnotation(resolvedSchemaOrArrayAnnotation);
+
+        final io.swagger.v3.oas.annotations.media.ArraySchema resolvedArrayAnnotation = getArraySchemaAnnotation(resolvedSchemaOrArrayAnnotation);
 
         final BeanDescription beanDesc;
         {
@@ -744,12 +734,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
                     propName = propSchemaName;
                 }
                 Annotation propSchemaOrArray = AnnotationsUtils.mergeSchemaAnnotations(annotations, propType);
-                final io.swagger.v3.oas.annotations.media.Schema propResolvedSchemaAnnotation =
-                        propSchemaOrArray == null ?
-                                null :
-                                propSchemaOrArray instanceof io.swagger.v3.oas.annotations.media.ArraySchema ?
-                                        ((io.swagger.v3.oas.annotations.media.ArraySchema) propSchemaOrArray).arraySchema() :
-                                        (io.swagger.v3.oas.annotations.media.Schema) propSchemaOrArray;
+                final io.swagger.v3.oas.annotations.media.Schema propResolvedSchemaAnnotation = getSchemaAnnotationForArray(propSchemaOrArray);
 
                 io.swagger.v3.oas.annotations.media.Schema.AccessMode accessMode = resolveAccessMode(propDef, type, propResolvedSchemaAnnotation);
                 io.swagger.v3.oas.annotations.media.Schema.RequiredMode requiredMode = resolveRequiredMode(propResolvedSchemaAnnotation, propType);
@@ -3040,12 +3025,7 @@ protected void resolveSchemaMembers(Schema schema, AnnotatedType annotatedType,
         }
 
         final Annotation resolvedSchemaOrArrayAnnotation = AnnotationsUtils.mergeSchemaAnnotations(annotatedType.getCtxAnnotations(), type);
-        final io.swagger.v3.oas.annotations.media.Schema schemaAnnotation =
-                resolvedSchemaOrArrayAnnotation == null ?
-                        null :
-                        resolvedSchemaOrArrayAnnotation instanceof io.swagger.v3.oas.annotations.media.ArraySchema ?
-                                ((io.swagger.v3.oas.annotations.media.ArraySchema) resolvedSchemaOrArrayAnnotation).schema() :
-                                (io.swagger.v3.oas.annotations.media.Schema) resolvedSchemaOrArrayAnnotation;
+        final io.swagger.v3.oas.annotations.media.Schema schemaAnnotation = getSchemaAnnotation(resolvedSchemaOrArrayAnnotation);
 
         final BeanDescription beanDesc = _mapper.getSerializationConfig().introspect(type);
         Annotated a = beanDesc.getClassInfo();
@@ -3564,6 +3544,36 @@ private Optional<Schema> resolveArraySchemaWithCycleGuard(
         return reResolvedProperty;
     }
 
+    private io.swagger.v3.oas.annotations.media.Schema getSchemaAnnotationForArray(Annotation annotation) {
+        if (annotation == null) {
+            return null;
+        } else {
+            return annotation instanceof io.swagger.v3.oas.annotations.media.ArraySchema ?
+                    ((io.swagger.v3.oas.annotations.media.ArraySchema) annotation).arraySchema() :
+                    (io.swagger.v3.oas.annotations.media.Schema) annotation;
+        }
+    }
+
+    private io.swagger.v3.oas.annotations.media.Schema getSchemaAnnotation(Annotation annotation) {
+        if (annotation == null) {
+            return null;
+        } else {
+            return annotation instanceof io.swagger.v3.oas.annotations.media.ArraySchema ?
+                    ((io.swagger.v3.oas.annotations.media.ArraySchema) annotation).schema() :
+                    (io.swagger.v3.oas.annotations.media.Schema) annotation;
+        }
+    }
+
+    private io.swagger.v3.oas.annotations.media.ArraySchema getArraySchemaAnnotation(Annotation annotation) {
+        if (annotation == null) {
+            return null;
+        } else {
+            return annotation instanceof io.swagger.v3.oas.annotations.media.ArraySchema ?
+                    (io.swagger.v3.oas.annotations.media.ArraySchema) annotation :
+                    null;
+        }
+    }
+
     /**
      * Checks if the given JavaType represents a java.util.stream.Stream
      */