Skip to content

Commit c838b1d

Browse files
devhl-labsdevhl-labs
authored
made default strings use string literal (#15049)
1 parent 0dc8452 commit c838b1d

133 files changed

Lines changed: 2885 additions & 82 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.

‎modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ namespace {{packageName}}.Client
145145
{
146146
"{{{name}}}", new Dictionary<string, object> {
147147
{"description", "{{{description}}}{{^description}}No description provided{{/description}}"},
148-
{"default_value", "{{{defaultValue}}}"},
148+
{"default_value", {{#isString}}{{^isEnum}}@{{/isEnum}}{{/isString}}"{{{defaultValue}}}"},
149149
{{#enumValues}}
150150
{{#-first}}
151151
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{#model.allVars}}{{>PropertyDataType}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#defaultValue}} = {{^isDateTime}}{{{defaultValue}}}{{/isDateTime}}{{#isDateTime}}default{{/isDateTime}}{{/defaultValue}}{{^defaultValue}}{{#isNullable}} = default{{/isNullable}}{{/defaultValue}} {{/model.allVars}}
1+
{{#model.allVars}}{{>PropertyDataType}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#defaultValue}} = {{^isDateTime}}{{#isString}}{{^isEnum}}@{{/isEnum}}{{/isString}}{{{defaultValue}}}{{/isDateTime}}{{#isDateTime}}default{{/isDateTime}}{{/defaultValue}}{{^defaultValue}}{{#isNullable}} = default{{/isNullable}}{{/defaultValue}} {{/model.allVars}}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
{{#hasOnlyReadOnly}}
135135
[JsonConstructorAttribute]
136136
{{/hasOnlyReadOnly}}
137-
public {{classname}}({{#readWriteVars}}{{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}}{{/isEnum}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{#defaultValue}}{{^isDateTime}}{{{defaultValue}}}{{/isDateTime}}{{#isDateTime}}default({{{datatypeWithEnum}}}){{/isDateTime}}{{/defaultValue}}{{^defaultValue}}default({{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}}{{/isEnum}}){{/defaultValue}}{{^-last}}, {{/-last}}{{/readWriteVars}}){{#parent}} : base({{#parentVars}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{^-last}}, {{/-last}}{{/parentVars}}){{/parent}}
137+
public {{classname}}({{#readWriteVars}}{{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}}{{/isEnum}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{#defaultValue}}{{^isDateTime}}{{#isString}}{{^isEnum}}@{{/isEnum}}{{/isString}}{{{defaultValue}}}{{/isDateTime}}{{#isDateTime}}default({{{datatypeWithEnum}}}){{/isDateTime}}{{/defaultValue}}{{^defaultValue}}default({{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}}{{/isEnum}}){{/defaultValue}}{{^-last}}, {{/-last}}{{/readWriteVars}}){{#parent}} : base({{#parentVars}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{^-last}}, {{/-last}}{{/parentVars}}){{/parent}}
138138
{
139139
{{#vars}}
140140
{{^isInherited}}
@@ -178,7 +178,7 @@
178178
{{^conditionalSerialization}}
179179
{{^vendorExtensions.x-csharp-value-type}}
180180
// use default value if no "{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}" provided
181-
this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} ?? {{{defaultValue}}};
181+
this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} ?? {{#isString}}@{{/isString}}{{{defaultValue}}};
182182
{{/vendorExtensions.x-csharp-value-type}}
183183
{{#vendorExtensions.x-csharp-value-type}}
184184
this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}};

‎modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2259,4 +2259,13 @@ components:
22592259
type: object
22602260
properties:
22612261
value:
2262-
type: string
2262+
type: string
2263+
LiteralStringClass:
2264+
type: object
2265+
properties:
2266+
escapedLiteralString:
2267+
type: string
2268+
default: C:\\Users\\username
2269+
unescapedLiteralString:
2270+
type: string
2271+
default: C:\Users\username

‎samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ docs/HasOnlyReadOnly.md
5151
docs/HealthCheckResult.md
5252
docs/IsoscelesTriangle.md
5353
docs/List.md
54+
docs/LiteralStringClass.md
5455
docs/Mammal.md
5556
docs/MapTest.md
5657
docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -167,6 +168,7 @@ src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
167168
src/Org.OpenAPITools/Model/HealthCheckResult.cs
168169
src/Org.OpenAPITools/Model/IsoscelesTriangle.cs
169170
src/Org.OpenAPITools/Model/List.cs
171+
src/Org.OpenAPITools/Model/LiteralStringClass.cs
170172
src/Org.OpenAPITools/Model/Mammal.cs
171173
src/Org.OpenAPITools/Model/MapTest.cs
172174
src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs

‎samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ Class | Method | HTTP request | Description
193193
- [Model.HealthCheckResult](docs/HealthCheckResult.md)
194194
- [Model.IsoscelesTriangle](docs/IsoscelesTriangle.md)
195195
- [Model.List](docs/List.md)
196+
- [Model.LiteralStringClass](docs/LiteralStringClass.md)
196197
- [Model.Mammal](docs/Mammal.md)
197198
- [Model.MapTest](docs/MapTest.md)
198199
- [Model.MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)

‎samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2186,6 +2186,15 @@ components:
21862186
value:
21872187
type: string
21882188
type: object
2189+
LiteralStringClass:
2190+
properties:
2191+
escapedLiteralString:
2192+
default: C:\\Users\\username
2193+
type: string
2194+
unescapedLiteralString:
2195+
default: C:\Users\username
2196+
type: string
2197+
type: object
21892198
_foo_get_default_response:
21902199
example:
21912200
string:

‎samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/LiteralStringClass.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Org.OpenAPITools.Model.LiteralStringClass
2+
3+
## Properties
4+
5+
Name | Type | Description | Notes
6+
------------ | ------------- | ------------- | -------------
7+
**EscapedLiteralString** | **string** | | [optional] [default to "C:\\Users\\username"]
8+
**UnescapedLiteralString** | **string** | | [optional] [default to "C:\Users\username"]
9+
10+
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
11+

‎samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
/*
2+
* OpenAPI Petstore
3+
*
4+
* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
5+
*
6+
* The version of the OpenAPI document: 1.0.0
7+
* Generated by: https://github.com/openapitools/openapi-generator.git
8+
*/
9+
10+
11+
using Xunit;
12+
13+
using System;
14+
using System.Linq;
15+
using System.IO;
16+
using System.Collections.Generic;
17+
using Org.OpenAPITools.Model;
18+
using Org.OpenAPITools.Client;
19+
using System.Reflection;
20+
using Newtonsoft.Json;
21+
22+
namespace Org.OpenAPITools.Test.Model
23+
{
24+
/// <summary>
25+
/// Class for testing LiteralStringClass
26+
/// </summary>
27+
/// <remarks>
28+
/// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
29+
/// Please update the test case below to test the model.
30+
/// </remarks>
31+
public class LiteralStringClassTests : IDisposable
32+
{
33+
// TODO uncomment below to declare an instance variable for LiteralStringClass
34+
//private LiteralStringClass instance;
35+
36+
public LiteralStringClassTests()
37+
{
38+
// TODO uncomment below to create an instance of LiteralStringClass
39+
//instance = new LiteralStringClass();
40+
}
41+
42+
public void Dispose()
43+
{
44+
// Cleanup when everything is done.
45+
}
46+
47+
/// <summary>
48+
/// Test an instance of LiteralStringClass
49+
/// </summary>
50+
[Fact]
51+
public void LiteralStringClassInstanceTest()
52+
{
53+
// TODO uncomment below to test "IsType" LiteralStringClass
54+
//Assert.IsType<LiteralStringClass>(instance);
55+
}
56+
57+
58+
/// <summary>
59+
/// Test the property 'EscapedLiteralString'
60+
/// </summary>
61+
[Fact]
62+
public void EscapedLiteralStringTest()
63+
{
64+
// TODO unit test for the property 'EscapedLiteralString'
65+
}
66+
/// <summary>
67+
/// Test the property 'UnescapedLiteralString'
68+
/// </summary>
69+
[Fact]
70+
public void UnescapedLiteralStringTest()
71+
{
72+
// TODO unit test for the property 'UnescapedLiteralString'
73+
}
74+
75+
}
76+
77+
}

‎samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Animal.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected Animal()
4949
/// </summary>
5050
/// <param name="className">className (required).</param>
5151
/// <param name="color">color (default to &quot;red&quot;).</param>
52-
public Animal(string className = default(string), string color = "red")
52+
public Animal(string className = default(string), string color = @"red")
5353
{
5454
// to ensure "className" is required (not null)
5555
if (className == null)

0 commit comments

Comments
 (0)