Skip to content

Commit ea0a809

Browse files
committed
JSON naming fix
1 parent 5d89557 commit ea0a809

File tree

3 files changed

+46
-67
lines changed

3 files changed

+46
-67
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using System.Text.Json;
2+
3+
namespace Ahk.GradeManagement.Client.Network;
4+
5+
public abstract class ApiClientBase
6+
{
7+
protected static void UpdateJsonSerializerSettings(JsonSerializerOptions settings)
8+
{
9+
settings.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
10+
}
11+
}

src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Network/ApiClients.cs

Lines changed: 32 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public partial interface IAssignmentClient
4949
}
5050

5151
[System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
52-
public partial class AssignmentClient : IAssignmentClient
52+
public partial class AssignmentClient : ApiClientBase, IAssignmentClient
5353
{
5454
private System.Net.Http.HttpClient _httpClient;
5555
private static System.Lazy<System.Text.Json.JsonSerializerOptions> _settings = new System.Lazy<System.Text.Json.JsonSerializerOptions>(CreateSerializerSettings, true);
@@ -70,9 +70,7 @@ private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings()
7070
return settings;
7171
}
7272

73-
protected System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
74-
75-
static partial void UpdateJsonSerializerSettings(System.Text.Json.JsonSerializerOptions settings);
73+
public System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
7674

7775
partial void Initialize();
7876

@@ -439,7 +437,7 @@ public partial interface IAssingmentEventTestClient
439437
}
440438

441439
[System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
442-
public partial class AssingmentEventTestClient : IAssingmentEventTestClient
440+
public partial class AssingmentEventTestClient : ApiClientBase, IAssingmentEventTestClient
443441
{
444442
private System.Net.Http.HttpClient _httpClient;
445443
private static System.Lazy<System.Text.Json.JsonSerializerOptions> _settings = new System.Lazy<System.Text.Json.JsonSerializerOptions>(CreateSerializerSettings, true);
@@ -460,9 +458,7 @@ private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings()
460458
return settings;
461459
}
462460

463-
protected System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
464-
465-
static partial void UpdateJsonSerializerSettings(System.Text.Json.JsonSerializerOptions settings);
461+
public System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
466462

467463
partial void Initialize();
468464

@@ -1016,7 +1012,7 @@ public partial interface ICiEvaluationClient
10161012
}
10171013

10181014
[System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
1019-
public partial class CiEvaluationClient : ICiEvaluationClient
1015+
public partial class CiEvaluationClient : ApiClientBase, ICiEvaluationClient
10201016
{
10211017
private System.Net.Http.HttpClient _httpClient;
10221018
private static System.Lazy<System.Text.Json.JsonSerializerOptions> _settings = new System.Lazy<System.Text.Json.JsonSerializerOptions>(CreateSerializerSettings, true);
@@ -1037,9 +1033,7 @@ private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings()
10371033
return settings;
10381034
}
10391035

1040-
protected System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
1041-
1042-
static partial void UpdateJsonSerializerSettings(System.Text.Json.JsonSerializerOptions settings);
1036+
public System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
10431037

10441038
partial void Initialize();
10451039

@@ -1242,7 +1236,7 @@ public partial interface IConfigClient
12421236
}
12431237

12441238
[System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
1245-
public partial class ConfigClient : IConfigClient
1239+
public partial class ConfigClient : ApiClientBase, IConfigClient
12461240
{
12471241
private System.Net.Http.HttpClient _httpClient;
12481242
private static System.Lazy<System.Text.Json.JsonSerializerOptions> _settings = new System.Lazy<System.Text.Json.JsonSerializerOptions>(CreateSerializerSettings, true);
@@ -1263,9 +1257,7 @@ private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings()
12631257
return settings;
12641258
}
12651259

1266-
protected System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
1267-
1268-
static partial void UpdateJsonSerializerSettings(System.Text.Json.JsonSerializerOptions settings);
1260+
public System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
12691261

12701262
partial void Initialize();
12711263

@@ -1565,7 +1557,7 @@ public partial interface ICourseClient
15651557
}
15661558

15671559
[System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
1568-
public partial class CourseClient : ICourseClient
1560+
public partial class CourseClient : ApiClientBase, ICourseClient
15691561
{
15701562
private System.Net.Http.HttpClient _httpClient;
15711563
private static System.Lazy<System.Text.Json.JsonSerializerOptions> _settings = new System.Lazy<System.Text.Json.JsonSerializerOptions>(CreateSerializerSettings, true);
@@ -1586,9 +1578,7 @@ private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings()
15861578
return settings;
15871579
}
15881580

1589-
protected System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
1590-
1591-
static partial void UpdateJsonSerializerSettings(System.Text.Json.JsonSerializerOptions settings);
1581+
public System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
15921582

15931583
partial void Initialize();
15941584

@@ -2236,7 +2226,7 @@ public partial interface IDashboardClient
22362226
}
22372227

22382228
[System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
2239-
public partial class DashboardClient : IDashboardClient
2229+
public partial class DashboardClient : ApiClientBase, IDashboardClient
22402230
{
22412231
private System.Net.Http.HttpClient _httpClient;
22422232
private static System.Lazy<System.Text.Json.JsonSerializerOptions> _settings = new System.Lazy<System.Text.Json.JsonSerializerOptions>(CreateSerializerSettings, true);
@@ -2257,9 +2247,7 @@ private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings()
22572247
return settings;
22582248
}
22592249

2260-
protected System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
2261-
2262-
static partial void UpdateJsonSerializerSettings(System.Text.Json.JsonSerializerOptions settings);
2250+
public System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
22632251

22642252
partial void Initialize();
22652253

@@ -2485,7 +2473,7 @@ public partial interface IExerciseClient
24852473
}
24862474

24872475
[System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
2488-
public partial class ExerciseClient : IExerciseClient
2476+
public partial class ExerciseClient : ApiClientBase, IExerciseClient
24892477
{
24902478
private System.Net.Http.HttpClient _httpClient;
24912479
private static System.Lazy<System.Text.Json.JsonSerializerOptions> _settings = new System.Lazy<System.Text.Json.JsonSerializerOptions>(CreateSerializerSettings, true);
@@ -2506,9 +2494,7 @@ private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings()
25062494
return settings;
25072495
}
25082496

2509-
protected System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
2510-
2511-
static partial void UpdateJsonSerializerSettings(System.Text.Json.JsonSerializerOptions settings);
2497+
public System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
25122498

25132499
partial void Initialize();
25142500

@@ -3156,7 +3142,7 @@ public partial interface IGitHubAppClient
31563142
}
31573143

31583144
[System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
3159-
public partial class GitHubAppClient : IGitHubAppClient
3145+
public partial class GitHubAppClient : ApiClientBase, IGitHubAppClient
31603146
{
31613147
private System.Net.Http.HttpClient _httpClient;
31623148
private static System.Lazy<System.Text.Json.JsonSerializerOptions> _settings = new System.Lazy<System.Text.Json.JsonSerializerOptions>(CreateSerializerSettings, true);
@@ -3177,9 +3163,7 @@ private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings()
31773163
return settings;
31783164
}
31793165

3180-
protected System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
3181-
3182-
static partial void UpdateJsonSerializerSettings(System.Text.Json.JsonSerializerOptions settings);
3166+
public System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
31833167

31843168
partial void Initialize();
31853169

@@ -3405,7 +3389,7 @@ public partial interface IGroupClient
34053389
}
34063390

34073391
[System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
3408-
public partial class GroupClient : IGroupClient
3392+
public partial class GroupClient : ApiClientBase, IGroupClient
34093393
{
34103394
private System.Net.Http.HttpClient _httpClient;
34113395
private static System.Lazy<System.Text.Json.JsonSerializerOptions> _settings = new System.Lazy<System.Text.Json.JsonSerializerOptions>(CreateSerializerSettings, true);
@@ -3426,9 +3410,7 @@ private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings()
34263410
return settings;
34273411
}
34283412

3429-
protected System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
3430-
3431-
static partial void UpdateJsonSerializerSettings(System.Text.Json.JsonSerializerOptions settings);
3413+
public System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
34323414

34333415
partial void Initialize();
34343416

@@ -4088,7 +4070,7 @@ public partial interface ILanguageClient
40884070
}
40894071

40904072
[System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
4091-
public partial class LanguageClient : ILanguageClient
4073+
public partial class LanguageClient : ApiClientBase, ILanguageClient
40924074
{
40934075
private System.Net.Http.HttpClient _httpClient;
40944076
private static System.Lazy<System.Text.Json.JsonSerializerOptions> _settings = new System.Lazy<System.Text.Json.JsonSerializerOptions>(CreateSerializerSettings, true);
@@ -4109,9 +4091,7 @@ private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings()
41094091
return settings;
41104092
}
41114093

4112-
protected System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
4113-
4114-
static partial void UpdateJsonSerializerSettings(System.Text.Json.JsonSerializerOptions settings);
4094+
public System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
41154095

41164096
partial void Initialize();
41174097

@@ -4536,7 +4516,7 @@ public partial interface IMoodleIntegrationClient
45364516
}
45374517

45384518
[System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
4539-
public partial class MoodleIntegrationClient : IMoodleIntegrationClient
4519+
public partial class MoodleIntegrationClient : ApiClientBase, IMoodleIntegrationClient
45404520
{
45414521
private System.Net.Http.HttpClient _httpClient;
45424522
private static System.Lazy<System.Text.Json.JsonSerializerOptions> _settings = new System.Lazy<System.Text.Json.JsonSerializerOptions>(CreateSerializerSettings, true);
@@ -4557,9 +4537,7 @@ private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings()
45574537
return settings;
45584538
}
45594539

4560-
protected System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
4561-
4562-
static partial void UpdateJsonSerializerSettings(System.Text.Json.JsonSerializerOptions settings);
4540+
public System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
45634541

45644542
partial void Initialize();
45654543

@@ -4893,7 +4871,7 @@ public partial interface IPullRequestClient
48934871
}
48944872

48954873
[System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
4896-
public partial class PullRequestClient : IPullRequestClient
4874+
public partial class PullRequestClient : ApiClientBase, IPullRequestClient
48974875
{
48984876
private System.Net.Http.HttpClient _httpClient;
48994877
private static System.Lazy<System.Text.Json.JsonSerializerOptions> _settings = new System.Lazy<System.Text.Json.JsonSerializerOptions>(CreateSerializerSettings, true);
@@ -4914,9 +4892,7 @@ private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings()
49144892
return settings;
49154893
}
49164894

4917-
protected System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
4918-
4919-
static partial void UpdateJsonSerializerSettings(System.Text.Json.JsonSerializerOptions settings);
4895+
public System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
49204896

49214897
partial void Initialize();
49224898

@@ -5131,7 +5107,7 @@ public partial interface ISemesterClient
51315107
}
51325108

51335109
[System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
5134-
public partial class SemesterClient : ISemesterClient
5110+
public partial class SemesterClient : ApiClientBase, ISemesterClient
51355111
{
51365112
private System.Net.Http.HttpClient _httpClient;
51375113
private static System.Lazy<System.Text.Json.JsonSerializerOptions> _settings = new System.Lazy<System.Text.Json.JsonSerializerOptions>(CreateSerializerSettings, true);
@@ -5152,9 +5128,7 @@ private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings()
51525128
return settings;
51535129
}
51545130

5155-
protected System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
5156-
5157-
static partial void UpdateJsonSerializerSettings(System.Text.Json.JsonSerializerOptions settings);
5131+
public System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
51585132

51595133
partial void Initialize();
51605134

@@ -5587,7 +5561,7 @@ public partial interface IStudentClient
55875561
}
55885562

55895563
[System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
5590-
public partial class StudentClient : IStudentClient
5564+
public partial class StudentClient : ApiClientBase, IStudentClient
55915565
{
55925566
private System.Net.Http.HttpClient _httpClient;
55935567
private static System.Lazy<System.Text.Json.JsonSerializerOptions> _settings = new System.Lazy<System.Text.Json.JsonSerializerOptions>(CreateSerializerSettings, true);
@@ -5608,9 +5582,7 @@ private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings()
56085582
return settings;
56095583
}
56105584

5611-
protected System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
5612-
5613-
static partial void UpdateJsonSerializerSettings(System.Text.Json.JsonSerializerOptions settings);
5585+
public System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
56145586

56155587
partial void Initialize();
56165588

@@ -6141,7 +6113,7 @@ public partial interface ISubjectClient
61416113
}
61426114

61436115
[System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
6144-
public partial class SubjectClient : ISubjectClient
6116+
public partial class SubjectClient : ApiClientBase, ISubjectClient
61456117
{
61466118
private System.Net.Http.HttpClient _httpClient;
61476119
private static System.Lazy<System.Text.Json.JsonSerializerOptions> _settings = new System.Lazy<System.Text.Json.JsonSerializerOptions>(CreateSerializerSettings, true);
@@ -6162,9 +6134,7 @@ private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings()
61626134
return settings;
61636135
}
61646136

6165-
protected System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
6166-
6167-
static partial void UpdateJsonSerializerSettings(System.Text.Json.JsonSerializerOptions settings);
6137+
public System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
61686138

61696139
partial void Initialize();
61706140

@@ -6997,7 +6967,7 @@ public partial interface IUserClient
69976967
}
69986968

69996969
[System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
7000-
public partial class UserClient : IUserClient
6970+
public partial class UserClient : ApiClientBase, IUserClient
70016971
{
70026972
private System.Net.Http.HttpClient _httpClient;
70036973
private static System.Lazy<System.Text.Json.JsonSerializerOptions> _settings = new System.Lazy<System.Text.Json.JsonSerializerOptions>(CreateSerializerSettings, true);
@@ -7018,9 +6988,7 @@ private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings()
70186988
return settings;
70196989
}
70206990

7021-
protected System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
7022-
7023-
static partial void UpdateJsonSerializerSettings(System.Text.Json.JsonSerializerOptions settings);
6991+
public System.Text.Json.JsonSerializerOptions JsonSerializerSettings { get { return _instanceSettings ?? _settings.Value; } }
70246992

70256993
partial void Initialize();
70266994

src/Ahk.GradeManagement/Ahk.GradeManagement.Client/Network/ApiClients.nswag

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"codeGenerators": {
6060
"openApiToCSharpClient": {
6161
"JsonLibrary": "SystemTextJson",
62-
"clientBaseClass": null,
62+
"clientBaseClass": "ApiClientBase",
6363
"configurationClass": null,
6464
"generateClientClasses": true,
6565
"generateClientInterfaces": true,
@@ -76,15 +76,15 @@
7676
"useBaseUrl": false,
7777
"generateBaseUrlProperty": true,
7878
"generateSyncMethods": false,
79-
"exposeJsonSerializerSettings": false,
79+
"exposeJsonSerializerSettings": true,
8080
"clientClassAccessModifier": "public",
8181
"typeAccessModifier": "public",
8282
"generateContractsOutput": false,
8383
"contractsNamespace": null,
8484
"contractsOutputFilePath": null,
8585
"parameterDateTimeFormat": "s",
8686
"parameterDateFormat": "yyyy-MM-dd",
87-
"generateUpdateJsonSerializerSettingsMethod": true,
87+
"generateUpdateJsonSerializerSettingsMethod": false,
8888
"useRequestAndResponseSerializationSettings": false,
8989
"serializeTypeInformation": false,
9090
"queryNullValue": "",

0 commit comments

Comments
 (0)