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

Fix inheritance with modelPrefix (#3151)

Browse Source 
* Fix inheritance with modelPrefix

Fix #3150

* Fix typo
This commit is contained in:
Thibault Duperron 2019-06-25 08:46:19 +02:00 committed by William Cheng
parent 94c583b6ce
commit 01f991a034
2 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
View File

@ -1756,10 +1756,10 @@ public class DefaultCodegen implements CodegenConfig {
m.interfaces.add(modelName); m.interfaces.add(modelName);
addImport(m, modelName); addImport(m, modelName);
if (allDefinitions != null && refSchema != null) { if (allDefinitions != null && refSchema != null) {
if (allParents.contains(modelName) && supportsMultipleInheritance) { if (allParents.contains(ref) && supportsMultipleInheritance) {
// multiple inheritance // multiple inheritance
addProperties(allProperties, allRequired, refSchema); addProperties(allProperties, allRequired, refSchema);
} else if (parentName != null && parentName.equals(modelName) && supportsInheritance) { } else if (parentName != null && parentName.equals(ref) && supportsInheritance) {
// single inheritance // single inheritance
addProperties(allProperties, allRequired, refSchema); addProperties(allProperties, allRequired, refSchema);
} else { } else {

50
modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
View File

@ -18,6 +18,7 @@
package org.openapitools.codegen; package org.openapitools.codegen;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
@ -28,10 +29,15 @@ import io.swagger.v3.oas.models.parameters.QueryParameter;
import io.swagger.v3.oas.models.parameters.RequestBody; import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.oas.models.responses.ApiResponses; import io.swagger.v3.oas.models.responses.ApiResponses;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.languages.features.CXFServerFeatures;
import org.openapitools.codegen.utils.ModelUtils; import org.openapitools.codegen.utils.ModelUtils;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -654,4 +660,48 @@ public class DefaultCodegenTest {
Assert.assertEquals(imports, expected); Assert.assertEquals(imports, expected);
} }
@Test
public void modelDoNotContainInheritedVars() {
DefaultCodegen codegen = new DefaultCodegen();
codegen.supportsInheritance = true;
OpenAPI openAPI = new OpenAPIParser()
.readLocation("src/test/resources/3_0/generic.yaml", null, new ParseOptions()).getOpenAPI();
codegen.setOpenAPI(openAPI);
CodegenModel codegenModel = codegen.fromModel("Dog", openAPI.getComponents().getSchemas().get("Dog"));
Assert.assertEquals(codegenModel.vars.size(), 1);
}
@Test
public void modelWithPrefixDoNotContainInheritedVars() {
DefaultCodegen codegen = new DefaultCodegen();
codegen.supportsInheritance = true;
codegen.setModelNamePrefix("prefix");
OpenAPI openAPI = new OpenAPIParser()
.readLocation("src/test/resources/3_0/generic.yaml", null, new ParseOptions()).getOpenAPI();
codegen.setOpenAPI(openAPI);
CodegenModel codegenModel = codegen.fromModel("Dog", openAPI.getComponents().getSchemas().get("Dog"));
Assert.assertEquals(codegenModel.vars.size(), 1);
}
@Test
public void modelWithSuffixDoNotContainInheritedVars() {
DefaultCodegen codegen = new DefaultCodegen();
codegen.supportsInheritance = true;
codegen.setModelNameSuffix("suffix");
OpenAPI openAPI = new OpenAPIParser()
.readLocation("src/test/resources/3_0/generic.yaml", null, new ParseOptions()).getOpenAPI();
codegen.setOpenAPI(openAPI);
CodegenModel codegenModel = codegen.fromModel("Dog", openAPI.getComponents().getSchemas().get("Dog"));
Assert.assertEquals(codegenModel.vars.size(), 1);
}
} }