Skip to content

Commit e0a82ad

Browse files
devhl-labsdevhl-labs
committed
resolved conflicts
2 parents cf1e31f + f6de5b7 commit e0a82ad

113 files changed

Lines changed: 3776 additions & 1172 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/samples-dotnet9.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
sample:
26+
- samples/client/petstore/csharp/generichost/latest/ComposedEnum
2627
- samples/client/petstore/csharp/generichost/latest/Tags
2728
- samples/client/petstore/csharp/generichost/latest/HelloWorld
2829
- samples/client/petstore/csharp/generichost/latest/OneOfList

‎appveyor.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ build_script:
4343
#- dotnet build samples\client\petstore\csharp\OpenAPIClient-ConditionalSerialization\Org.OpenAPITools.sln
4444

4545
test_script:
46+
- dotnet test samples\client\petstore\csharp\generichost\latest\ComposedEnum\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
4647
- dotnet test samples\client\petstore\csharp\generichost\latest\Tags\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
4748
- dotnet test samples\client\petstore\csharp\generichost\latest\HelloWorld\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
4849
- dotnet test samples\client\petstore\csharp\generichost\latest\OneOfList\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj

‎bin/configs/csharp-generichost-latest-composedEnum.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# for csharp generichost
2+
generatorName: csharp
3+
outputDir: samples/client/petstore/csharp/generichost/latest/ComposedEnum
4+
inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/composed-enum.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/csharp
6+
additionalProperties:
7+
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
8+
modelPropertySorting: alphabetical
9+
operationParameterSorting: alphabetical
10+
validateSpec: false

‎modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,7 @@
398398
{{^isPrimitiveType}}
399399
{
400400
{{datatypeWithEnum}}JsonConverter {{datatypeWithEnum}}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()));
401-
{{datatypeWithEnum}}JsonConverter.Write{{^isEnumRef}}Properties{{/isEnumRef}}(writer, {{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{#isNullable}}.Value{{/isNullable}}{{/required}}, jsonSerializerOptions); // isEnumRef: {{isEnumRef}} x-is-reference-type: {{vendorExtensions.x-is-reference-type}} isNullable: {{isNullable}}
402-
{{! what if it is an inner enum? }}
401+
{{datatypeWithEnum}}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);
403402
}
404403
{{/isPrimitiveType}}
405404

‎modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
{{^composedSchemas.anyOf}}
6363
[JsonConstructor]
6464
{{/composedSchemas.anyOf}}
65-
{{#model.vendorExtensions.x-model-is-mutable}}{{>visibility}}{{/model.vendorExtensions.x-model-is-mutable}}{{^model.vendorExtensions.x-model-is-mutable}}internal{{/model.vendorExtensions.x-model-is-mutable}} {{classname}}(/**b**/{{#lambda.joinWithComma}}{{#composedSchemas.anyOf}}{{^required}}Option<{{/required}}{{{datatypeWithEnum}}}/**{{dataType}}**/{{>NullConditionalProperty}}{{^required}}>{{/required}} {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}} {{/composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}}
65+
{{#model.vendorExtensions.x-model-is-mutable}}{{>visibility}}{{/model.vendorExtensions.x-model-is-mutable}}{{^model.vendorExtensions.x-model-is-mutable}}internal{{/model.vendorExtensions.x-model-is-mutable}} {{classname}}({{#lambda.joinWithComma}}{{#composedSchemas.anyOf}}{{^required}}Option<{{/required}}{{{datatypeWithEnum}}}{{>NullConditionalProperty}}{{^required}}>{{/required}} {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}} {{/composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}}
6666
{
6767
{{#composedSchemas.anyOf}}
6868
{{#lambda.titlecase}}{{name}}{{/lambda.titlecase}}{{^required}}Option{{/required}} = {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}};

‎modules/openapi-generator/src/main/resources/rust-axum/server-operation.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ let result = api_impl.as_ref().{{#vendorExtensions}}{{{x-operation-id}}}{{/vendo
356356
let mut response_headers = response.headers_mut().unwrap();
357357
response_headers.insert(
358358
CONTENT_TYPE,
359-
HeaderValue::from_str("{{{x-mime-type}}}").map_err(|e| { error!(error = ?e); StatusCode::INTERNAL_SERVER_ERROR })?);
359+
HeaderValue::from_static("{{{x-mime-type}}}"));
360360
}
361361

362362
{{/vendorExtensions}}

‎modules/openapi-generator/src/main/resources/rust-server-deprecated/client-request-body-instance.mustache‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,7 @@
6464
*request.body_mut() = Body::from(body.into_bytes());
6565

6666
let header = "{{#consumes}}{{#-first}}{{{mediaType}}}{{/-first}}{{/consumes}}{{^consumes}}application/json{{/consumes}}";
67-
request.headers_mut().insert(CONTENT_TYPE, match HeaderValue::from_str(header) {
68-
Ok(h) => h,
69-
Err(e) => return Err(ApiError(format!("Unable to create header: {header} - {e}")))
70-
});
67+
request.headers_mut().insert(CONTENT_TYPE, HeaderValue::from_static(header));
7168
{{/-last}}
7269
{{/formParams}}
7370
{{/x-consumes-form}}
@@ -101,10 +98,7 @@
10198
{{/required}}
10299

103100
let header = "{{#consumes}}{{#-first}}{{{mediaType}}}{{/-first}}{{/consumes}}{{^consumes}}application/json{{/consumes}}";
104-
request.headers_mut().insert(CONTENT_TYPE, match HeaderValue::from_str(header) {
105-
Ok(h) => h,
106-
Err(e) => return Err(ApiError(format!("Unable to create header: {header} - {e}")))
107-
});
101+
request.headers_mut().insert(CONTENT_TYPE, HeaderValue::from_static(header));
108102
{{/bodyParam}}
109103
{{/x-consumes-basic}}
110104
{{/vendorExtensions}}

‎modules/openapi-generator/src/main/resources/rust-server-deprecated/server-response-body-instance.mustache‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
{{^x-produces-multipart-related}}
44
response.headers_mut().insert(
55
CONTENT_TYPE,
6-
HeaderValue::from_str("{{{x-mime-type}}}")
7-
.expect("Unable to create Content-Type header for {{{x-mime-type}}}"));
6+
HeaderValue::from_static("{{{x-mime-type}}}"));
87
{{/x-produces-multipart-related}}
98
{{#x-produces-xml}}
109
// XML Body

‎modules/openapi-generator/src/main/resources/rust-server/client-request-body-instance.mustache‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,7 @@
6666
*request.body_mut() = body_from_string(body);
6767

6868
let header = "{{#consumes}}{{#-first}}{{{mediaType}}}{{/-first}}{{/consumes}}{{^consumes}}application/json{{/consumes}}";
69-
request.headers_mut().insert(CONTENT_TYPE, match HeaderValue::from_str(header) {
70-
Ok(h) => h,
71-
Err(e) => return Err(ApiError(format!("Unable to create header: {header} - {e}")))
72-
});
69+
request.headers_mut().insert(CONTENT_TYPE, HeaderValue::from_static(header));
7370
{{/-last}}
7471
{{/formParams}}
7572
{{/x-consumes-form}}
@@ -103,10 +100,7 @@
103100
{{/required}}
104101

105102
let header = "{{#consumes}}{{#-first}}{{{mediaType}}}{{/-first}}{{/consumes}}{{^consumes}}application/json{{/consumes}}";
106-
request.headers_mut().insert(CONTENT_TYPE, match HeaderValue::from_str(header) {
107-
Ok(h) => h,
108-
Err(e) => return Err(ApiError(format!("Unable to create header: {header} - {e}")))
109-
});
103+
request.headers_mut().insert(CONTENT_TYPE, HeaderValue::from_static(header));
110104
{{/bodyParam}}
111105
{{/x-consumes-basic}}
112106
{{/vendorExtensions}}

‎modules/openapi-generator/src/main/resources/rust-server/server-response-body-instance.mustache‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
{{^x-produces-multipart-related}}
44
response.headers_mut().insert(
55
CONTENT_TYPE,
6-
HeaderValue::from_str("{{{x-mime-type}}}")
7-
.expect("Unable to create Content-Type header for {{{x-mime-type}}}"));
6+
HeaderValue::from_static("{{{x-mime-type}}}"));
87
{{/x-produces-multipart-related}}
98
{{#x-produces-xml}}
109
// XML Body

0 commit comments

Comments
 (0)