Refactor : rename getNullableSchemaType to getNullableTypeDeclaration

getNullablePropertyType to getNullableTypeDeclaration

Author: Olivier Leonard

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java

@@ -1162,7 +1162,7 @@ protected void processOperation(CodegenOperation operation) {
         }
 
         String[] nestedTypes = {"List", "Collection", "ICollection", "Dictionary"};
-        String dataType = getNullablePropertyType(operation.returnProperty.items);
+        String dataType = getNullableTypeDeclaration(operation.returnProperty.items);
 
         for (String nestedType : nestedTypes) {
             if (operation.returnType.contains("<" + nestedType + ">")) {
@@ -1435,18 +1435,17 @@ private String getArrayTypeDeclaration(Schema arr) {
         String arrayType = typeMapping.get("array");
         StringBuilder instantiationType = new StringBuilder(arrayType);
         Schema<?> items = ModelUtils.getSchemaItems(arr);
-        String nestedType = getNullableSchemaType(items);
 
         // TODO: We may want to differentiate here between generics and primitive arrays.
-        instantiationType.append("<").append(nestedType).append(">");
+        instantiationType.append("<").append(getNullableTypeDeclaration(items)).append(">");
         return instantiationType.toString();
     }
 
-    protected String getNullablePropertyType(CodegenProperty property) {
+    protected String getNullableTypeDeclaration(CodegenProperty property) {
         return property.dataType;
     }
 
-    protected String getNullableSchemaType(Schema<?> items) {
+    protected String getNullableTypeDeclaration(Schema<?> items) {
         return getTypeDeclaration(items);
     }
 
@@ -1465,8 +1464,7 @@ public String getTypeDeclaration(Schema p) {
         } else if (ModelUtils.isMapSchema(p)) {
             // Should we also support maps of maps?
             Schema<?> inner = ModelUtils.getAdditionalProperties(p);
-            String typeDeclaration = getNullableSchemaType(inner);
-            return getSchemaType(p) + "<string, " + typeDeclaration + ">";
+            return getSchemaType(p) + "<string, " + getNullableTypeDeclaration(inner) + ">";
         }
         return super.getTypeDeclaration(p);
     }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java

@@ -1705,8 +1705,8 @@ public Map<String, Object> postProcessSupportingFileData(Map<String, Object> obj
         return objs;
     }
 
-    protected String getNullablePropertyType(CodegenProperty property) {
-        String dataType = super.getNullablePropertyType(property);
+    protected String getNullableTypeDeclaration(CodegenProperty property) {
+        String dataType = super.getNullableTypeDeclaration(property);
         if (!GENERICHOST.equals(getLibrary())) {
             if (property.isNullable && (this.nullReferenceTypesFlag || property.isEnum || getValueTypes().contains(dataType)) && !dataType.endsWith("?")) {
                 dataType += "?";
@@ -1715,8 +1715,8 @@ protected String getNullablePropertyType(CodegenProperty property) {
         return dataType;
     }
 
-    protected String getNullableSchemaType(Schema<?> items) {
-        String nestedType = super.getNullableSchemaType(items);
+    protected String getNullableTypeDeclaration(Schema<?> items) {
+        String nestedType = super.getNullableTypeDeclaration(items);
         if (!GENERICHOST.equals(getLibrary())) {
             if (ModelUtils.isNullable(items) && (this.nullReferenceTypesFlag || ModelUtils.isEnumSchema(items) || getValueTypes().contains(nestedType)) && !nestedType.endsWith("?")) {
                 nestedType += "?";