fix: Include extended classes and implemented interfaces for JsonValue method search

Author: T3rm1

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

@@ -1171,9 +1171,7 @@ 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())
+        Optional<Method> jsonValueMethod = ReflectionUtils.getAnnotatedMethods(propClass, JsonValue.class).stream()
                 .findFirst();
 
         Optional<Field> jsonValueField = Arrays.stream(propClass.getDeclaredFields())

Diff for: modules/swagger-core/src/main/java/io/swagger/v3/core/util/ReflectionUtils.java

@@ -486,6 +486,29 @@ public static Optional<Object> safeGet(Field field, Object obj) {
         } catch (IllegalAccessException e) {
             return Optional.empty();
         }
+    }
 
+    public static List<Method> getAnnotatedMethods(Class<?> type, Class<? extends Annotation> annotation) {
+        List<Method> methods = new ArrayList<>();
+        for (Class<?> clazz = type; clazz != Object.class; clazz = clazz.getSuperclass()) {
+            for (Method method : clazz.getDeclaredMethods()) {
+                if (method.isAnnotationPresent(annotation)) {
+                    methods.add(method);
+                }
+            }
+        }
+        getAnnotatedMethodsFromInterfaces(type, annotation, methods);
+        return methods;
+    }
+
+    private static void getAnnotatedMethodsFromInterfaces(Class<?> type, Class<? extends Annotation> annotation, List<Method> methods) {
+        for (Class<?> iface : type.getInterfaces()) {
+            for (Method method : iface.getDeclaredMethods()) {
+                if (method.isAnnotationPresent(annotation)) {
+                    methods.add(method);
+                }
+            }
+            getAnnotatedMethodsFromInterfaces(iface, annotation, methods);
+        }
     }
 }

Diff for: modules/swagger-core/src/test/java/io/swagger/v3/core/converting/EnumPropertyTest.java

@@ -19,6 +19,7 @@
 import org.testng.annotations.Test;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Map;
 
 import static org.testng.Assert.assertEquals;
@@ -233,6 +234,11 @@ public void testExtractJacksonEnumFields() {
         final Schema sixthEnumProperty = (Schema) model.getProperties().get("sixthEnumValue");
         assertTrue(sixthEnumProperty instanceof StringSchema);
         final StringSchema sixthStringProperty = (StringSchema) sixthEnumProperty;
-        assertEquals(sixthEnumProperty.getEnum(), Arrays.asList("one", "two", "three"));
+        assertEquals(sixthStringProperty.getEnum(), Arrays.asList("one", "two", "three"));
+
+        final Schema seventhEnumProperty = (Schema) model.getProperties().get("seventhEnumValue");
+        assertTrue(seventhEnumProperty instanceof StringSchema);
+        final StringSchema seventhEnumStringProperty = (StringSchema) seventhEnumProperty;
+        assertEquals(seventhEnumStringProperty.getEnum(), Collections.singletonList("10"));
     }
 }

Diff for: modules/swagger-core/src/test/java/io/swagger/v3/core/oas/models/InterfaceWithJacksonValue.java

@@ -0,0 +1,9 @@
+package io.swagger.v3.core.oas.models;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public interface InterfaceWithJacksonValue {
+
+	@JsonValue
+	int getJsonValue();
+}

Diff for: modules/swagger-core/src/test/java/io/swagger/v3/core/oas/models/JacksonValueInInterfaceEnum.java

@@ -0,0 +1,18 @@
+
+package io.swagger.v3.core.oas.models;
+
+public enum JacksonValueInInterfaceEnum implements InterfaceWithJacksonValue {
+
+	TEN(10);
+
+	private final int jsonValue;
+
+	JacksonValueInInterfaceEnum(int jsonValue) {
+		this.jsonValue = jsonValue;
+	}
+
+	@Override
+	public int getJsonValue() {
+		return jsonValue;
+	}
+}

Diff for: modules/swagger-core/src/test/java/io/swagger/v3/core/oas/models/ModelWithJacksonEnumField.java

@@ -10,4 +10,5 @@ public class ModelWithJacksonEnumField {
     public JacksonValueFieldEnum fourthEnumValue;
     public JacksonNumberValueFieldEnum fifthEnumValue;
     public JacksonValuePrivateEnum sixthEnumValue;
+    public JacksonValueInInterfaceEnum seventhEnumValue;
 }