Merge pull request #1309 from wing328/fix_springmvc_object

[SpringMVC] fix compilation error by removing import of Object

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

@@ -12,6 +12,7 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Iterator;
 
 public class SpringMVCServerCodegen extends JavaClientCodegen implements CodegenConfig {
     protected String invokerPackage = "io.swagger.api";
@@ -187,5 +188,17 @@ public class SpringMVCServerCodegen extends JavaClientCodegen implements Codegen
     public void setConfigPackage(String configPackage) {
         this.configPackage = configPackage;
     }
+
+    @Override
+    public Map<String, Object> postProcessModels(Map<String, Object> objs) {
+        // remove the import of "Object" to avoid compilation error
+        List<Map<String, String>> imports = (List<Map<String, String>>) objs.get("imports");
+        Iterator<Map<String, String>> iterator = imports.iterator();
+        while (iterator.hasNext()) {
+            String _import = iterator.next().get("import");
+            if (_import.endsWith(".Object")) iterator.remove();
+        }
+        return objs;
+    }
 }
 

samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java

@@ -39,7 +39,7 @@ import io.swagger.client.auth.HttpBasicAuth;
 import io.swagger.client.auth.ApiKeyAuth;
 import io.swagger.client.auth.OAuth;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-24T21:52:56.159+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class ApiClient {
   private Map<String, Client> hostMap = new HashMap<String, Client>();
   private Map<String, String> defaultHeaderMap = new HashMap<String, String>();

samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java

@@ -3,7 +3,7 @@ package io.swagger.client;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class ApiException extends Exception {
   private int code = 0;
   private Map<String, List<String>> responseHeaders = null;

samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java

@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class Configuration {
   private static ApiClient defaultApiClient = new ApiClient();
 

samples/client/petstore/java/default/src/main/java/io/swagger/client/JSON.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.datatype.joda.*;
 
 import java.io.IOException;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class JSON {
   private ObjectMapper mapper;
 

samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java

@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class Pair {
     private String name = "";
     private String value = "";

samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java

@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).

samples/client/petstore/java/default/src/main/java/io/swagger/client/TypeRef.java

@@ -3,7 +3,7 @@ package io.swagger.client;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class TypeRef<T> {
     private final Type type;
 

samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java

@@ -17,7 +17,7 @@ import java.io.File;
 import java.util.Map;
 import java.util.HashMap;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class PetApi {
   private ApiClient apiClient;
 
@@ -272,7 +272,7 @@ public class PetApi {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    String[] authNames = new String[] { "petstore_auth", "api_key" };
+    String[] authNames = new String[] { "api_key", "petstore_auth" };
 
     
 

samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java

@@ -17,7 +17,7 @@ import java.io.File;
 import java.util.Map;
 import java.util.HashMap;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class StoreApi {
   private ApiClient apiClient;
 

samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java

@@ -17,7 +17,7 @@ import java.io.File;
 import java.util.Map;
 import java.util.HashMap;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class UserApi {
   private ApiClient apiClient;
 

samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java

@@ -5,7 +5,7 @@ import io.swagger.client.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;

samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/Authentication.java

@@ -5,7 +5,7 @@ import io.swagger.client.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public interface Authentication {
   /** Apply authentication settings to header and query params. */
   void applyToParams(List<Pair> queryParams, Map<String, String> headerParams);

samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.io.UnsupportedEncodingException;
 import javax.xml.bind.DatatypeConverter;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;

samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java

@@ -5,7 +5,7 @@ import io.swagger.client.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class OAuth implements Authentication {
   @Override
   public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {

samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java

@@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class Category   {
   
   private Long id = null;

samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java

@@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-21T17:24:54.566+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class Order   {
   
   private Long id = null;

samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java

@@ -2,8 +2,8 @@ package io.swagger.client.model;
 
 import io.swagger.client.StringUtil;
 import io.swagger.client.model.Category;
-import java.util.*;
 import io.swagger.client.model.Tag;
+import java.util.*;
 
 
 
@@ -12,7 +12,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-21T17:24:54.566+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class Pet   {
   
   private Long id = null;

samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java

@@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class Tag   {
   
   private Long id = null;

samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java

@@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
 public class User   {
   
   private Long id = null;

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

@@ -1,6 +1,6 @@
 package io.swagger.api;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-09-30T16:27:59.075+08:00")
 public class ApiException extends Exception{
 	private int code;
 	public ApiException (int code, String msg) {

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

@@ -5,7 +5,7 @@ import java.io.IOException;
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-09-30T16:27:59.075+08:00")
 public class ApiOriginFilter implements javax.servlet.Filter {
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response,

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

@@ -3,7 +3,7 @@ package io.swagger.api;
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-09-30T16:27:59.075+08:00")
 public class ApiResponseMessage {
 	public static final int ERROR = 1;
 	public static final int WARNING = 2;

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

@@ -1,6 +1,6 @@
 package io.swagger.api;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-09-30T16:27:59.075+08:00")
 public class NotFoundException extends ApiException {
 	private int code;
 	public NotFoundException (int code, String msg) {

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

@@ -30,7 +30,7 @@ import static org.springframework.http.MediaType.*;
 @Controller
 @RequestMapping(value = "/pet", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/pet", description = "the pet API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-09-30T16:27:59.075+08:00")
 public class PetApi {
   
 
@@ -45,7 +45,8 @@ public class PetApi {
     method = RequestMethod.PUT)
   public ResponseEntity<Void> updatePet(
 
-@ApiParam(value = "Pet object that needs to be added to the store"  ) Pet body)
+@ApiParam(value = "Pet object that needs to be added to the store"  ) Pet body
+)
       throws NotFoundException {
       // do some magic!
       return new ResponseEntity<Void>(HttpStatus.OK);
@@ -62,7 +63,8 @@ public class PetApi {
     method = RequestMethod.POST)
   public ResponseEntity<Void> addPet(
 
-@ApiParam(value = "Pet object that needs to be added to the store"  ) Pet body)
+@ApiParam(value = "Pet object that needs to be added to the store"  ) Pet body
+)
       throws NotFoundException {
       // do some magic!
       return new ResponseEntity<Void>(HttpStatus.OK);
@@ -80,6 +82,7 @@ public class PetApi {
     method = RequestMethod.GET)
   public ResponseEntity<List<Pet>> findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", defaultValue = "available") @RequestParam(value = "status", required = false, defaultValue="available") List<String> status
 
+
 )
       throws NotFoundException {
       // do some magic!
@@ -98,6 +101,7 @@ public class PetApi {
     method = RequestMethod.GET)
   public ResponseEntity<List<Pet>> findPetsByTags(@ApiParam(value = "Tags to filter by") @RequestParam(value = "tags", required = false) List<String> tags
 
+
 )
       throws NotFoundException {
       // do some magic!
@@ -117,6 +121,7 @@ public class PetApi {
     method = RequestMethod.GET)
   public ResponseEntity<Pet> getPetById(
 @ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("petId") Long petId
+
 )
       throws NotFoundException {
       // do some magic!
@@ -134,15 +139,18 @@ public class PetApi {
     method = RequestMethod.POST)
   public ResponseEntity<Void> updatePetWithForm(
 @ApiParam(value = "ID of pet that needs to be updated",required=true ) @PathVariable("petId") String petId
+
 ,
     
 
 
-@ApiParam(value = "Updated name of the pet" ) @RequestPart(value="name", required=false)  String name,
+@ApiParam(value = "Updated name of the pet" ) @RequestPart(value="name", required=false)  String name
+,
     
 
 
-@ApiParam(value = "Updated status of the pet" ) @RequestPart(value="status", required=false)  String status)
+@ApiParam(value = "Updated status of the pet" ) @RequestPart(value="status", required=false)  String status
+)
       throws NotFoundException {
       // do some magic!
       return new ResponseEntity<Void>(HttpStatus.OK);
@@ -159,9 +167,11 @@ public class PetApi {
     method = RequestMethod.DELETE)
   public ResponseEntity<Void> deletePet(
 @ApiParam(value = "Pet id to delete",required=true ) @PathVariable("petId") Long petId
+
 ,
     
 @ApiParam(value = ""  ) @RequestHeader(value="apiKey", required=false) String apiKey
+
 )
       throws NotFoundException {
       // do some magic!
@@ -179,14 +189,17 @@ public class PetApi {
     method = RequestMethod.POST)
   public ResponseEntity<Void> 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,
+@ApiParam(value = "Additional data to pass to server" ) @RequestPart(value="additionalMetadata", required=false)  String additionalMetadata
+,
     
 
-@ApiParam(value = "file detail") @RequestPart("file") MultipartFile fileDetail)
+@ApiParam(value = "file detail") @RequestPart("file") MultipartFile file
+)
       throws NotFoundException {
       // do some magic!
       return new ResponseEntity<Void>(HttpStatus.OK);

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

@@ -30,7 +30,7 @@ import static org.springframework.http.MediaType.*;
 @Controller
 @RequestMapping(value = "/store", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/store", description = "the store API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-09-30T16:27:59.075+08:00")
 public class StoreApi {
   
 
@@ -59,7 +59,8 @@ public class StoreApi {
     method = RequestMethod.POST)
   public ResponseEntity<Order> placeOrder(
 
-@ApiParam(value = "order placed for purchasing the pet"  ) Order body)
+@ApiParam(value = "order placed for purchasing the pet"  ) Order body
+)
       throws NotFoundException {
       // do some magic!
       return new ResponseEntity<Order>(HttpStatus.OK);
@@ -78,6 +79,7 @@ public class StoreApi {
     method = RequestMethod.GET)
   public ResponseEntity<Order> getOrderById(
 @ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") String orderId
+
 )
       throws NotFoundException {
       // do some magic!
@@ -96,6 +98,7 @@ public class StoreApi {
     method = RequestMethod.DELETE)
   public ResponseEntity<Void> deleteOrder(
 @ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("orderId") String orderId
+
 )
       throws NotFoundException {
       // do some magic!

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

@@ -30,7 +30,7 @@ import static org.springframework.http.MediaType.*;
 @Controller
 @RequestMapping(value = "/user", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/user", description = "the user API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-09-30T16:27:59.075+08:00")
 public class UserApi {
   
 
@@ -43,7 +43,8 @@ public class UserApi {
     method = RequestMethod.POST)
   public ResponseEntity<Void> createUser(
 
-@ApiParam(value = "Created user object"  ) User body)
+@ApiParam(value = "Created user object"  ) User body
+)
       throws NotFoundException {
       // do some magic!
       return new ResponseEntity<Void>(HttpStatus.OK);
@@ -60,7 +61,8 @@ public class UserApi {
     method = RequestMethod.POST)
   public ResponseEntity<Void> createUsersWithArrayInput(
 
-@ApiParam(value = "List of user object"  ) List<User> body)
+@ApiParam(value = "List of user object"  ) List<User> body
+)
       throws NotFoundException {
       // do some magic!
       return new ResponseEntity<Void>(HttpStatus.OK);
@@ -77,7 +79,8 @@ public class UserApi {
     method = RequestMethod.POST)
   public ResponseEntity<Void> createUsersWithListInput(
 
-@ApiParam(value = "List of user object"  ) List<User> body)
+@ApiParam(value = "List of user object"  ) List<User> body
+)
       throws NotFoundException {
       // do some magic!
       return new ResponseEntity<Void>(HttpStatus.OK);
@@ -95,9 +98,11 @@ public class UserApi {
     method = RequestMethod.GET)
   public ResponseEntity<String> loginUser(@ApiParam(value = "The user name for login") @RequestParam(value = "username", required = false) String username
 
+
 ,
     @ApiParam(value = "The password for login in clear text") @RequestParam(value = "password", required = false) String password
 
+
 )
       throws NotFoundException {
       // do some magic!
@@ -131,7 +136,8 @@ public class UserApi {
     
     method = RequestMethod.GET)
   public ResponseEntity<User> getUserByName(
-@ApiParam(value = "The name that needs to be fetched. Use user1 for testing. ",required=true ) @PathVariable("username") String username
+@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true ) @PathVariable("username") String username
+
 )
       throws NotFoundException {
       // do some magic!
@@ -150,10 +156,12 @@ public class UserApi {
     method = RequestMethod.PUT)
   public ResponseEntity<Void> updateUser(
 @ApiParam(value = "name that need to be deleted",required=true ) @PathVariable("username") String username
+
 ,
     
 
-@ApiParam(value = "Updated user object"  ) User body)
+@ApiParam(value = "Updated user object"  ) User body
+)
       throws NotFoundException {
       // do some magic!
       return new ResponseEntity<Void>(HttpStatus.OK);
@@ -171,6 +179,7 @@ public class UserApi {
     method = RequestMethod.DELETE)
   public ResponseEntity<Void> deleteUser(
 @ApiParam(value = "The name that needs to be deleted",required=true ) @PathVariable("username") String username
+
 )
       throws NotFoundException {
       // do some magic!

samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java

@@ -18,7 +18,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableSwagger2 //Loads the spring beans required by the framework
 @PropertySource("classpath:swagger.properties")
 @Import(SwaggerUiConfiguration.class)
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-09-30T16:27:59.075+08:00")
 public class SwaggerConfig {
     @Bean
     ApiInfo apiInfo() {

samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java

@@ -8,7 +8,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 
 @Configuration
 @EnableWebMvc
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-09-30T16:27:59.075+08:00")
 public class SwaggerUiConfiguration extends WebMvcConfigurerAdapter {
   private static final String[] SERVLET_RESOURCE_LOCATIONS = { "/" };
 

samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebApplication.java

@@ -2,7 +2,7 @@ package io.swagger.configuration;
 
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-09-30T16:27:59.075+08:00")
 public class WebApplication extends AbstractAnnotationConfigDispatcherServletInitializer {
 
     @Override

samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebMvcConfiguration.java

@@ -3,7 +3,7 @@ package io.swagger.configuration;
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-09-30T16:27:59.075+08:00")
 public class WebMvcConfiguration extends WebMvcConfigurationSupport {
     @Override
     public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {

samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-09-30T16:27:59.075+08:00")
 public class Category  {
   
   private Long id = null;

samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java

@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-09-30T16:27:59.075+08:00")
 public class Order  {
   
   private Long id = null;

samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java

@@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-09-30T16:27:59.075+08:00")
 public class Pet  {
   
   private Long id = null;

samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-09-30T16:27:59.075+08:00")
 public class Tag  {
   
   private Long id = null;

samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-09-30T16:27:59.075+08:00")
 public class User  {
   
   private Long id = null;