Merge pull request #2725 from swagger-api/ticket-2723

refs #2723 - support for complex values in ExtensionProperty

Author: frantuma

modules/swagger-annotations/src/main/java/io/swagger/v3/oas/annotations/extensions/ExtensionProperty.java

@@ -27,4 +27,11 @@
      * @return the value of the property
      */
     String value();
+
+    /**
+     * If set to true, field `value` will be parsed and serialized as JSON/YAML
+     *
+     * @return the value of `parseValue` annotation field
+     */
+    boolean parseValue() default false;
 }

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

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonView;
 import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.introspect.Annotated;
 import io.swagger.v3.core.converter.AnnotatedType;
 import io.swagger.v3.core.converter.ModelConverters;
@@ -1176,17 +1177,37 @@ public static Map<String, Object> getExtensions(Extension... extensions) {
             for (ExtensionProperty property : extension.properties()) {
                 final String propertyName = property.name();
                 final String propertyValue = property.value();
+                JsonNode processedValue = null;
+                final boolean propertyAsJson = property.parseValue();
                 if (StringUtils.isNotBlank(propertyName) && StringUtils.isNotBlank(propertyValue)) {
                     if (key.isEmpty()) {
-                        map.put(StringUtils.prependIfMissing(propertyName, "x-"), propertyValue);
+                        if (propertyAsJson) {
+                            try {
+                                processedValue = Json.mapper().readTree(propertyValue);
+                                map.put(StringUtils.prependIfMissing(propertyName, "x-"), processedValue);
+                            } catch (Exception e) {
+                                map.put(StringUtils.prependIfMissing(propertyName, "x-"), propertyValue);
+                            }
+                        } else {
+                            map.put(StringUtils.prependIfMissing(propertyName, "x-"), propertyValue);
+                        }
                     } else {
                         Object value = map.get(key);
                         if (value == null || !(value instanceof Map)) {
                             value = new HashMap<String, Object>();
                             map.put(key, value);
                         }
                         @SuppressWarnings("unchecked") final Map<String, Object> mapValue = (Map<String, Object>) value;
-                        mapValue.put(propertyName, propertyValue);
+                        if (propertyAsJson) {
+                            try {
+                                processedValue = Json.mapper().readTree(propertyValue);
+                                mapValue.put(propertyName, processedValue);
+                            } catch (Exception e) {
+                                mapValue.put(propertyName, propertyValue);
+                            }
+                        } else {
+                            mapValue.put(propertyName, propertyValue);
+                        }
                     }
                 }
             }

modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/resources/extensions/ExtensionsResource.java

@@ -165,7 +165,10 @@ public class ExtensionsResource {
                             @ExtensionProperty(name = "name", value = "Josh")}),
                     @Extension(name = "x-operation-extensions", properties = {
                             @ExtensionProperty(name = "lastName", value = "Hart"),
-                            @ExtensionProperty(name = "address", value = "House")})
+                            @ExtensionProperty(name = "address", value = "House")}),
+                    @Extension(properties = {
+                            @ExtensionProperty(name = "codes", value = "[\"11\", \"12\"]", parseValue = true),
+                            @ExtensionProperty(name = "name", value = "Josh")})
             })
     public Response getSummaryAndDescription(
             @Parameter(
@@ -434,11 +437,15 @@ public ExtensionUser setUser(
                     "        - read:pets\n" +
                     "      - myOauth2Security:\n" +
                     "        - write:pets\n" +
+                    "      x-name: Josh\n" +
                     "      x-operation:\n" +
                     "        name: Josh\n" +
                     "      x-operation-extensions:\n" +
                     "        lastName: Hart\n" +
                     "        address: House\n" +
+                    "      x-codes:\n" +
+                    "      - \"11\"\n" +
+                    "      - \"12\"\n" +
                     "  /user:\n" +
                     "    get:\n" +
                     "      operationId: getUser\n" +