Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .github/workflows/samples-dotnet10.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ jobs:
- samples/client/petstore/csharp/generichost/latest/Tags
- samples/client/petstore/csharp/generichost/latest/HelloWorld
- samples/client/petstore/csharp/generichost/latest/NullTypes
- samples/client/petstore/csharp/generichost/latest/ManualUnionMembersTests
- samples/client/petstore/csharp/generichost/latest/OneOfList
- samples/client/petstore/csharp/generichost/latest/UnionMembers
- samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset
- samples/client/petstore/csharp/generichost/net10/AllOf
- samples/client/petstore/csharp/generichost/net10/AnyOf
Expand Down
10 changes: 10 additions & 0 deletions bin/configs/csharp-generichost-latest-unionMembers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
generatorName: csharp
outputDir: samples/client/petstore/csharp/generichost/latest/UnionMembers
inputSpec: modules/openapi-generator/src/test/resources/3_1/csharp/union-members.yaml
templateDir: modules/openapi-generator/src/main/resources/csharp
additionalProperties:
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
modelPropertySorting: alphabetical
operationParameterSorting: alphabetical
treatWarningsAsErrors: true
warningsNotAsErrors: CS0612
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {

// Defines the sdk option for targeted frameworks, which differs from targetFramework and targetFrameworkNuget
protected static final String MCS_NET_VERSION_KEY = "x-mcs-sdk";
protected static final String X_IS_UNION = "x-is-union";
protected static final String SUPPORTS_UWP = "supportsUWP";
protected static final String SUPPORTS_RETRY = "supportsRetry";

Expand Down Expand Up @@ -1763,6 +1764,44 @@ public ModelsMap postProcessModels(ModelsMap objs) {
return objs;
}

@Override
public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs) {
objs = super.postProcessAllModels(objs);

List<CodegenModel> models = objs.values().stream()
.flatMap(modelsMap -> modelsMap.getModels().stream())
.map(ModelMap::getModel)
.collect(Collectors.toList());

Set<String> unionClassnames = models.stream()
.filter(this::isUnion)
.map(cm -> cm.classname)
.collect(Collectors.toSet());

// a union member that is itself a union is written and read by its own converter, which may produce any JSON value
for (CodegenModel cm : models) {
if (!isUnion(cm)) {
continue;
}
List<CodegenProperty> members = new ArrayList<>();
Optional.ofNullable(cm.getComposedSchemas().getOneOf()).ifPresent(members::addAll);
Optional.ofNullable(cm.getComposedSchemas().getAnyOf()).ifPresent(members::addAll);
for (CodegenProperty member : members) {
if (member.complexType != null && unionClassnames.contains(member.complexType)) {
member.vendorExtensions.put(X_IS_UNION, true);
}
}
}

return objs;
}

private boolean isUnion(CodegenModel cm) {
return cm.getComposedSchemas() != null
&& ((cm.getComposedSchemas().getOneOf() != null && !cm.getComposedSchemas().getOneOf().isEmpty())
|| (cm.getComposedSchemas().getAnyOf() != null && !cm.getComposedSchemas().getAnyOf().isEmpty()));
}


// https://github.com/OpenAPITools/openapi-generator/issues/15867
@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,35 @@
{{#lambda.trimLineBreaks}}
int currentDepth = utf8JsonReader.CurrentDepth;

{{#model.discriminator}}
if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray)
throw new JsonException();

{{/model.discriminator}}
{{^model.discriminator}}
{{^composedSchemas.anyOf}}
{{^composedSchemas.oneOf}}
if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray)
throw new JsonException();

{{/composedSchemas.oneOf}}
{{/composedSchemas.anyOf}}
{{/model.discriminator}}
JsonTokenType startingTokenType = utf8JsonReader.TokenType;
{{^model.discriminator}}
{{#composedSchemas.anyOf}}
{{#-first}}
bool isScalarToken = startingTokenType != JsonTokenType.StartObject && startingTokenType != JsonTokenType.StartArray;
{{/-first}}
{{/composedSchemas.anyOf}}
{{^composedSchemas.anyOf}}
{{#composedSchemas.oneOf}}
{{#-first}}
bool isScalarToken = startingTokenType != JsonTokenType.StartObject && startingTokenType != JsonTokenType.StartArray;
{{/-first}}
{{/composedSchemas.oneOf}}
{{/composedSchemas.anyOf}}
{{/model.discriminator}}

{{#allVars}}
Option<{{#isInnerEnum}}{{^isMap}}{{classname}}.{{/isMap}}{{/isInnerEnum}}{{{datatypeWithEnum}}}{{nrt?}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}}> {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = default;
Expand Down Expand Up @@ -117,62 +142,37 @@
{{{datatypeWithEnum}}}{{nrt?}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}} {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = default;
{{#-last}}

Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader;
while (utf8JsonReaderOneOf.Read())
{
if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth)
break;

if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth)
break;

if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1)
{
{{#oneOf}}
Utf8JsonReader utf8JsonReader{{name}} = utf8JsonReader;
ClientUtils.TryDeserialize<{{{datatypeWithEnum}}}{{nrt?}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}}>(ref utf8JsonReader{{name}}, jsonSerializerOptions, out {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}});
{{^-last}}

{{/-last}}
{{/oneOf}}
}
}
{{/-last}}
{{/vendorExtensions.x-duplicated-data-type}}
{{/oneOf}}

{{#oneOf}}
{{^vendorExtensions.x-duplicated-data-type}}
{{>ReadUnionMember}}
{{/vendorExtensions.x-duplicated-data-type}}
{{/oneOf}}
{{#anyOf}}
{{^vendorExtensions.x-duplicated-data-type}}
{{{datatypeWithEnum}}}{{nrt?}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}} {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = default;
{{#-last}}

Utf8JsonReader utf8JsonReaderAnyOf = utf8JsonReader;
while (utf8JsonReaderAnyOf.Read())
{
if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderAnyOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderAnyOf.CurrentDepth)
break;

if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderAnyOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderAnyOf.CurrentDepth)
break;

if (utf8JsonReaderAnyOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderAnyOf.CurrentDepth - 1)
{
{{#anyOf}}
Utf8JsonReader utf8JsonReader{{name}} = utf8JsonReader;
ClientUtils.TryDeserialize<{{{datatypeWithEnum}}}{{nrt?}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}}>(ref utf8JsonReader{{name}}, jsonSerializerOptions, out {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}});
{{^-last}}

{{/-last}}
{{/anyOf}}
}
}
{{/-last}}
{{/vendorExtensions.x-duplicated-data-type}}
{{/anyOf}}
{{#anyOf}}
{{^vendorExtensions.x-duplicated-data-type}}
{{>ReadUnionMember}}
{{/vendorExtensions.x-duplicated-data-type}}
{{/anyOf}}
{{#anyOf}}
{{#-first}}
if ({{#lambda.joinWithAmpersand}}{{#anyOf}}{{^vendorExtensions.x-duplicated-data-type}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} == null {{/vendorExtensions.x-duplicated-data-type}}{{/anyOf}}{{/lambda.joinWithAmpersand}})
throw new JsonException();

{{/-first}}
{{/anyOf}}
{{/composedSchemas}}
{{/model.discriminator}}
while (utf8JsonReader.Read())
while ({{^model.discriminator}}{{#composedSchemas.anyOf}}{{#-first}}!isScalarToken && {{/-first}}{{/composedSchemas.anyOf}}{{^composedSchemas.anyOf}}{{#composedSchemas.oneOf}}{{#-first}}!isScalarToken && {{/-first}}{{/composedSchemas.oneOf}}{{/composedSchemas.anyOf}}{{/model.discriminator}}utf8JsonReader.Read())
{
if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth)
break;
Expand Down Expand Up @@ -389,6 +389,50 @@

{{/children}}
{{/discriminator}}
{{#composedSchemas.oneOf}}
{{^vendorExtensions.x-duplicated-data-type}}
{{#vendorExtensions.x-is-union}}
{{>WriteUnionOneOfMember}}
{{/vendorExtensions.x-is-union}}
{{^vendorExtensions.x-is-union}}
{{#isEnumRef}}
{{>WriteUnionOneOfMember}}
{{/isEnumRef}}
{{^isEnumRef}}
{{#isPrimitiveType}}
{{>WriteUnionOneOfMember}}
{{/isPrimitiveType}}
{{^isPrimitiveType}}
{{#isContainer}}
{{>WriteUnionOneOfMember}}
{{/isContainer}}
{{/isPrimitiveType}}
{{/isEnumRef}}
{{/vendorExtensions.x-is-union}}
{{/vendorExtensions.x-duplicated-data-type}}
{{/composedSchemas.oneOf}}
{{#composedSchemas.anyOf}}
{{^vendorExtensions.x-duplicated-data-type}}
{{#vendorExtensions.x-is-union}}
{{>WriteUnionAnyOfMember}}
{{/vendorExtensions.x-is-union}}
{{^vendorExtensions.x-is-union}}
{{#isEnumRef}}
{{>WriteUnionAnyOfMember}}
{{/isEnumRef}}
{{^isEnumRef}}
{{#isPrimitiveType}}
{{>WriteUnionAnyOfMember}}
{{/isPrimitiveType}}
{{^isPrimitiveType}}
{{#isContainer}}
{{>WriteUnionAnyOfMember}}
{{/isContainer}}
{{/isPrimitiveType}}
{{/isEnumRef}}
{{/vendorExtensions.x-is-union}}
{{/vendorExtensions.x-duplicated-data-type}}
{{/composedSchemas.anyOf}}
writer.WriteStartObject();

{{#model.discriminator}}
Expand Down Expand Up @@ -419,36 +463,41 @@
{{/model.hasDiscriminatorWithNonEmptyMapping}}
{{/model.discriminator}}
{{^model.discriminator}}
{{#composedSchemas}}
{{#anyOf}}
if ({{#lambda.joinWithAmpersand}}{{^required}}{{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}Option.IsSet {{/required}}{{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{/required}} != null{{/lambda.joinWithAmpersand}})
{{#isPrimitiveType}}
{{#isString}}
writer.WriteString("{{vendorExtensions.x-base-name}}", {{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}Option.Value);
{{/isString}}
{{#isBoolean}}
writer.WriteBoolean("{{vendorExtensions.x-base-name}}", {{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}Option.Value.Value);
{{/isBoolean}}
{{#isNumeric}}
writer.WriteNumber("{{vendorExtensions.x-base-name}}", {{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}Option.Value.Value);
{{/isNumeric}}
{{#isEnum}}
{{#composedSchemas.oneOf}}
{{^vendorExtensions.x-duplicated-data-type}}
{{^vendorExtensions.x-is-union}}
{{^isEnumRef}}
{{^isPrimitiveType}}
{{^isContainer}}
if ({{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}} != null)
{
{{datatypeWithEnum}}JsonConverter {{#lambda.camelcase}}{{datatypeWithEnum}}{{/lambda.camelcase}}JsonConverter = ({{datatypeWithEnum}}JsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert({{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{/required}}.GetType()));
{{#lambda.camelcase}}{{datatypeWithEnum}}{{/lambda.camelcase}}JsonConverter.Write{{^isEnumRef}}Properties{{/isEnumRef}}(writer, {{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{#vendorExtensions.x-is-value-type}}.Value{{/vendorExtensions.x-is-value-type}}{{/required}}, jsonSerializerOptions);
{{datatypeWithEnum}}JsonConverter {{#lambda.camelcase}}{{datatypeWithEnum}}{{/lambda.camelcase}}JsonConverter = ({{datatypeWithEnum}}JsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert({{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}.GetType()));
{{#lambda.camelcase}}{{datatypeWithEnum}}{{/lambda.camelcase}}JsonConverter.WriteProperties(writer, {{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}, jsonSerializerOptions);
}
{{/isEnum}}
{{/isPrimitiveType}}
{{^isPrimitiveType}}

{{/isContainer}}
{{/isPrimitiveType}}
{{/isEnumRef}}
{{/vendorExtensions.x-is-union}}
{{/vendorExtensions.x-duplicated-data-type}}
{{/composedSchemas.oneOf}}
{{/model.discriminator}}
{{#composedSchemas.anyOf}}
{{^vendorExtensions.x-is-union}}
{{^isEnumRef}}
{{^isPrimitiveType}}
{{^isContainer}}
if ({{#lambda.joinWithAmpersand}}{{^required}}{{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}Option.IsSet {{/required}}{{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{/required}} != null{{/lambda.joinWithAmpersand}})
{
{{datatypeWithEnum}}JsonConverter {{#lambda.camelcase}}{{datatypeWithEnum}}{{/lambda.camelcase}}JsonConverter = ({{datatypeWithEnum}}JsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert({{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{/required}}.GetType()));
{{#lambda.camelcase}}{{datatypeWithEnum}}{{/lambda.camelcase}}JsonConverter.Write{{^isEnumRef}}Properties{{/isEnumRef}}(writer, {{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{#vendorExtensions.x-is-value-type}}.Value{{/vendorExtensions.x-is-value-type}}{{/required}}, jsonSerializerOptions);
{{#lambda.camelcase}}{{datatypeWithEnum}}{{/lambda.camelcase}}JsonConverter.WriteProperties(writer, {{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{#vendorExtensions.x-is-value-type}}.Value{{/vendorExtensions.x-is-value-type}}{{/required}}, jsonSerializerOptions);
}
{{/isPrimitiveType}}

{{/anyOf}}
{{/composedSchemas}}
{{/model.discriminator}}
{{/isContainer}}
{{/isPrimitiveType}}
{{/isEnumRef}}
{{/vendorExtensions.x-is-union}}
{{/composedSchemas.anyOf}}
WriteProperties(writer, {{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}, jsonSerializerOptions);
writer.WriteEndObject();
{{/lambda.trimLineBreaks}}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{{#vendorExtensions.x-is-union}}
Utf8JsonReader utf8JsonReader{{name}} = utf8JsonReader;
ClientUtils.TryDeserialize<{{{datatypeWithEnum}}}{{nrt?}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}}>(ref utf8JsonReader{{name}}, jsonSerializerOptions, out {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}});

{{/vendorExtensions.x-is-union}}
{{^vendorExtensions.x-is-union}}
if ({{#isFreeFormObject}}startingTokenType == JsonTokenType.StartObject{{/isFreeFormObject}}{{^isFreeFormObject}}{{#isMap}}startingTokenType == JsonTokenType.StartObject{{/isMap}}{{^isMap}}{{#isArray}}startingTokenType == JsonTokenType.StartArray{{/isArray}}{{^isArray}}{{#isEnumRef}}isScalarToken{{/isEnumRef}}{{^isEnumRef}}{{#isPrimitiveType}}isScalarToken{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isContainer}}isScalarToken{{/isContainer}}{{^isContainer}}startingTokenType == JsonTokenType.StartObject{{/isContainer}}{{/isPrimitiveType}}{{/isEnumRef}}{{/isArray}}{{/isMap}}{{/isFreeFormObject}})
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Resolved
{
Utf8JsonReader utf8JsonReader{{name}} = utf8JsonReader;
ClientUtils.TryDeserialize<{{{datatypeWithEnum}}}{{nrt?}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}}>(ref utf8JsonReader{{name}}, jsonSerializerOptions, out {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}});
}

{{/vendorExtensions.x-is-union}}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
if ({{#lambda.joinWithAmpersand}}{{^required}}{{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}Option.IsSet {{/required}}{{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{/required}} != null{{/lambda.joinWithAmpersand}})
{
JsonSerializer.Serialize(writer, {{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{/required}}, jsonSerializerOptions);
return;
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
if ({{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}} != null)
{
JsonSerializer.Serialize(writer, {{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}, jsonSerializerOptions);
return;
}

Loading
Loading