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

Document and optimize getReturnType in TSClientCodegen

Browse Source
This commit is contained in:
Tino Fuhrmann 2020-06-01 19:49:49 +02:00
parent 3aa2f22d98
commit af8f6ff3ef
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) * Copyright 2020 OpenAPI-Generator Contributors (https://openapi-generator.tech)
* Copyright 2018 SmartBear Software * Copyright 2018 SmartBear Software
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -303,32 +303,28 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo
return operations; return operations;
} }
/**
* Returns the correct return type based on all 2xx HTTP responses defined for an operation.
* @param responses all CodegenResponses defined for one operation
* @return TypeScript return type
*/
private String getReturnType(List<CodegenResponse> responses) { private String getReturnType(List<CodegenResponse> responses) {
StringBuilder returnType = new StringBuilder(); Set<String> returnTypes = new HashSet<String>();
boolean firstReturnType = true;
boolean atLeastOneSuccess = false;
boolean addVoid = false;
for (CodegenResponse response: responses) { for (CodegenResponse response: responses) {
if (response.is2xx) { if (response.is2xx) {
if (response.dataType != null) { if (response.dataType != null) {
if (!firstReturnType) { returnTypes.add(response.dataType);
returnType.append(" | ");
}
returnType.append(response.dataType);
firstReturnType = false;
atLeastOneSuccess = true;
} else { } else {
addVoid = true; returnTypes.add("void");
} }
} }
} }
if (!atLeastOneSuccess) {
return null;
} else if (addVoid) {
returnType.append(" | void");
}
return returnType.toString(); if (returnTypes.size() == 0) {
return null;
}
return String.join(" | ", returnTypes);
} }
private String getModelnameFromModelFilename(String filename) { private String getModelnameFromModelFilename(String filename) {