fix: enum schemas - compatibility and 3.1 support

Author: frantuma

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

@@ -338,8 +338,6 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
             @SuppressWarnings("unchecked")
             Class<Enum<?>> rawEnumClass = (Class<Enum<?>>) type.getRawClass();
             model = _createSchemaForEnum(rawEnumClass);
-            model = openapi31 ? new JsonSchema().typesItem("string") : new StringSchema();
-            _addEnumProps(type.getRawClass(), model);
             isPrimitive = true;
         }
         if (model == null) {
@@ -1295,69 +1293,18 @@ protected boolean _isOptionalType(JavaType propType) {
     }
 
     /**
-     * Adds each enum property value to the model schema
-     *
-     * @param propClass the enum class for which to add properties
-     * @param property  the schema to add properties to
+     * @deprecated use '_createSchemaForEnum'
      */
     protected void _addEnumProps(Class<?> propClass, Schema property) {
-        final boolean useIndex = _mapper.isEnabled(SerializationFeature.WRITE_ENUMS_USING_INDEX);
-        final boolean useToString = _mapper.isEnabled(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
-
-        Optional<Method> jsonValueMethod = Arrays.stream(propClass.getDeclaredMethods())
-                .filter(m -> m.isAnnotationPresent(JsonValue.class))
-                .filter(m -> m.getAnnotation(JsonValue.class).value())
-                .findFirst();
-
-        Optional<Field> jsonValueField = Arrays.stream(propClass.getDeclaredFields())
-                .filter(f -> f.isAnnotationPresent(JsonValue.class))
-                .filter(f -> f.getAnnotation(JsonValue.class).value())
-                .findFirst();
-
-        jsonValueMethod.ifPresent(m -> m.setAccessible(true));
-        jsonValueField.ifPresent(m -> m.setAccessible(true));
-        @SuppressWarnings("unchecked")
-        Class<Enum<?>> enumClass = (Class<Enum<?>>) propClass;
-
-        Enum<?>[] enumConstants = enumClass.getEnumConstants();
-
-        if (enumConstants != null) {
-            String[] enumValues = _intr().findEnumValues(propClass, enumConstants,
-                    new String[enumConstants.length]);
-
-            for (Enum<?> en : enumConstants) {
-                String n;
-
-                Field enumField = ReflectionUtils.findField(en.name(), enumClass);
-                if (null != enumField && enumField.isAnnotationPresent(Hidden.class)) {
-                    continue;
-                }
-
-                String enumValue = enumValues[en.ordinal()];
-                String methodValue = jsonValueMethod.flatMap(m -> ReflectionUtils.safeInvoke(m, en)).map(Object::toString).orElse(null);
-                String fieldValue = jsonValueField.flatMap(f -> ReflectionUtils.safeGet(f, en)).map(Object::toString).orElse(null);
-
-                if (methodValue != null) {
-                    n = methodValue;
-                } else if (fieldValue != null) {
-                    n = fieldValue;
-                } else if (enumValue != null) {
-                    n = enumValue;
-                } else if (useIndex) {
-                    n = String.valueOf(en.ordinal());
-                } else if (useToString) {
-                    n = en.toString();
-                } else {
-                    n = _intr().findEnumValue(en);
-                }
-                if (isStringSchema(property)) {
-                    if (openapi31) {
-                        property.addEnumItemObject(n);
-                    } else {
-                        StringSchema sp = (StringSchema) property;
-                        sp.addEnumItem(n);
-                    }
-                }
+        if (propClass.isEnum()) {
+            Class<Enum<?>> rawEnumClass = (Class<Enum<?>>) propClass;
+            Schema enumSchema = _createSchemaForEnum(rawEnumClass);
+            if (enumSchema != null) {
+                property.setEnum(enumSchema.getEnum());
+                property.setType(enumSchema.getType());
+                property.setFormat(enumSchema.getFormat());
+                property.setName(enumSchema.getName());
+                property.setDescription(enumSchema.getDescription());
             }
         }
     }
@@ -1386,23 +1333,23 @@ protected Schema _createSchemaForEnum(Class<Enum<?>> enumClass) {
             jsonValueField.get().setAccessible(true);
             PrimitiveType primitiveType = PrimitiveType.fromType(jsonValueField.get().getType());
             if (primitiveType != null) {
-                schema = primitiveType.createProperty();
+                schema = openapi31 ? primitiveType.createProperty31() : primitiveType.createProperty();
             }
         } else if (jsonValueMethod.isPresent()) {
             jsonValueMethod.get().setAccessible(true);
             PrimitiveType primitiveType = PrimitiveType.fromType(jsonValueMethod.get().getReturnType());
             if (primitiveType != null) {
-                schema = primitiveType.createProperty();
+                schema = openapi31 ? primitiveType.createProperty31() : primitiveType.createProperty();
             }
         }
         if (schema == null) {
-            schema = new StringSchema();
+            schema = openapi31 ? new JsonSchema().typesItem("string") : new StringSchema();
         }
 
         Enum<?>[] enumConstants = enumClass.getEnumConstants();
 
         if (enumConstants != null) {
-            String[] enumValues = _intr.findEnumValues(enumClass, enumConstants,
+            String[] enumValues = _intr().findEnumValues(enumClass, enumConstants,
                     new String[enumConstants.length]);
 
             for (Enum<?> en : enumConstants) {
@@ -1427,7 +1374,7 @@ protected Schema _createSchemaForEnum(Class<Enum<?>> enumClass) {
                 } else if (useToString) {
                     n = en.toString();
                 } else {
-                    n = _intr.findEnumValue(en);
+                    n = _intr().findEnumValue(en);
                 }
                 schema.addEnumItemObject(n);
             }