refactor: simplify schema annotation type introspection

Author: Mattias-Sehlstedt

modules/swagger-core/src/main/java/io/swagger/v3/core/util/AnnotationsUtils.java

@@ -61,6 +61,8 @@
 public abstract class AnnotationsUtils {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AnnotationsUtils.class);
+    private static final String NULL_TYPE = "null";
+    private static final String STRING_TYPE = "string";
     public static final String COMPONENTS_REF = Components.COMPONENTS_SCHEMAS_REF;
 
     public static boolean hasSchemaAnnotation(io.swagger.v3.oas.annotations.media.Schema schema) {
@@ -1003,7 +1005,7 @@ public static List<Object> parseExamplesArray(io.swagger.v3.oas.annotations.medi
                 // Only parse "null" as null value when nullable=true
                 if (node.isNull() && schema.nullable()) {
                     parsedExamples.add(null);
-                } else if (schemaObject == null && "string".equals(schema.type())) {
+                } else if (schemaObject == null && STRING_TYPE.equals(schema.type())) {
                     parsedExamples.add(trimmed);
                 } else if (shouldUseNodeAsExample(node, schemaObject)) {
                     parsedExamples.add(node);
@@ -1081,7 +1083,7 @@ public static Schema resolveSchemaFromType(Class<?> schemaImplementation,
         }
         if (StringUtils.isBlank(existingSchemaObject.get$ref()) && StringUtils.isBlank(existingSchemaObject.getType())) {
             // default to string
-            existingSchemaObject.setType("string");
+            existingSchemaObject.setType(STRING_TYPE);
         }
         return existingSchemaObject;
     }
@@ -1711,7 +1713,7 @@ public static Type getSchemaType(io.swagger.v3.oas.annotations.media.Schema sche
                 }
             case "boolean":
                 return Boolean.class;
-            case "string":
+            case STRING_TYPE:
                 return String.class;
             default:
                 if (nullIfNotFound) {
@@ -1949,26 +1951,28 @@ public static Optional<? extends Schema> getSchema(io.swagger.v3.oas.annotations
         } else {
             Optional<Schema> schemaFromAnnotation = AnnotationsUtils.getSchemaFromAnnotation(schemaAnnotation, components, jsonViewAnnotation, openapi31, null, context);
             if (schemaFromAnnotation.isPresent()) {
-                if (StringUtils.isBlank(schemaFromAnnotation.get().get$ref()) && StringUtils.isBlank(schemaFromAnnotation.get().getType()) && !(schemaFromAnnotation.get() instanceof ComposedSchema)) {
+                Schema schema = schemaFromAnnotation.get();
+                if (StringUtils.isBlank(schema.get$ref()) && StringUtils.isBlank(schema.getType()) && !(schema instanceof ComposedSchema)) {
                     // default to string
-                    schemaFromAnnotation.get().setType("string");
+                    schema.setType(STRING_TYPE);
                 }
-                return Optional.of(schemaFromAnnotation.get());
+                return Optional.of(schema);
             } else {
                 Optional<Schema> arraySchemaFromAnnotation = AnnotationsUtils.getArraySchema(arrayAnnotation, components, jsonViewAnnotation, openapi31, null, false, context);
                 if (arraySchemaFromAnnotation.isPresent()) {
-                    if (arraySchemaFromAnnotation.get().getItems() != null && StringUtils.isBlank(arraySchemaFromAnnotation.get().getItems().get$ref()) && StringUtils.isBlank(arraySchemaFromAnnotation.get().getItems().getType())) {
+                    Schema schema = arraySchemaFromAnnotation.get();
+                    Schema schemaItems = schema.getItems();
+                    if (schemaItems != null && StringUtils.isBlank(schemaItems.get$ref()) && StringUtils.isBlank(schemaItems.getType())) {
                         // default to string
-                        arraySchemaFromAnnotation.get().getItems().setType("string");
+                        schemaItems.setType(STRING_TYPE);
                     }
-                    return Optional.of(arraySchemaFromAnnotation.get());
+                    return Optional.of(schema);
                 }
             }
         }
         return Optional.empty();
     }
 
-
     public static void applyTypes(String[] classTypes, String[] methodTypes, Content content, MediaType mediaType) {
         if (methodTypes != null && methodTypes.length > 0) {
             for (String value : methodTypes) {