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

[typescript-angular] Sanitize/transform model name after appending model suffix (#5105)

Browse Source 
This makes sure the final (suffixed) model name is checked against the TS keywords / reserved names.
This commit is contained in:
Alexey Makhrov 2020-01-24 13:59:48 -08:00 committed by Esteban Gehring
parent 524ef63e37
commit 15d31f753d
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java
View File

@ -604,11 +604,11 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
@Override @Override
public String toModelName(String name) { public String toModelName(String name) {
String modelName = super.toModelName(name); if (modelSuffix.length() != 0 && !name.endsWith(modelSuffix)) {
if (modelSuffix.length() == 0 || modelName.endsWith(modelSuffix)) { name = name + modelSuffix;
return modelName;
} }
return modelName + modelSuffix;
return super.toModelName(name);
} }
public String removeModelPrefixSuffix(String name) { public String removeModelPrefixSuffix(String name) {

10
modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularClientCodegenTest.java
View File

@ -16,6 +16,16 @@ import org.testng.annotations.Test;
public class TypeScriptAngularClientCodegenTest { public class TypeScriptAngularClientCodegenTest {
@Test
public void testModelSuffix() {
TypeScriptAngularClientCodegen codegen = new TypeScriptAngularClientCodegen();
codegen.additionalProperties().put("modelSuffix", "MySuffix");
codegen.processOpts();
Assert.assertEquals(codegen.toModelName("TestName"), "TestNameMySuffix");
Assert.assertEquals(codegen.toModelName("Error"), "ErrorMySuffix");
}
@Test @Test
public void testModelFileSuffix() { public void testModelFileSuffix() {
TypeScriptAngularClientCodegen codegen = new TypeScriptAngularClientCodegen(); TypeScriptAngularClientCodegen codegen = new TypeScriptAngularClientCodegen();