You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by il...@apache.org on 2018/01/05 10:36:48 UTC

[cxf] branch master updated: [CXF-7525] Fixing enum support

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new 9c29ffa  [CXF-7525] Fixing enum support
9c29ffa is described below

commit 9c29ffae95a989572c56ac2d595e89b4a8e7c35f
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Jan 5 11:36:16 2018 +0100

    [CXF-7525] Fixing enum support
---
 .../cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtils.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtils.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtils.java
index 8d172d2..5f82bcc 100644
--- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtils.java
+++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtils.java
@@ -260,9 +260,13 @@ public final class SwaggerToOpenApiConversionUtils {
                     sw2PathVerbParamMap.setProperty("schema", schema);
                 } else {
                     String type = (String)sw2PathVerbParamMap.removeProperty("type");
+                    Object enumK = sw2PathVerbParamMap.removeProperty("enum");
                     if (type != null) {
                         JsonMapObject schema = new JsonMapObject();
                         schema.setProperty("type", type);
+                        if (enumK != null) {
+                            schema.setProperty("enum", enumK);
+                        }
                         for (String prop : SIMPLE_TYPE_RELATED_PROPS) {
                             Object value = sw2PathVerbParamMap.removeProperty(prop);
                             if (value != null) {

-- 
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].