Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
dd105e2
fix name sanitation when using kebab case filenaming
smasala Oct 25, 2018
b2029ee
remove whitespaces
smasala Oct 25, 2018
6474972
Merge branch 'master' of https://github.com/smasala/openapi-generator
smasala Nov 16, 2018
0d51a62
Merge branch 'master' of https://github.com/smasala/openapi-generator
smasala Dec 21, 2018
0f800db
Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…
smasala Jan 14, 2019
3105e17
Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…
smasala Jan 17, 2019
7e58719
sanitize names by removing spec 3 ref keys
smasala Jan 17, 2019
fd6f244
Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…
smasala Feb 4, 2019
3cdfd48
Merge branch 'master' into name-ref-fix
smasala Feb 4, 2019
c9cc783
Revert "sanitize names by removing spec 3 ref keys"
smasala Feb 4, 2019
bc94f03
add pipes to datatype names
smasala Feb 4, 2019
f7ebc44
Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…
smasala Mar 13, 2019
39f815a
Merge branch 'master' into name-ref-fix
smasala Mar 13, 2019
75f2c07
split imports
smasala Mar 14, 2019
91e7a1e
remove comment
smasala Mar 14, 2019
6cc6ea7
fix when using a mixture of (any|one) and standard imports
smasala Mar 28, 2019
3b0c60c
Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…
smasala Mar 28, 2019
9b3b9d0
Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…
smasala May 21, 2019
d548564
Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…
smasala Jul 26, 2019
22ab490
sanitize names by removing spec 3 ref keys
smasala Jan 17, 2019
ed2d71b
Revert "sanitize names by removing spec 3 ref keys"
smasala Feb 4, 2019
815c58d
Merge conflict DefMerge branch 'master' into name-ref-fix
smasala Jul 26, 2019
c307a4b
split imports
smasala Mar 14, 2019
bbfe797
remove comment
smasala Mar 14, 2019
f680a2c
fix when using a mixture of (any|one) and standard imports
smasala Mar 28, 2019
3885f1f
Merge branch 'name-ref-fix' of https://github.com/smasala/openapi-gen…
smasala Jul 26, 2019
4dabb56
Fix merge error
smasala Jul 26, 2019
87303b1
format
smasala Jul 26, 2019
080113f
fix tests
smasala Jul 26, 2019
4978024
create test, fi regex
smasala Jul 26, 2019
a774df2
Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…
smasala Jul 29, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix when using a mixture of (any|one) and standard imports
  • Loading branch information
smasala committed Jul 26, 2019
commit f680a2c29a3bc142ae45ea5d98528083676cba5d
Original file line number Diff line number Diff line change
Expand Up @@ -459,22 +459,31 @@ public Map<String, Object> postProcessAllModels(Map<String, Object> objs) {
}
}
// Add additional filename information for imports
Set<String> newImports = new HashSet<String>();
System.out.println(cm.imports);
if (cm.imports.size() > 0) {
for (String name : cm.imports) {
if (name.indexOf(" | ") >= 0) {
String[] parts = name.split(" \\| ");
for (String s : parts) {
newImports.add(s);
}
}
Set<String> parsedImports = parseImports(cm);
mo.put("tsImports", toTsImports(cm, parsedImports));
}
}
return result;
}

/**
* Parse imports
*/
private Set<String> parseImports(CodegenModel cm) {
Set<String> newImports = new HashSet<String>();
if (cm.imports.size() > 0) {
for (String name : cm.imports) {
if (name.indexOf(" | ") >= 0) {
String[] parts = name.split(" \\| ");
for (String s : parts) {
newImports.add(s);
}
} else {
newImports.add(name);
}
mo.put("tsImports", toTsImports(cm, newImports.size() > 0 ? newImports : cm.imports));
}
}
return result;
return newImports;
}

private List<Map<String, String>> toTsImports(CodegenModel cm, Set<String> imports) {
Expand Down