add option to use single content-type produces/consumes

bin/spring-stubs.sh

@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l springboot -o samples/client/petstore/spring-stubs -DinterfaceOnly=true"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l springboot -o samples/client/petstore/spring-stubs -DinterfaceOnly=true,singleContentTypes=true"
 
 java $JAVA_OPTS -jar $executable $ags

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringBootServerCodegen.java

@@ -11,10 +11,12 @@ public class SpringBootServerCodegen extends JavaClientCodegen implements Codege
     public static final String CONFIG_PACKAGE = "configPackage";
     public static final String BASE_PACKAGE = "basePackage";
     public static final String INTERFACE_ONLY = "interfaceOnly";
+    public static final String SINGLE_CONTENT_TYPES = "singleContentTypes";
     protected String title = "Petstore Server";
     protected String configPackage = "";
     protected String basePackage = "";
     protected boolean interfaceOnly = false;
+    protected boolean singleContentTypes = false;
     protected String templateFileName = "api.mustache";
 
     public SpringBootServerCodegen() {
@@ -42,6 +44,7 @@ public class SpringBootServerCodegen extends JavaClientCodegen implements Codege
         cliOptions.add(new CliOption(CONFIG_PACKAGE, "configuration package for generated code"));
         cliOptions.add(new CliOption(BASE_PACKAGE, "base package for generated code"));
         cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files."));
+        cliOptions.add(CliOption.newBoolean(SINGLE_CONTENT_TYPES, "Whether to select only one produces/consumes content-type by operation."));
 
         supportedLibraries.clear();
         supportedLibraries.put(DEFAULT_LIBRARY, "Default Spring Boot server stub.");
@@ -85,6 +88,10 @@ public class SpringBootServerCodegen extends JavaClientCodegen implements Codege
             this.setInterfaceOnly(Boolean.valueOf(additionalProperties.get(INTERFACE_ONLY).toString()));
         }
 
+        if (additionalProperties.containsKey(SINGLE_CONTENT_TYPES)) {
+            this.setSingleContentTypes(Boolean.valueOf(additionalProperties.get(SINGLE_CONTENT_TYPES).toString()));
+        }
+
         supportingFiles.clear();
         supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
@@ -140,7 +147,7 @@ public class SpringBootServerCodegen extends JavaClientCodegen implements Codege
 
     @Override
     public void preprocessSwagger(Swagger swagger) {
-    	System.out.println("preprocessSwagger");
+        super.preprocessSwagger(swagger);
         if ("/".equals(swagger.getBasePath())) {
             swagger.setBasePath("");
         }
@@ -266,6 +273,10 @@ public class SpringBootServerCodegen extends JavaClientCodegen implements Codege
         this.interfaceOnly = interfaceOnly;
     }
 
+    public void setSingleContentTypes(boolean singleContentTypes) {
+        this.singleContentTypes = singleContentTypes;
+    }
+    
     @Override
     public Map<String, Object> postProcessModels(Map<String, Object> objs) {
         // remove the import of "Object" to avoid compilation error

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

@@ -37,9 +37,11 @@ public interface {{classname}} {
   }{{/hasAuthMethods}})
   @ApiResponses(value = { {{#responses}}
     @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{returnType}}}.class){{#hasMore}},{{/hasMore}}{{/responses}} })
-  @RequestMapping(value = "{{{path}}}",
+  @RequestMapping(value = "{{{path}}}",{{#singleContentTypes}}
-    {{#hasProduces}}produces = { {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }, {{/hasProduces}}
+    produces = "{{{vendorExtensions.x-accepts}}}",
-    {{#hasConsumes}}consumes = { {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} },{{/hasConsumes}}
+    consumes = "{{{vendorExtensions.x-contentType}}}",{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}}
+    produces = { {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }, {{/hasProduces}}{{#hasConsumes}}
+    consumes = { {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} },{{/hasConsumes}}{{/singleContentTypes}}
     method = RequestMethod.{{httpMethod}})
   ResponseEntity<{{>returnTypes}}> {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},
     {{/hasMore}}{{/allParams}});

modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringBootServerOptionsProvider.java

@@ -11,6 +11,7 @@ public class SpringBootServerOptionsProvider extends JavaOptionsProvider {
     public static final String BASE_PACKAGE_VALUE = "basePackage";
     public static final String LIBRARY_VALUE = "j8-async"; //FIXME hidding value from super class
     public static final String INTERFACE_ONLY = "true";
+    public static final String SINGLE_CONTENT_TYPES = "true";
 
     @Override
     public String getLanguage() {
@@ -24,6 +25,7 @@ public class SpringBootServerOptionsProvider extends JavaOptionsProvider {
         options.put(SpringBootServerCodegen.BASE_PACKAGE, BASE_PACKAGE_VALUE);
         options.put(CodegenConstants.LIBRARY, LIBRARY_VALUE);
         options.put(SpringBootServerCodegen.INTERFACE_ONLY, INTERFACE_ONLY);
+        options.put(SpringBootServerCodegen.SINGLE_CONTENT_TYPES, SINGLE_CONTENT_TYPES);
 
         return options;
     }

modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java

@@ -56,6 +56,8 @@ public class SpringBootServerOptionsTest extends JavaClientOptionsTest {
             times = 1;
             clientCodegen.setInterfaceOnly(Boolean.valueOf(SpringBootServerOptionsProvider.INTERFACE_ONLY));
             times = 1;
+            clientCodegen.setSingleContentTypes(Boolean.valueOf(SpringBootServerOptionsProvider.SINGLE_CONTENT_TYPES));
+            times = 1;
 
         }};
     }

samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java

@@ -24,7 +24,7 @@ import static org.springframework.http.MediaType.*;
 
 @RequestMapping(value = "/pet", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/pet", description = "the pet API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
 public interface PetApi {
 
   @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {
@@ -36,8 +36,8 @@ public interface PetApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
   @RequestMapping(value = "",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    consumes = { "application/json", "application/xml" },
+    consumes = "application/json",
     method = RequestMethod.POST)
   ResponseEntity<Void> addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @RequestBody Pet body);
 
@@ -51,8 +51,8 @@ public interface PetApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) })
   @RequestMapping(value = "/{petId}",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    
+    consumes = "application/json",
     method = RequestMethod.DELETE)
   ResponseEntity<Void> deletePet(@ApiParam(value = "Pet id to delete",required=true ) @PathVariable("petId") Long petId,
     @ApiParam(value = ""  ) @RequestHeader(value="api_key", required=false) String apiKey);
@@ -68,8 +68,8 @@ public interface PetApi {
     @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
     @ApiResponse(code = 400, message = "Invalid status value", response = Pet.class) })
   @RequestMapping(value = "/findByStatus",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    
+    consumes = "application/json",
     method = RequestMethod.GET)
   ResponseEntity<List<Pet>> findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", required = true) @RequestParam(value = "status", required = true) List<String> status);
 
@@ -84,8 +84,8 @@ public interface PetApi {
     @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
     @ApiResponse(code = 400, message = "Invalid tag value", response = Pet.class) })
   @RequestMapping(value = "/findByTags",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    
+    consumes = "application/json",
     method = RequestMethod.GET)
   ResponseEntity<List<Pet>> findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags);
 
@@ -98,8 +98,8 @@ public interface PetApi {
     @ApiResponse(code = 400, message = "Invalid ID supplied", response = Pet.class),
     @ApiResponse(code = 404, message = "Pet not found", response = Pet.class) })
   @RequestMapping(value = "/{petId}",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    
+    consumes = "application/json",
     method = RequestMethod.GET)
   ResponseEntity<Pet> getPetById(@ApiParam(value = "ID of pet to return",required=true ) @PathVariable("petId") Long petId);
 
@@ -115,8 +115,8 @@ public interface PetApi {
     @ApiResponse(code = 404, message = "Pet not found", response = Void.class),
     @ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
   @RequestMapping(value = "",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    consumes = { "application/json", "application/xml" },
+    consumes = "application/json",
     method = RequestMethod.PUT)
   ResponseEntity<Void> updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @RequestBody Pet body);
 
@@ -130,8 +130,8 @@ public interface PetApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
   @RequestMapping(value = "/{petId}",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    consumes = { "application/x-www-form-urlencoded" },
+    consumes = "application/x-www-form-urlencoded",
     method = RequestMethod.POST)
   ResponseEntity<Void> updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true ) @PathVariable("petId") Long petId,
     @ApiParam(value = "Updated name of the pet" ) @RequestPart(value="name", required=false)  String name,
@@ -147,8 +147,8 @@ public interface PetApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
   @RequestMapping(value = "/{petId}/uploadImage",
-    produces = { "application/json" }, 
+    produces = "application/json",
-    consumes = { "multipart/form-data" },
+    consumes = "multipart/form-data",
     method = RequestMethod.POST)
   ResponseEntity<ModelApiResponse> uploadFile(@ApiParam(value = "ID of pet to update",required=true ) @PathVariable("petId") Long petId,
     @ApiParam(value = "Additional data to pass to server" ) @RequestPart(value="additionalMetadata", required=false)  String additionalMetadata,

samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/StoreApi.java

@@ -23,7 +23,7 @@ import static org.springframework.http.MediaType.*;
 
 @RequestMapping(value = "/store", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/store", description = "the store API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
 public interface StoreApi {
 
   @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class)
@@ -31,8 +31,8 @@ public interface StoreApi {
     @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
     @ApiResponse(code = 404, message = "Order not found", response = Void.class) })
   @RequestMapping(value = "/order/{orderId}",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    
+    consumes = "application/json",
     method = RequestMethod.DELETE)
   ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("orderId") String orderId);
 
@@ -43,8 +43,8 @@ public interface StoreApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Integer.class) })
   @RequestMapping(value = "/inventory",
-    produces = { "application/json" }, 
+    produces = "application/json",
-    
+    consumes = "application/json",
     method = RequestMethod.GET)
   ResponseEntity<Map<String, Integer>> getInventory();
 
@@ -55,8 +55,8 @@ public interface StoreApi {
     @ApiResponse(code = 400, message = "Invalid ID supplied", response = Order.class),
     @ApiResponse(code = 404, message = "Order not found", response = Order.class) })
   @RequestMapping(value = "/order/{orderId}",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    
+    consumes = "application/json",
     method = RequestMethod.GET)
   ResponseEntity<Order> getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId);
 
@@ -66,8 +66,8 @@ public interface StoreApi {
     @ApiResponse(code = 200, message = "successful operation", response = Order.class),
     @ApiResponse(code = 400, message = "Invalid Order", response = Order.class) })
   @RequestMapping(value = "/order",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    
+    consumes = "application/json",
     method = RequestMethod.POST)
   ResponseEntity<Order> placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true ) @RequestBody Order body);
 

samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/UserApi.java

@@ -23,15 +23,15 @@ import static org.springframework.http.MediaType.*;
 
 @RequestMapping(value = "/user", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/user", description = "the user API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
 public interface UserApi {
 
   @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class)
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
   @RequestMapping(value = "",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    
+    consumes = "application/json",
     method = RequestMethod.POST)
   ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true ) @RequestBody User body);
 
@@ -40,8 +40,8 @@ public interface UserApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
   @RequestMapping(value = "/createWithArray",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    
+    consumes = "application/json",
     method = RequestMethod.POST)
   ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body);
 
@@ -50,8 +50,8 @@ public interface UserApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
   @RequestMapping(value = "/createWithList",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    
+    consumes = "application/json",
     method = RequestMethod.POST)
   ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body);
 
@@ -61,8 +61,8 @@ public interface UserApi {
     @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
     @ApiResponse(code = 404, message = "User not found", response = Void.class) })
   @RequestMapping(value = "/{username}",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    
+    consumes = "application/json",
     method = RequestMethod.DELETE)
   ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true ) @PathVariable("username") String username);
 
@@ -73,8 +73,8 @@ public interface UserApi {
     @ApiResponse(code = 400, message = "Invalid username supplied", response = User.class),
     @ApiResponse(code = 404, message = "User not found", response = User.class) })
   @RequestMapping(value = "/{username}",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    
+    consumes = "application/json",
     method = RequestMethod.GET)
   ResponseEntity<User> getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing. ",required=true ) @PathVariable("username") String username);
 
@@ -84,8 +84,8 @@ public interface UserApi {
     @ApiResponse(code = 200, message = "successful operation", response = String.class),
     @ApiResponse(code = 400, message = "Invalid username/password supplied", response = String.class) })
   @RequestMapping(value = "/login",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    
+    consumes = "application/json",
     method = RequestMethod.GET)
   ResponseEntity<String> loginUser(@ApiParam(value = "The user name for login", required = true) @RequestParam(value = "username", required = true) String username,
     @ApiParam(value = "The password for login in clear text", required = true) @RequestParam(value = "password", required = true) String password);
@@ -95,8 +95,8 @@ public interface UserApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
   @RequestMapping(value = "/logout",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    
+    consumes = "application/json",
     method = RequestMethod.GET)
   ResponseEntity<Void> logoutUser();
 
@@ -106,8 +106,8 @@ public interface UserApi {
     @ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class),
     @ApiResponse(code = 404, message = "User not found", response = Void.class) })
   @RequestMapping(value = "/{username}",
-    produces = { "application/xml", "application/json" }, 
+    produces = "application/json",
-    
+    consumes = "application/json",
     method = RequestMethod.PUT)
   ResponseEntity<Void> updateUser(@ApiParam(value = "name that need to be deleted",required=true ) @PathVariable("username") String username,
     @ApiParam(value = "Updated user object" ,required=true ) @RequestBody User body);

samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java

@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
 public class Category  {
   
   private Long id = null;

samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java

@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
 public class ModelApiResponse  {
   
   private Integer code = null;

samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Order.java

@@ -13,7 +13,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
 public class Order  {
   
   private Long id = null;

samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Pet.java

@@ -16,7 +16,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
 public class Pet  {
   
   private Long id = null;

samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java

@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
 public class Tag  {
   
   private Long id = null;

samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/User.java

@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
 public class User  {
   
   private Long id = null;