Skip to content

Better "Any Type" support #6091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 17 commits into from
Apr 30, 2020
Merged

Better "Any Type" support #6091

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e0e4268
better anytype support
wing328 Apr 28, 2020
b5fb8ed
add tests for any type
wing328 Apr 28, 2020
c2f5604
fix test with any_value
wing328 Apr 28, 2020
f99db56
fix tests
wing328 Apr 28, 2020
df2974a
fix case additionalProperties: {}
wing328 Apr 28, 2020
2ea7720
test with CI
wing328 Apr 28, 2020
e016c41
remove check in map schema
wing328 Apr 28, 2020
c72d9ee
Revert "remove check in map schema"
wing328 Apr 28, 2020
41d6334
fix tests, comment out map schema fix
wing328 Apr 28, 2020
63a448b
fix tests
wing328 Apr 28, 2020
3ded644
fix tests with correct codegen model
wing328 Apr 28, 2020
4b15dbf
fix tests
wing328 Apr 28, 2020
868be80
fix tests for map of any type
wing328 Apr 28, 2020
1dee922
fix array of any type
wing328 Apr 28, 2020
93e7bea
fix array of any type
wing328 Apr 28, 2020
678d517
update samples, remove log
wing328 Apr 29, 2020
b191db2
add typemapping to go, python
wing328 Apr 29, 2020
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 tests, comment out map schema fix
  • Loading branch information
@wing328
wing328 committed Apr 28, 2020
commit 41d633417c410d02f1e2260fbae3bd5071ebd225
3 changes: 2 additions & 1 deletion modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,11 +439,12 @@ public static boolean isComposedSchema(Schema schema) {
* @return true if the specified schema is a Map schema.
*/
public static boolean isMapSchema(Schema schema) {
/* comment out below as it has impacts to many generators
// make sure it's not free form object first
if (isFreeFormObject(schema)) {
// to cover `additionalProperties: {}`
return false;
}
}*/

if (schema instanceof MapSchema) {
return true;
Expand Down
24 changes: 12 additions & 12 deletions .../openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ public void testAnyType() {
CodegenModel cm1 = codegen.fromModel("AnyValueModel", test1);
Assert.assertEquals(cm1.getClassname(), "AnyValueModel");

final CodegenProperty property1 = cm1.vars.get(0);
final CodegenProperty property1 = cm1.allVars.get(0);
Assert.assertEquals(property1.baseName, "any_value");
Assert.assertEquals(property1.dataType, "oas_any_type_not_mapped");
Assert.assertTrue(property1.hasMore);
Expand All @@ -651,7 +651,7 @@ public void testAnyType() {
Assert.assertFalse(property1.isFreeFormObject);
Assert.assertTrue(property1.isAnyType);

final CodegenProperty property2 = cm1.vars.get(1);
final CodegenProperty property2 = cm1.allVars.get(1);
Assert.assertEquals(property2.baseName, "any_value_with_desc");
Assert.assertEquals(property2.dataType, "oas_any_type_not_mapped");
Assert.assertTrue(property2.hasMore);
Expand All @@ -661,7 +661,7 @@ public void testAnyType() {
Assert.assertFalse(property2.isFreeFormObject);
Assert.assertTrue(property2.isAnyType);

final CodegenProperty property3 = cm1.vars.get(2);
final CodegenProperty property3 = cm1.allVars.get(2);
Assert.assertEquals(property3.baseName, "any_value_nullable");
Assert.assertEquals(property3.dataType, "oas_any_type_not_mapped");
Assert.assertFalse(property3.hasMore);
Expand All @@ -676,7 +676,7 @@ public void testAnyType() {
CodegenModel cm2 = codegen.fromModel("AnyValueModelInline", test2);
Assert.assertEquals(cm2.getClassname(), "AnyValueModelInline");

final CodegenProperty cp1 = cm1.vars.get(0);
final CodegenProperty cp1 = cm1.allVars.get(0);
Assert.assertEquals(cp1.baseName, "any_value");
Assert.assertEquals(cp1.dataType, "oas_any_type_not_mapped");
Assert.assertTrue(cp1.hasMore);
Expand All @@ -686,7 +686,7 @@ public void testAnyType() {
Assert.assertFalse(cp1.isFreeFormObject);
Assert.assertTrue(cp1.isAnyType);

final CodegenProperty cp2 = cm1.vars.get(1);
final CodegenProperty cp2 = cm1.allVars.get(1);
Assert.assertEquals(cp2.baseName, "any_value_with_desc");
Assert.assertEquals(cp2.dataType, "oas_any_type_not_mapped");
Assert.assertTrue(cp2.hasMore);
Expand All @@ -696,7 +696,7 @@ public void testAnyType() {
Assert.assertFalse(cp2.isFreeFormObject);
Assert.assertTrue(cp2.isAnyType);

final CodegenProperty cp3 = cm1.vars.get(2);
final CodegenProperty cp3 = cm1.allVars.get(2);
Assert.assertEquals(cp3.baseName, "any_value_nullable");
Assert.assertEquals(cp3.dataType, "oas_any_type_not_mapped");
Assert.assertTrue(cp3.hasMore);
Expand All @@ -707,7 +707,7 @@ public void testAnyType() {
Assert.assertTrue(cp3.isAnyType);

// map
final CodegenProperty cp4 = cm1.vars.get(3);
final CodegenProperty cp4 = cm1.allVars.get(3);
Assert.assertEquals(cp4.baseName, "map_any_value");
Assert.assertEquals(cp4.dataType, "Map<String, oas_any_type_not_mapped>");
Assert.assertTrue(cp4.hasMore);
Expand All @@ -718,7 +718,7 @@ public void testAnyType() {
Assert.assertFalse(cp4.isFreeFormObject);
Assert.assertTrue(cp4.isAnyType);

final CodegenProperty cp5 = cm1.vars.get(4);
final CodegenProperty cp5 = cm1.allVars.get(4);
Assert.assertEquals(cp5.baseName, "map_any_value_with_desc");
Assert.assertEquals(cp5.dataType, "Map<String, oas_any_type_not_mapped>");
Assert.assertTrue(cp5.hasMore);
Expand All @@ -729,7 +729,7 @@ public void testAnyType() {
Assert.assertFalse(cp5.isFreeFormObject);
Assert.assertTrue(cp5.isAnyType);

final CodegenProperty cp6 = cm1.vars.get(5);
final CodegenProperty cp6 = cm1.allVars.get(5);
Assert.assertEquals(cp6.baseName, "map_any_value_nullable");
Assert.assertEquals(cp6.dataType, "Map<String, oas_any_type_not_mapped>");
Assert.assertTrue(cp6.hasMore);
Expand All @@ -741,7 +741,7 @@ public void testAnyType() {
Assert.assertTrue(cp6.isAnyType);

// array
final CodegenProperty cp7 = cm1.vars.get(6);
final CodegenProperty cp7 = cm1.allVars.get(6);
Assert.assertEquals(cp7.baseName, "array_any_value");
Assert.assertEquals(cp7.dataType, "List<oas_any_type_not_mapped>");
Assert.assertTrue(cp7.hasMore);
Expand All @@ -752,7 +752,7 @@ public void testAnyType() {
Assert.assertFalse(cp7.isFreeFormObject);
Assert.assertTrue(cp7.isAnyType);

final CodegenProperty cp8 = cm1.vars.get(7);
final CodegenProperty cp8 = cm1.allVars.get(7);
Assert.assertEquals(cp8.baseName, "array_any_value_with_desc");
Assert.assertEquals(cp8.dataType, "List<oas_any_type_not_mapped>");
Assert.assertTrue(cp8.hasMore);
Expand All @@ -763,7 +763,7 @@ public void testAnyType() {
Assert.assertFalse(cp8.isFreeFormObject);
Assert.assertTrue(cp8.isAnyType);

final CodegenProperty cp9 = cm1.vars.get(8);
final CodegenProperty cp9 = cm1.allVars.get(8);
Assert.assertEquals(cp9.baseName, "array_any_value_nullable");
Assert.assertEquals(cp9.dataType, "List<oas_any_type_not_mapped>");
Assert.assertFalse(cp9.hasMore);
Expand Down