Skip to content

Commit 88411e8

Browse files
committed
chore: fix some null checks, use OpenApiDataTypeConstants.Object instead of string-version
1 parent ac9de30 commit 88411e8

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

src/Atc.Rest.ApiGenerator.Framework/Factories/Parameters/Client/ContentGeneratorClientParameterParametersFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ private static void AppendParametersFromBody(
109109
{
110110
requestBodyType = "IFormFile";
111111
}
112-
else if (requestSchema.Items is not null)
112+
else if (requestSchema.Items?.Reference is not null)
113113
{
114114
requestBodyType = requestSchema.Items.Reference.Id.PascalCase(ApiOperationExtractor.ModelNameSeparators, removeSeparators: true);
115115
}

src/Atc.Rest.ApiGenerator.Framework/Factories/Parameters/ServerClient/ContentGeneratorServerClientEnumParametersFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public static EnumParameters Create(
4343
{
4444
case 1:
4545
result.Add(
46-
key: sa[0].Trim(),
46+
key: sa[0].Trim().Replace(":", "-", StringComparison.CurrentCulture),
4747
value: null);
4848
break;
4949
case 2:

src/Atc.Rest.ApiGenerator.Framework/Factories/Parameters/ServerClient/ContentGeneratorServerClientModelParametersFactory.cs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,13 @@ private static bool GetRequired(
179179
: $"{schema.GetModelName()}.{value.EnsureFirstCharacterToUpper()}";
180180
}
181181

182-
return schema.Default.GetDefaultValueAsString();
182+
if (schema.Type is not null &&
183+
schema.Type != "object")
184+
{
185+
return schema.Default.GetDefaultValueAsString();
186+
}
187+
188+
return null;
183189
}
184190

185191
if (NameConstants.List.Equals(dataTypeForList, StringComparison.Ordinal))
@@ -252,7 +258,7 @@ private static List<PropertyParameters> ExtractPropertiesParameters(
252258

253259
if ("Object".Equals(dataType, StringComparison.Ordinal))
254260
{
255-
dataType = "object";
261+
dataType = OpenApiDataTypeConstants.Object;
256262
}
257263
}
258264
else
@@ -269,7 +275,7 @@ private static List<PropertyParameters> ExtractPropertiesParameters(
269275
}
270276
else
271277
{
272-
dataType = "object";
278+
dataType = OpenApiDataTypeConstants.Object;
273279
}
274280
}
275281
}
@@ -450,7 +456,7 @@ private static List<ParameterBaseParameters> ExtractRecordParameterBaseParameter
450456

451457
if ("Object".Equals(dataType, StringComparison.Ordinal))
452458
{
453-
dataType = "object";
459+
dataType = OpenApiDataTypeConstants.Object;
454460
}
455461
}
456462
else
@@ -467,7 +473,7 @@ private static List<ParameterBaseParameters> ExtractRecordParameterBaseParameter
467473
}
468474
else
469475
{
470-
dataType = "object";
476+
dataType = OpenApiDataTypeConstants.Object;
471477
}
472478
}
473479
}

0 commit comments

Comments
 (0)