refs #3409 - fix jsonValue processing

Author: frantuma

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

@@ -66,6 +66,8 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -354,12 +356,11 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
             }
         }
 
-        // using deprecated method to maintain compatibility with jackson version < 2.9
-        //alternatively use AnnotatedMember jsonValueMember = beanDesc.findJsonValueAccessor();
-        final AnnotatedMethod jsonValueMethod  = beanDesc.findJsonValueMethod();
-        if(jsonValueMethod != null) {
+        Type jsonValueType = findJsonValueType(beanDesc);
+
+        if(jsonValueType != null) {
             AnnotatedType aType = new AnnotatedType()
-                    .type(jsonValueMethod.getType())
+                    .type(jsonValueType)
                     .parent(annotatedType.getParent())
                     .name(annotatedType.getName())
                     .schemaProperty(annotatedType.isSchemaProperty())
@@ -873,6 +874,26 @@ private boolean shouldResolveEnumAsRef(io.swagger.v3.oas.annotations.media.Schem
         return (resolvedSchemaAnnotation != null && resolvedSchemaAnnotation.enumAsRef()) || ModelResolver.enumsAsRef;
     }
 
+    protected Type findJsonValueType(final BeanDescription beanDesc) {
+
+        // use recursion to check for method findJsonValueAccessor existence (Jackson 2.9+)
+        // if not found use previous deprecated method which could lead to inaccurate result
+        try {
+            Method m = BeanDescription.class.getMethod("findJsonValueAccessor", null);
+            AnnotatedMember jsonValueMember = (AnnotatedMember)m.invoke(beanDesc, null);
+            if (jsonValueMember != null) {
+                return jsonValueMember.getType();
+            }
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            LOGGER.warn("jackson BeanDescription.findJsonValueAccessor not found, this could lead to inaccurate result, please update jackson to 2.9+");
+            final AnnotatedMethod jsonValueMethod  = beanDesc.findJsonValueMethod();
+            if (jsonValueMethod != null) {
+                return jsonValueMethod.getType();
+            }
+        }
+        return null;
+    }
+
     private Schema clone(Schema property) {
         if(property == null)
             return property;

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

@@ -151,7 +151,11 @@ public static ObjectMapper buildStrictGenericObjectMapper() {
         mapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true);
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         mapper.configure(SerializationFeature.WRITE_NULL_MAP_VALUES, false);
-        mapper.configure(DeserializationFeature.FAIL_ON_TRAILING_TOKENS, true);
+        try {
+            mapper.configure(DeserializationFeature.valueOf("FAIL_ON_TRAILING_TOKENS"), true);
+        } catch (Throwable e) {
+            // add only if supported by Jackson version 2.9+
+        }
         mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
         return mapper;
     }

modules/swagger-core/src/test/java/io/swagger/v3/core/resolving/SimpleGenerationTest.java

@@ -4,21 +4,26 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.databind.BeanDescription;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.core.converter.AnnotatedType;
 import io.swagger.v3.core.converter.ModelConverterContextImpl;
+import io.swagger.v3.core.converter.ModelConverters;
 import io.swagger.v3.core.jackson.ModelResolver;
-import io.swagger.v3.core.util.Yaml;
 import io.swagger.v3.oas.models.media.Schema;
 import org.testng.annotations.Test;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Map;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
 import static org.testng.Assert.fail;
 
 public class SimpleGenerationTest extends SwaggerTestBase {
@@ -104,8 +109,36 @@ public void testIntArray() throws Exception {
         assertEquals(prop.getType(), "array");
     }
 
+
+
+    protected boolean isJacksonAtLeast2_9() throws NoSuchMethodException {
+
+        try {
+            Method m = BeanDescription.class.getMethod("findJsonValueAccessor", null);
+        } catch (NoSuchMethodException e) {
+            return false;
+        }
+        return true;
+    }
+
+
+
+    @Test
+    public void testJsonValue_Ticket3409() throws Exception {
+
+        DeserializationFeature aa = DeserializationFeature.valueOf("FAIL_ON_UNKNOWN_PROPERTIES");
+
+        Map<String, Schema> models = ModelConverters.getInstance().readAll(PlanetName.Planet.class);
+        assertNotNull(models.get("Planet"));
+        if (isJacksonAtLeast2_9()) {
+            assertNull(models.get("PlanetName"));
+            assertEquals(((Schema) models.get("Planet").getProperties().get("name")).getType(), "string");
+        }
+    }
+
     @Test
     public void testComplex() throws Exception {
+
         final Schema model = context.resolve(new AnnotatedType(ComplexBean.class));
         assertNotNull(model);
         final Map<String, Schema> props = model.getProperties();
@@ -208,4 +241,43 @@ public String getJ() {
         }
     }
 
+
+    static class PlanetName {
+
+        @JsonValue
+        private final String value;
+
+        @JsonCreator
+        private PlanetName(String value) {
+            this.value = value;
+        }
+
+        public static PlanetName valueOf(String value) {
+            return new PlanetName(value);
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return value;
+        }
+
+
+        static class Planet {
+
+            private PlanetName name;
+
+            public PlanetName getName() {
+                return name;
+            }
+
+            public void setName(PlanetName name) {
+                this.name = name;
+            }
+        }
+    }
+
 }