Merge branch 'issue2374' of https://github.com/kolyjjj/swagger-codegen into kolyjjj-issue2374

Conflicts:
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiOriginFilter.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiResponseMessage.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/NotFoundException.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebApplication.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebMvcConfiguration.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ApiResponse.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java
This commit is contained in:
wing328
2016-04-17 17:47:58 +08:00
19 changed files with 78 additions and 90 deletions

View File

@@ -29,8 +29,8 @@ import java.util.List;
import static org.springframework.http.MediaType.*;
@Controller
@RequestMapping(value = "/{{baseName}}", produces = {APPLICATION_JSON_VALUE})
@Api(value = "/{{baseName}}", description = "the {{baseName}} API")
@RequestMapping(value = "/{{{baseName}}}", produces = {APPLICATION_JSON_VALUE})
@Api(value = "/{{{baseName}}}", description = "the {{{baseName}}} API")
{{>generatedAnnotation}}
{{#operations}}
public class {{classname}} {
@@ -44,8 +44,8 @@ public class {{classname}} {
{{/hasMore}}{{/authMethods}}
}{{/hasAuthMethods}})
@io.swagger.annotations.ApiResponses(value = { {{#responses}}
@io.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}"){{#hasMore}},{{/hasMore}}{{/responses}} })
@RequestMapping(value = "{{path}}",
@io.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{returnType}}}.class){{#hasMore}},{{/hasMore}}{{/responses}} })
@RequestMapping(value = "{{{path}}}",
{{#hasProduces}}produces = { {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }, {{/hasProduces}}
{{#hasConsumes}}consumes = { {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} },{{/hasConsumes}}
method = RequestMethod.{{httpMethod}})