fix enum in path parameter (spring) (#6810)

modules/swagger-codegen/src/main/resources/JavaSpring/api.mustache

@@ -54,7 +54,9 @@ public interface {{classname}} {
         @ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{baseType}}}.class{{/baseType}}{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{#hasMore}},{{/hasMore}}{{/responses}} })
     {{#implicitHeaders}}
     @ApiImplicitParams({
-    {{#headerParams}}{{>implicitHeader}}{{/headerParams}}
+    {{#headerParams}}
+    {{>implicitHeader}}
+    {{/headerParams}}
     })
     {{/implicitHeaders}}
     @RequestMapping(value = "{{{path}}}",{{#singleContentTypes}}

modules/swagger-codegen/src/main/resources/JavaSpring/pathParams.mustache

@@ -1 +1 @@
-{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}} {{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathVariable("{{baseName}}") {{>optionalDataType}} {{paramName}}{{/isPathParam}}
+{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathVariable("{{baseName}}") {{>optionalDataType}} {{paramName}}{{/isPathParam}}

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeApi.java

@@ -120,6 +120,18 @@ public interface FakeApi {
     }
 
 
+    @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation") })
+    @RequestMapping(value = "/fake/inline-additionalProperties",
+        consumes = { "application/json" },
+        method = RequestMethod.POST)
+    default CompletableFuture<ResponseEntity<Void>> testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true )  @Valid @RequestBody Object param, @RequestHeader(value = "Accept", required = false) String accept) throws Exception {
+        // do some magic!
+        return CompletableFuture.completedFuture(new ResponseEntity<Void>(HttpStatus.OK));
+    }
+
+
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })

samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java

@@ -97,6 +97,15 @@ public interface FakeApi {
     ResponseEntity<Void> testEnumParameters(@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $") @RequestPart(value="enum_form_string_array", required=false)  List<String> enumFormStringArray,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestPart(value="enum_form_string", required=false)  String enumFormString,@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $") @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestHeader(value="enum_header_string", required=false) String enumHeaderString,@ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) List<String> enumQueryStringArray,@ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue="-efg") String enumQueryString,@ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) Integer enumQueryInteger,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @RequestPart(value="enum_query_double", required=false)  Double enumQueryDouble, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
 
 
+    @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation") })
+    @RequestMapping(value = "/fake/inline-additionalProperties",
+        consumes = { "application/json" },
+        method = RequestMethod.POST)
+    ResponseEntity<Void> testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true )  @Valid @RequestBody Object param, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
+
+
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })

samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApiController.java

@@ -119,6 +119,12 @@ public class FakeApiController implements FakeApi {
         return new ResponseEntity<Void>(HttpStatus.OK);
     }
 
+    public ResponseEntity<Void> testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true )  @Valid @RequestBody Object param,
+        @RequestHeader(value = "Accept", required = false) String accept) throws Exception {
+        // do some magic!
+        return new ResponseEntity<Void>(HttpStatus.OK);
+    }
+
     public ResponseEntity<Void> testJsonFormData(@ApiParam(value = "field1", required=true) @RequestPart(value="param", required=true)  String param,
         @ApiParam(value = "field2", required=true) @RequestPart(value="param2", required=true)  String param2,
         @RequestHeader(value = "Accept", required = false) String accept) throws Exception {

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/FakeApi.java

@@ -97,6 +97,15 @@ public interface FakeApi {
     ResponseEntity<Void> testEnumParameters(@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $") @RequestPart(value="enum_form_string_array", required=false)  List<String> enumFormStringArray,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestPart(value="enum_form_string", required=false)  String enumFormString,@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $") @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestHeader(value="enum_header_string", required=false) String enumHeaderString,@ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) List<String> enumQueryStringArray,@ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue="-efg") String enumQueryString,@ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) Integer enumQueryInteger,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @RequestPart(value="enum_query_double", required=false)  Double enumQueryDouble, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
 
 
+    @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation") })
+    @RequestMapping(value = "/fake/inline-additionalProperties",
+        consumes = { "application/json" },
+        method = RequestMethod.POST)
+    ResponseEntity<Void> testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true )  @Valid @RequestBody Object param, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
+
+
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/FakeApiController.java

@@ -119,6 +119,12 @@ public class FakeApiController implements FakeApi {
         return new ResponseEntity<Void>(HttpStatus.OK);
     }
 
+    public ResponseEntity<Void> testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true )  @Valid @RequestBody Object param,
+        @RequestHeader(value = "Accept", required = false) String accept) throws Exception {
+        // do some magic!
+        return new ResponseEntity<Void>(HttpStatus.OK);
+    }
+
     public ResponseEntity<Void> testJsonFormData(@ApiParam(value = "field1", required=true) @RequestPart(value="param", required=true)  String param,
         @ApiParam(value = "field2", required=true) @RequestPart(value="param2", required=true)  String param2,
         @RequestHeader(value = "Accept", required = false) String accept) throws Exception {

samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/FakeApi.java

@@ -119,6 +119,18 @@ public interface FakeApi {
     }
 
 
+    @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation") })
+    @RequestMapping(value = "/fake/inline-additionalProperties",
+        consumes = { "application/json" },
+        method = RequestMethod.POST)
+    default ResponseEntity<Void> testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true )  @Valid @RequestBody Object param, @RequestHeader(value = "Accept", required = false) String accept) throws Exception {
+        // do some magic!
+        return new ResponseEntity<Void>(HttpStatus.OK);
+    }
+
+
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })

samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/FakeApiController.java

@@ -101,6 +101,12 @@ public class FakeApiController implements FakeApi {
         return delegate.testEnumParameters(enumFormStringArray, enumFormString, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble);
     }
 
+    public ResponseEntity<Void> testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true )  @Valid @RequestBody Object param,
+        @RequestHeader(value = "Accept", required = false) String accept) throws Exception {
+        // do some magic!
+        return delegate.testInlineAdditionalProperties(param);
+    }
+
     public ResponseEntity<Void> testJsonFormData(@ApiParam(value = "field1", required=true) @RequestPart(value="param", required=true)  String param,
         @ApiParam(value = "field2", required=true) @RequestPart(value="param2", required=true)  String param2,
         @RequestHeader(value = "Accept", required = false) String accept) throws Exception {

samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/FakeApiDelegate.java

@@ -97,6 +97,14 @@ public interface FakeApiDelegate {
     return new ResponseEntity<Void>(HttpStatus.OK);
     }
 
+    /**
+     * @see FakeApi#testInlineAdditionalProperties
+     */
+    default ResponseEntity<Void> testInlineAdditionalProperties(Object param) {
+    // do some magic!
+    return new ResponseEntity<Void>(HttpStatus.OK);
+    }
+
     /**
      * @see FakeApi#testJsonFormData
      */

samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/FakeApi.java

@@ -97,6 +97,15 @@ public interface FakeApi {
     ResponseEntity<Void> testEnumParameters(@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $") @RequestPart(value="enum_form_string_array", required=false)  List<String> enumFormStringArray,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestPart(value="enum_form_string", required=false)  String enumFormString,@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $") @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestHeader(value="enum_header_string", required=false) String enumHeaderString,@ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) List<String> enumQueryStringArray,@ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue="-efg") String enumQueryString,@ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) Integer enumQueryInteger,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @RequestPart(value="enum_query_double", required=false)  Double enumQueryDouble, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
 
 
+    @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation") })
+    @RequestMapping(value = "/fake/inline-additionalProperties",
+        consumes = { "application/json" },
+        method = RequestMethod.POST)
+    ResponseEntity<Void> testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true )  @Valid @RequestBody Object param, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
+
+
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })

samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/FakeApiController.java

@@ -101,6 +101,12 @@ public class FakeApiController implements FakeApi {
         return delegate.testEnumParameters(enumFormStringArray, enumFormString, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble);
     }
 
+    public ResponseEntity<Void> testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true )  @Valid @RequestBody Object param,
+        @RequestHeader(value = "Accept", required = false) String accept) throws Exception {
+        // do some magic!
+        return delegate.testInlineAdditionalProperties(param);
+    }
+
     public ResponseEntity<Void> testJsonFormData(@ApiParam(value = "field1", required=true) @RequestPart(value="param", required=true)  String param,
         @ApiParam(value = "field2", required=true) @RequestPart(value="param2", required=true)  String param2,
         @RequestHeader(value = "Accept", required = false) String accept) throws Exception {

samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/FakeApiDelegate.java

@@ -75,6 +75,11 @@ public interface FakeApiDelegate {
         Integer enumQueryInteger,
         Double enumQueryDouble);
 
+    /**
+     * @see FakeApi#testInlineAdditionalProperties
+     */
+    ResponseEntity<Void> testInlineAdditionalProperties(Object param);
+
     /**
      * @see FakeApi#testJsonFormData
      */

samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/AnotherFakeApi.java

@@ -31,7 +31,6 @@ public interface AnotherFakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/another-fake/dummy",
         produces = { "application/json" }, 

samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/FakeApi.java

@@ -35,7 +35,6 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/fake/outer/boolean",
         method = RequestMethod.POST)
@@ -46,7 +45,6 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/fake/outer/composite",
         method = RequestMethod.POST)
@@ -57,7 +55,6 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/fake/outer/number",
         method = RequestMethod.POST)
@@ -68,7 +65,6 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output string", response = String.class) })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/fake/outer/string",
         method = RequestMethod.POST)
@@ -79,7 +75,6 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/fake",
         produces = { "application/json" }, 
@@ -95,7 +90,6 @@ public interface FakeApi {
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/fake",
         produces = { "application/xml; charset=utf-8", "application/json; charset=utf-8" }, 
@@ -109,7 +103,8 @@ public interface FakeApi {
         @ApiResponse(code = 400, message = "Invalid request"),
         @ApiResponse(code = 404, message = "Not found") })
     @ApiImplicitParams({
-    @ApiImplicitParam(name = "enumHeaderStringArray", value = "Header parameter enum test (string array)",  dataType = "List<String>", paramType = "header"),@ApiImplicitParam(name = "enumHeaderString", value = "Header parameter enum test (string)",  dataType = "String", paramType = "header")
+    @ApiImplicitParam(name = "enumHeaderStringArray", value = "Header parameter enum test (string array)",  dataType = "List<String>", paramType = "header"),
+    @ApiImplicitParam(name = "enumHeaderString", value = "Header parameter enum test (string)",  dataType = "String", paramType = "header")
     })
     @RequestMapping(value = "/fake",
         produces = { "*/*" }, 
@@ -118,11 +113,21 @@ public interface FakeApi {
     ResponseEntity<Void> testEnumParameters(@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $") @RequestPart(value="enum_form_string_array", required=false)  List<String> enumFormStringArray,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestPart(value="enum_form_string", required=false)  String enumFormString,@ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) List<String> enumQueryStringArray,@ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue="-efg") String enumQueryString,@ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) Integer enumQueryInteger,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @RequestPart(value="enum_query_double", required=false)  Double enumQueryDouble, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
 
 
+    @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation") })
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value = "/fake/inline-additionalProperties",
+        consumes = { "application/json" },
+        method = RequestMethod.POST)
+    ResponseEntity<Void> testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true )  @Valid @RequestBody Object param, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
+
+
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/fake/jsonFormData",
         consumes = { "application/json" },

samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/FakeApiController.java

@@ -117,6 +117,12 @@ public class FakeApiController implements FakeApi {
         return new ResponseEntity<Void>(HttpStatus.OK);
     }
 
+    public ResponseEntity<Void> testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true )  @Valid @RequestBody Object param,
+        @RequestHeader(value = "Accept", required = false) String accept) throws Exception {
+        // do some magic!
+        return new ResponseEntity<Void>(HttpStatus.OK);
+    }
+
     public ResponseEntity<Void> testJsonFormData(@ApiParam(value = "field1", required=true) @RequestPart(value="param", required=true)  String param,
         @ApiParam(value = "field2", required=true) @RequestPart(value="param2", required=true)  String param2,
         @RequestHeader(value = "Accept", required = false) String accept) throws Exception {

samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/FakeClassnameTestApi.java

@@ -33,7 +33,6 @@ public interface FakeClassnameTestApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/fake_classname_test",
         produces = { "application/json" }, 

samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/PetApi.java

@@ -38,7 +38,6 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/pet",
         produces = { "application/xml", "application/json" }, 
@@ -74,7 +73,6 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/pet/findByStatus",
         produces = { "application/xml", "application/json" }, 
@@ -92,7 +90,6 @@ public interface PetApi {
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/pet/findByTags",
         produces = { "application/xml", "application/json" }, 
@@ -108,7 +105,6 @@ public interface PetApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/pet/{petId}",
         produces = { "application/xml", "application/json" }, 
@@ -127,7 +123,6 @@ public interface PetApi {
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/pet",
         produces = { "application/xml", "application/json" }, 
@@ -145,7 +140,6 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/pet/{petId}",
         produces = { "application/xml", "application/json" }, 
@@ -163,7 +157,6 @@ public interface PetApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/pet/{petId}/uploadImage",
         produces = { "application/json" }, 

samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/StoreApi.java

@@ -33,7 +33,6 @@ public interface StoreApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/store/order/{order_id}",
         produces = { "application/xml", "application/json" }, 
@@ -47,7 +46,6 @@ public interface StoreApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/store/inventory",
         produces = { "application/json" }, 
@@ -61,7 +59,6 @@ public interface StoreApi {
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/store/order/{order_id}",
         produces = { "application/xml", "application/json" }, 
@@ -74,7 +71,6 @@ public interface StoreApi {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/store/order",
         produces = { "application/xml", "application/json" }, 

samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/UserApi.java

@@ -32,7 +32,6 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/user",
         produces = { "application/xml", "application/json" }, 
@@ -44,7 +43,6 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/user/createWithArray",
         produces = { "application/xml", "application/json" }, 
@@ -56,7 +54,6 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/user/createWithList",
         produces = { "application/xml", "application/json" }, 
@@ -69,7 +66,6 @@ public interface UserApi {
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/user/{username}",
         produces = { "application/xml", "application/json" }, 
@@ -83,7 +79,6 @@ public interface UserApi {
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/user/{username}",
         produces = { "application/xml", "application/json" }, 
@@ -96,7 +91,6 @@ public interface UserApi {
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/user/login",
         produces = { "application/xml", "application/json" }, 
@@ -108,7 +102,6 @@ public interface UserApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/user/logout",
         produces = { "application/xml", "application/json" }, 
@@ -121,7 +114,6 @@ public interface UserApi {
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
     @ApiImplicitParams({
-    
     })
     @RequestMapping(value = "/user/{username}",
         produces = { "application/xml", "application/json" }, 

samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/FakeApi.java

@@ -98,6 +98,15 @@ public interface FakeApi {
     ResponseEntity<Void> testEnumParameters(@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $") @RequestPart(value="enum_form_string_array", required=false)  List<String> enumFormStringArray,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestPart(value="enum_form_string", required=false)  String enumFormString,@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $") @RequestHeader(value="enum_header_string_array", required=false) Optional<List<String>> enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestHeader(value="enum_header_string", required=false) Optional<String> enumHeaderString,@ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) Optional<List<String>> enumQueryStringArray,@ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue="-efg") Optional<String> enumQueryString,@ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) Optional<Integer> enumQueryInteger,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @RequestPart(value="enum_query_double", required=false)  Double enumQueryDouble, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
 
 
+    @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation") })
+    @RequestMapping(value = "/fake/inline-additionalProperties",
+        consumes = { "application/json" },
+        method = RequestMethod.POST)
+    ResponseEntity<Void> testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true )  @Valid @RequestBody Object param, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
+
+
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })

samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/FakeApiController.java

@@ -120,6 +120,12 @@ public class FakeApiController implements FakeApi {
         return new ResponseEntity<Void>(HttpStatus.OK);
     }
 
+    public ResponseEntity<Void> testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true )  @Valid @RequestBody Object param,
+        @RequestHeader(value = "Accept", required = false) String accept) throws Exception {
+        // do some magic!
+        return new ResponseEntity<Void>(HttpStatus.OK);
+    }
+
     public ResponseEntity<Void> testJsonFormData(@ApiParam(value = "field1", required=true) @RequestPart(value="param", required=true)  String param,
         @ApiParam(value = "field2", required=true) @RequestPart(value="param2", required=true)  String param2,
         @RequestHeader(value = "Accept", required = false) String accept) throws Exception {

samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApi.java

@@ -97,6 +97,15 @@ public interface FakeApi {
     ResponseEntity<Void> testEnumParameters(@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $") @RequestPart(value="enum_form_string_array", required=false)  List<String> enumFormStringArray,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestPart(value="enum_form_string", required=false)  String enumFormString,@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $") @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestHeader(value="enum_header_string", required=false) String enumHeaderString,@ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) List<String> enumQueryStringArray,@ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue="-efg") String enumQueryString,@ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) Integer enumQueryInteger,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @RequestPart(value="enum_query_double", required=false)  Double enumQueryDouble, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
 
 
+    @ApiOperation(value = "test inline additionalProperties", nickname = "testInlineAdditionalProperties", notes = "", tags={ "fake", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation") })
+    @RequestMapping(value = "/fake/inline-additionalProperties",
+        consumes = { "application/json" },
+        method = RequestMethod.POST)
+    ResponseEntity<Void> testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true )  @Valid @RequestBody Object param, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
+
+
     @ApiOperation(value = "test json serialization of form data", nickname = "testJsonFormData", notes = "", tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })

samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApiController.java

@@ -119,6 +119,12 @@ public class FakeApiController implements FakeApi {
         return new ResponseEntity<Void>(HttpStatus.OK);
     }
 
+    public ResponseEntity<Void> testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true )  @Valid @RequestBody Object param,
+        @RequestHeader(value = "Accept", required = false) String accept) throws Exception {
+        // do some magic!
+        return new ResponseEntity<Void>(HttpStatus.OK);
+    }
+
     public ResponseEntity<Void> testJsonFormData(@ApiParam(value = "field1", required=true) @RequestPart(value="param", required=true)  String param,
         @ApiParam(value = "field2", required=true) @RequestPart(value="param2", required=true)  String param2,
         @RequestHeader(value = "Accept", required = false) String accept) throws Exception {