[camel] branch camel-2.x updated: CAMEL-13340: Invalid swagger json/yaml generated for Rest DSL

[dmvolod]

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

dmvolod pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-2.x by this push:
     new be0e71b  CAMEL-13340: Invalid swagger json/yaml generated for Rest DSL
be0e71b is described below

commit be0e71b9462ec8d5b629b7c14b5be17ae4ab5dae
Author: Dmitry Volodin <dmvo...@gmail.com>
AuthorDate: Mon Mar 25 17:14:49 2019 +0300

    CAMEL-13340: Invalid swagger json/yaml generated for Rest DSL
---
 .../java/org/apache/camel/swagger/RestSwaggerSupport.java  | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git 
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
 
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
index 56d9773..29e3ac2 100644
--- 
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
+++ 
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
@@ -204,10 +204,12 @@ public class RestSwaggerSupport {
 
     public void renderResourceListing(RestApiResponseAdapter response, 
BeanConfig swaggerConfig, String contextId, String route, boolean json, boolean 
yaml,
             Map<String, Object> headers, ClassResolver classResolver, 
RestConfiguration configuration) throws Exception {
-        ObjectMapper mapper;
-
         LOG.trace("renderResourceListing");
 
+        ObjectMapper mapper = Json.mapper();
+        mapper.enable(SerializationFeature.INDENT_OUTPUT);
+        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+
         if (cors) {
             setupCorsHeaders(response, configuration.getCorsHeaders());
         }
@@ -228,10 +230,6 @@ public class RestSwaggerSupport {
                     clearVendorExtensions(swagger);
                 }
 
-                mapper = Json.mapper();
-                mapper.enable(SerializationFeature.INDENT_OUTPUT);
-                mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-                
                 byte[] bytes = mapper.writeValueAsBytes(swagger);
 
                 int len = bytes.length;
@@ -251,10 +249,6 @@ public class RestSwaggerSupport {
                     clearVendorExtensions(swagger);
                 }
 
-                mapper = Yaml.mapper();
-                mapper.enable(SerializationFeature.INDENT_OUTPUT);
-                mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-                
                 byte[] jsonData = mapper.writeValueAsBytes(swagger);
 
                 // json to yaml