[camel] branch master 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 master
in repository https://gitbox.apache.org/repos/asf/camel.git


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

commit a7178ede2a67ef28c7f53359344e6966f5b526ce
Author: Dmitry Volodin <dmvo...@gmail.com>
AuthorDate: Mon Mar 25 17:08:03 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 e8a7abe..4644544 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
@@ -255,9 +255,11 @@ public class RestSwaggerSupport {
 
     public void renderResourceListing(CamelContext camelContext, 
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());
@@ -284,10 +286,6 @@ public class RestSwaggerSupport {
                 if (!configuration.isApiVendorExtension()) {
                     clearVendorExtensions(swagger);
                 }
-
-                mapper = Json.mapper();
-                mapper.enable(SerializationFeature.INDENT_OUTPUT);
-                mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
                 
                 byte[] bytes = mapper.writeValueAsBytes(swagger);
 
@@ -308,10 +306,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