@@ -1596,12 +1596,24 @@ public String getterAndSetterCapitalize(String name) {
1596
1596
* @return Codegen Property object
1597
1597
*/
1598
1598
public CodegenProperty fromProperty (String name , Property p ) {
1599
+ return fromProperty (name , p , null );
1600
+ }
1601
+ /**
1602
+ * Convert Swagger Property object to Codegen Property object
1603
+ *
1604
+ * @param name name of the property
1605
+ * @param p Swagger property object
1606
+ * @param itemsDepth the depth in nested containers or null
1607
+ * @return Codegen Property object
1608
+ */
1609
+ protected CodegenProperty fromProperty (String name , Property p , Integer itemsDepth ) {
1599
1610
if (p == null ) {
1600
1611
LOGGER .error ("unexpected missing property for name " + name );
1601
1612
return null ;
1602
1613
}
1603
1614
1604
1615
CodegenProperty property = CodegenModelFactory .newInstance (CodegenModelType .PROPERTY );
1616
+ property .itemsDepth = itemsDepth ;
1605
1617
property .name = toVarName (name );
1606
1618
property .baseName = name ;
1607
1619
property .nameInCamelCase = camelize (property .name , false );
@@ -1864,7 +1876,8 @@ public CodegenProperty fromProperty(String name, Property p) {
1864
1876
if (itemName == null ) {
1865
1877
itemName = property .name ;
1866
1878
}
1867
- CodegenProperty cp = fromProperty (itemName , ap .getItems ());
1879
+ CodegenProperty cp = fromProperty (itemName , ap .getItems (),
1880
+ itemsDepth == null ? 1 : itemsDepth .intValue () + 1 );
1868
1881
updatePropertyForArray (property , cp );
1869
1882
} else if (p instanceof MapProperty ) {
1870
1883
MapProperty ap = (MapProperty ) p ;
@@ -1877,7 +1890,8 @@ public CodegenProperty fromProperty(String name, Property p) {
1877
1890
property .maxItems = ap .getMaxProperties ();
1878
1891
1879
1892
// handle inner property
1880
- CodegenProperty cp = fromProperty ("inner" , ap .getAdditionalProperties ());
1893
+ CodegenProperty cp = fromProperty ("inner" , ap .getAdditionalProperties (),
1894
+ itemsDepth == null ? 1 : itemsDepth .intValue () + 1 );
1881
1895
updatePropertyForMap (property , cp );
1882
1896
} else {
1883
1897
setNonArrayMapProperty (property , type );
0 commit comments