[csharp-netore][generichost] Renamed ToModel to AsModel (#15662)

* renamed ToModel to AsModel * build samples again
OpenAPITools · May 28, 2023 · 29223e0 · 29223e0
1 parent 9e8805d
commit 29223e0
Show file tree

Hide file tree

Showing 40 changed files with 96 additions and 96 deletions.
diff --git a/...-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiResponse`1.mustache b/...-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiResponse`1.mustache
@@ -110,9 +110,9 @@ namespace {{packageName}}.{{clientPackage}}
         /// <summary>
         /// Deserializes the server's response
         /// </summary>
-        public T{{nrt?}} ToModel(System.Text.Json.JsonSerializerOptions{{nrt?}} options = null)
+        public T{{nrt?}} AsModel(System.Text.Json.JsonSerializerOptions{{nrt?}} options = null)
         {
-{{>ToModel}}
+{{>AsModel}}
         }
 
         /// <summary>
@@ -122,7 +122,7 @@ namespace {{packageName}}.{{clientPackage}}
         {
             try
             {
-                model = ToModel(options);
+                model = AsModel(options);
                 return model != null;
             }
             catch

diff --git a/...re/libraries/generichost/ToModel.mustache → ...re/libraries/generichost/AsModel.mustache b/...re/libraries/generichost/ToModel.mustache → ...re/libraries/generichost/AsModel.mustache
@@ -1,4 +1,4 @@
-            // This logic may be modified with the ToModel.mustache template
+            // This logic may be modified with the AsModel.mustache template
             return IsSuccessStatusCode
                 ? System.Text.Json.JsonSerializer.Deserialize<T>(RawContent, options ?? _jsonSerializerOptions)
                 : default(T);
diff --git a/...-generator/src/main/resources/csharp-netcore/libraries/generichost/README.client.mustache b/...-generator/src/main/resources/csharp-netcore/libraries/generichost/README.client.mustache
@@ -67,7 +67,7 @@ namespace YourProject
             {{#operation}}
             {{#-first}}
             ApiResponse<{{#returnType}}{{{.}}}{{/returnType}}{{^returnType}}object{{/returnType}}> response = await api.{{operationId}}Async("todo");
-            {{#returnType}}{{{.}}}{{/returnType}}{{^returnType}}object{{/returnType}} model = response.ToModel();
+            {{#returnType}}{{{.}}}{{/returnType}}{{^returnType}}object{{/returnType}} model = response.AsModel();
             {{/-first}}
             {{/operation}}
             {{/-first}}

diff --git a/...enapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api_test.mustache b/...enapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api_test.mustache
@@ -39,7 +39,7 @@ namespace {{packageName}}.Test.{{apiPackage}}
             {{/allParams}}
             {{#returnType}}
             var response = await _instance.{{operationId}}Async({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}});
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<{{{.}}}>(model);
             {{/returnType}}
             {{^returnType}}

diff --git a/...OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/...OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
         {
             ModelClient modelClient = default;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<ModelClient>(model);
         }
     }

diff --git a/...ore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/...ore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public DefaultApiTests(): base(Array.Empty<string>())
         public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<FooGetDefaultResponse>(model);
         }
 
@@ -79,7 +79,7 @@ public async Task GetCountryAsyncTest()
         public async Task HelloAsyncTest()
         {
             var response = await _instance.HelloAsync();
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<List<Guid>>(model);
         }
     }

diff --git a/...etcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/...etcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public FakeApiTests(): base(Array.Empty<string>())
         public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<HealthCheckResult>(model);
         }
 
@@ -70,7 +70,7 @@ public async Task FakeOuterBooleanSerializeAsyncTest()
         {
             bool? body = default;
             var response = await _instance.FakeOuterBooleanSerializeAsync(body);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<bool>(model);
         }
 
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
         {
             OuterComposite? outerComposite = default;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<OuterComposite>(model);
         }
 
@@ -94,7 +94,7 @@ public async Task FakeOuterNumberSerializeAsyncTest()
         {
             decimal? body = default;
             var response = await _instance.FakeOuterNumberSerializeAsync(body);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<decimal>(model);
         }
 
@@ -107,7 +107,7 @@ public async Task FakeOuterStringSerializeAsyncTest()
             Guid requiredStringUuid = default;
             string? body = default;
             var response = await _instance.FakeOuterStringSerializeAsync(requiredStringUuid, body);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<string>(model);
         }
 
@@ -118,7 +118,7 @@ public async Task FakeOuterStringSerializeAsyncTest()
         public async Task GetArrayOfEnumsAsyncTest()
         {
             var response = await _instance.GetArrayOfEnumsAsync();
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<List<OuterEnum>>(model);
         }
 
@@ -151,7 +151,7 @@ public async Task TestClientModelAsyncTest()
         {
             ModelClient modelClient = default;
             var response = await _instance.TestClientModelAsync(modelClient);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<ModelClient>(model);
         }
 

diff --git a/...ient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/...ient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
         {
             ModelClient modelClient = default;
             var response = await _instance.TestClassnameAsync(modelClient);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<ModelClient>(model);
         }
     }

diff --git a/...netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/...netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -80,7 +80,7 @@ public async Task FindPetsByStatusAsyncTest()
         {
             List<string> status = default;
             var response = await _instance.FindPetsByStatusAsync(status);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<List<Pet>>(model);
         }
 
@@ -92,7 +92,7 @@ public async Task FindPetsByTagsAsyncTest()
         {
             List<string> tags = default;
             var response = await _instance.FindPetsByTagsAsync(tags);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<List<Pet>>(model);
         }
 
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
         {
             long petId = default;
             var response = await _instance.GetPetByIdAsync(petId);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<Pet>(model);
         }
 
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             System.IO.Stream? file = default;
             string? additionalMetadata = default;
             var response = await _instance.UploadFileAsync(petId, file, additionalMetadata);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<ApiResponse>(model);
         }
 
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             long petId = default;
             string? additionalMetadata = default;
             var response = await _instance.UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<ApiResponse>(model);
         }
     }

diff --git a/...tcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/...tcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task DeleteOrderAsyncTest()
         public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<Dictionary<string, int>>(model);
         }
 
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
         {
             long orderId = default;
             var response = await _instance.GetOrderByIdAsync(orderId);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<Order>(model);
         }
 
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
         {
             Order order = default;
             var response = await _instance.PlaceOrderAsync(order);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<Order>(model);
         }
     }

diff --git a/...etcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/...etcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
         {
             string username = default;
             var response = await _instance.GetUserByNameAsync(username);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<User>(model);
         }
 
@@ -112,7 +112,7 @@ public async Task LoginUserAsyncTest()
             string username = default;
             string password = default;
             var response = await _instance.LoginUserAsync(username, password);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<string>(model);
         }
 

diff --git a/...netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/...netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponse`1.cs
@@ -116,9 +116,9 @@ public ApiResponse(System.Net.Http.HttpRequestMessage httpRequestMessage, System
         /// <summary>
         /// Deserializes the server's response
         /// </summary>
-        public T? ToModel(System.Text.Json.JsonSerializerOptions? options = null)
+        public T? AsModel(System.Text.Json.JsonSerializerOptions? options = null)
         {
-            // This logic may be modified with the ToModel.mustache template
+            // This logic may be modified with the AsModel.mustache template
             return IsSuccessStatusCode
                 ? System.Text.Json.JsonSerializer.Deserialize<T>(RawContent, options ?? _jsonSerializerOptions)
                 : default(T);
@@ -131,7 +131,7 @@ public bool TryToModel([NotNullWhen(true)] out T? model, System.Text.Json.JsonSe
         {
             try
             {
-                model = ToModel(options);
+                model = AsModel(options);
                 return model != null;
             }
             catch

diff --git a/...arp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/README.md b/...arp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/README.md
@@ -62,7 +62,7 @@ namespace YourProject
             var host = CreateHostBuilder(args).Build();
             var api = host.Services.GetRequiredService<IAnotherFakeApi>();
             ApiResponse<ModelClient> response = await api.Call123TestSpecialTagsAsync("todo");
-            ModelClient model = response.ToModel();
+            ModelClient model = response.AsModel();
         }
 
         public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args)

diff --git a/...ore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/...ore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
         {
             ModelClient modelClient = default;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<ModelClient>(model);
         }
     }

diff --git a/...netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/...netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public DefaultApiTests(): base(Array.Empty<string>())
         public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<FooGetDefaultResponse>(model);
         }
 
@@ -79,7 +79,7 @@ public async Task GetCountryAsyncTest()
         public async Task HelloAsyncTest()
         {
             var response = await _instance.HelloAsync();
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<List<Guid>>(model);
         }
     }

diff --git a/...rp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/...rp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public FakeApiTests(): base(Array.Empty<string>())
         public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<HealthCheckResult>(model);
         }
 
@@ -70,7 +70,7 @@ public async Task FakeOuterBooleanSerializeAsyncTest()
         {
             bool? body = default;
             var response = await _instance.FakeOuterBooleanSerializeAsync(body);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<bool>(model);
         }
 
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
         {
             OuterComposite outerComposite = default;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<OuterComposite>(model);
         }
 
@@ -94,7 +94,7 @@ public async Task FakeOuterNumberSerializeAsyncTest()
         {
             decimal? body = default;
             var response = await _instance.FakeOuterNumberSerializeAsync(body);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<decimal>(model);
         }
 
@@ -107,7 +107,7 @@ public async Task FakeOuterStringSerializeAsyncTest()
             Guid requiredStringUuid = default;
             string body = default;
             var response = await _instance.FakeOuterStringSerializeAsync(requiredStringUuid, body);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<string>(model);
         }
 
@@ -118,7 +118,7 @@ public async Task FakeOuterStringSerializeAsyncTest()
         public async Task GetArrayOfEnumsAsyncTest()
         {
             var response = await _instance.GetArrayOfEnumsAsync();
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<List<OuterEnum>>(model);
         }
 
@@ -151,7 +151,7 @@ public async Task TestClientModelAsyncTest()
         {
             ModelClient modelClient = default;
             var response = await _instance.TestClientModelAsync(modelClient);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<ModelClient>(model);
         }
 

diff --git a/...PIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/...PIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
         {
             ModelClient modelClient = default;
             var response = await _instance.TestClassnameAsync(modelClient);
-            var model = response.ToModel();
+            var model = response.AsModel();
             Assert.IsType<ModelClient>(model);
         }
     }