upgraded swagger dependencies and fixed bug creating sample responses when no produces was specified at the operation level

Author: olensmar

pom.xml

@@ -52,9 +52,9 @@
 
     <properties>
         <jackson-version>2.4.2</jackson-version>
-        <swagger-version>1.5.9</swagger-version>
-        <swagger-parser.version>1.0.21</swagger-parser.version>
-        <swagger-inflector.version>1.0.8</swagger-inflector.version>
+        <swagger-version>1.5.10</swagger-version>
+        <swagger-parser.version>1.0.22</swagger-parser.version>
+        <swagger-inflector.version>1.0.10</swagger-inflector.version>
         <readyapi-version>1.9.0</readyapi-version>
     </properties>
 

src/main/groovy/com/smartbear/swagger/Swagger2Importer.groovy

@@ -27,6 +27,7 @@ import com.eviware.soapui.impl.rest.support.RestParameter
 import com.eviware.soapui.impl.rest.support.RestParamsPropertyHolder.ParameterStyle
 import com.eviware.soapui.impl.wsdl.WsdlProject
 import com.eviware.soapui.support.StringUtils
+import com.eviware.soapui.support.xml.XmlUtils
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.module.SimpleModule
 import io.swagger.inflector.examples.ExampleBuilder
@@ -216,7 +217,7 @@ class Swagger2Importer implements SwaggerImporter {
 
                 def consumes = operation.consumes
                 if (consumes == null || consumes.empty) {
-                    consumes = ["application/json"]
+                    consumes = swagger.consumes
                 }
 
                 consumes.each {
@@ -255,6 +256,10 @@ class Swagger2Importer implements SwaggerImporter {
         operation.responses?.each {
             def response = it
 
+            if (operation.produces == null || operation.produces.empty){
+                operation.produces = swagger.produces
+            }
+
             if (operation.produces == null || operation.produces.empty) {
                 def representation = method.addNewRepresentation(RestRepresentation.Type.RESPONSE)
 
@@ -307,13 +312,13 @@ class Swagger2Importer implements SwaggerImporter {
         def mapper = null
 
         switch (mediaType) {
-            case "application/xml": sampleValue = new XmlExampleSerializer().serialize(output); break;
+            case "application/xml": sampleValue = XmlUtils.prettyPrintXml(new XmlExampleSerializer().serialize(output)); break;
             case "application/yaml": mapper = yamlMapper; break;
             case "application/json": mapper = jsonMapper; break;
         }
 
         if (mapper != null) {
-            sampleValue = mapper.writer().writeValueAsString(output)
+            sampleValue = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(output)
         }
         return sampleValue
     }