Java methods updated

Author: spacether

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -2934,7 +2934,7 @@ public CodegenModel fromModel(String name, Schema schema) {
         m.setFormat(schema.getFormat());
         m.setComposedSchemas(getComposedSchemas(schema));
         if (ModelUtils.isArraySchema(schema)) {
-            String itemName = getItemsNameForModel(name);
+            String itemName = getItemsName(null, name);
             CodegenProperty arrayProperty = fromProperty(itemName, schema, false);
             m.setItems(arrayProperty.items);
             m.arrayModelType = arrayProperty.complexType;
@@ -3851,7 +3851,7 @@ public CodegenProperty fromProperty(String name, Schema p, boolean required, boo
             }
 
             // handle inner property
-            String itemName = getItemsNameForProp(p, name);
+            String itemName = getItemsName(p, name);
             ArraySchema arraySchema = (ArraySchema) p;
             Schema innerSchema = unaliasSchema(getSchemaItems(arraySchema));
             CodegenProperty cp = fromProperty(itemName, innerSchema, false);
@@ -7909,22 +7909,19 @@ public List<VendorExtension> getSupportedVendorExtensions() {
     */
     protected String handleSpecialCharacters(String name) { return name; }
 
-    public String getItemsNameForProp(Schema containingSchema, String containingSchemaName) {
+    public String getItemsName(Schema containingSchema, String containingSchemaName) {
         String itemName = null;
-        if (containingSchema.getExtensions() != null && containingSchema.getExtensions().get("x-item-name") != null) {
-            itemName = containingSchema.getExtensions().get("x-item-name").toString();
-        }
-        if (itemName == null) {
-            itemName = toVarName(containingSchemaName);
+        if (containingSchema != null) {
+            // fromProperty use case
+            if (containingSchema.getExtensions() != null && containingSchema.getExtensions().get("x-item-name") != null) {
+                return containingSchema.getExtensions().get("x-item-name").toString();
+            }
+            return toVarName(containingSchemaName);
         }
-        return itemName;
-    }
-
-    public String getItemsNameForModel(String containingSchemaName) {
+        // fromModel use case
         return containingSchemaName;
     }
 
-
     public String getAdditionalPropertiesName() {
         return "additional_properties";
     }

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java

@@ -1079,11 +1079,7 @@ public boolean isDataTypeString(String dataType) {
         return "str".equals(dataType);
     }
 
-    public String getItemsNameForProp(Schema containingSchema, String containingSchemaName) {
-        return "items";
-    }
-
-    public String getItemsNameForModel(String containingSchemaName) {
+    public String getItemsName(Schema containingSchema, String containingSchemaName) {
         return "items";
     }