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

Merge remote-tracking branch 'origin/master' into 2.3.0

Browse Source
This commit is contained in:
wing328
2017-07-01 15:47:27 +08:00
parent 40369bb819 7fa53773fc
commit 9269dac6cf
340 changed files with 4075 additions and 1014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
View File

@@ -2579,8 +2579,8 @@ public class DefaultCodegen {
name = typeMapping.get(name);
p.baseType = name;
} else {
p.baseType = name;
name = toModelName(name);
p.baseType = name;
if (defaultIncludes.contains(name)) {
imports.add(name);
}

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Apache2ConfigCodegen.java
View File

@@ -78,8 +78,8 @@ public class Apache2ConfigCodegen extends DefaultCodegen implements CodegenConfi
item = "*";
}
splitPath.add(item);
op.path += item + "/";
}
op.path = String.join("/", splitPath);
op.vendorExtensions.put("x-codegen-userInfoPath", userInfoPath);
boolean foundInNewList = false;
for (CodegenOperation op1 : newOpList) {