jlengrand/openapi-generator
1
0
Fork 0
mirror of https://github.com/jlengrand/openapi-generator.git synced 2026-05-16 08:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge resolution

Browse Source
This commit is contained in:
Maelig Nantel
2016-01-18 10:38:19 +01:00
committed by wing328
parent 3648a79965
commit 63b7e24c22
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJaxRSJersey1ServerCodegen.java
View File

@@ -10,11 +10,9 @@ import java.util.*;
public class JavaJaxRSJersey1ServerCodegen extends JavaClientCodegen {
protected static final String JAXRS_TEMPLATE_DIRECTORY_NAME = "JavaJaxRS";
protected String dateLibrary = "default";
protected String title = "Swagger Server";
protected String implFolder = "src/main/java";
public static final String DATE_LIBRARY = "dateLibrary";
public JavaJaxRSJersey1ServerCodegen() {
super();
@@ -156,7 +154,7 @@ public class JavaJaxRSJersey1ServerCodegen extends JavaClientCodegen {
}
}
this.additionalProperties.put("serverPort", port);
if(swagger.getPaths() != null) {
if(swagger != null && swagger.getPaths() != null) {
for(String pathname : swagger.getPaths().keySet()) {
Path path = swagger.getPath(pathname);
if(path.getOperations() != null) {
@@ -232,7 +230,7 @@ public class JavaJaxRSJersey1ServerCodegen extends JavaClientCodegen {
if (name.length() == 0) {
return "DefaultApi";
}
name = sanitizeName(name);
name = sanitizeName(name);
return camelize(name) + "Api";
}