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

Fix composed properties missing from allVars (#3616)

Browse Source 
* Fix composed properties missing from allVars

* Update the allOfCompositionTest to check allVars
This commit is contained in:
Glenn Schmidt 2019-08-13 01:27:01 +10:00 committed by William Cheng
parent 20db89e277
commit 36ccd87a80
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1827,6 +1827,7 @@ public class DefaultCodegen implements CodegenConfig {
} else {
// composition
addProperties(properties, required, refSchema);
addProperties(allProperties, allRequired, refSchema);
}
}

27
modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java
View File

@ -534,6 +534,9 @@ public class RubyClientCodegenTest {
// to test all properties
Assert.assertEquals(superMan.getVars().size(), 6);
Assert.assertEquals(superMan.getAllVars().size(), 6);
Assert.assertEquals(superMan.getMandatory().size(), 3);
Assert.assertEquals(superMan.getAllMandatory().size(), 3);
CodegenProperty cp0 = superMan.getVars().get(0);
Assert.assertEquals(cp0.name, "id");
@ -559,6 +562,30 @@ public class RubyClientCodegenTest {
Assert.assertEquals(cp5.name, "level");
Assert.assertTrue(cp5.required);
CodegenProperty cp6 = superMan.getAllVars().get(0);
Assert.assertEquals(cp6.name, "id");
Assert.assertTrue(cp6.required);
CodegenProperty cp7 = superMan.getAllVars().get(1);
Assert.assertEquals(cp7.name, "name");
Assert.assertFalse(cp7.required);
CodegenProperty cp8 = superMan.getAllVars().get(2);
Assert.assertEquals(cp8.name, "reward");
Assert.assertFalse(cp8.required);
CodegenProperty cp9 = superMan.getAllVars().get(3);
Assert.assertEquals(cp9.name, "origin");
Assert.assertTrue(cp9.required);
CodegenProperty cp10 = superMan.getAllVars().get(4);
Assert.assertEquals(cp10.name, "category");
Assert.assertFalse(cp10.required);
CodegenProperty cp11 = superMan.getAllVars().get(5);
Assert.assertEquals(cp11.name, "level");
Assert.assertTrue(cp11.required);
}