loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

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

Browse Source 
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
parent 8d450a29da ed164a77bd
commit a0b429d690
19 changed files with 78 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,18 +32,6 @@ public class SpringMVCServerCodegen extends JavaClientCodegen {
additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage);
additionalProperties.put(CONFIG_PACKAGE, configPackage);
languageSpecificPrimitives = new HashSet<String>(
Arrays.asList(
"byte[]",
"String",
"boolean",
"Boolean",
"Double",
"Integer",
"Long",
"Float")
);
cliOptions.add(new CliOption(CONFIG_PACKAGE, "configuration package for generated code"));
supportedLibraries.clear();