Skip to content

Commit 68a817a

Browse files
committed
Revert adding HttpOperationException
1 parent 9d42e7d commit 68a817a

3 files changed

Lines changed: 15 additions & 22 deletions

File tree

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
{{/nrt}}
77
using System;
8-
using System.Net.Http;
98

109
namespace {{packageName}}.{{clientPackage}}
1110
{
@@ -44,20 +43,4 @@ namespace {{packageName}}.{{clientPackage}}
4443
RawContent = rawContent;
4544
}
4645
}
47-
48-
/// <summary>
49-
/// Http Operation Exception
50-
/// </summary>
51-
{{>visibility}} class HttpOperationException : Exception
52-
{
53-
{{>visibility}} HttpRequestMessage Request { get; }
54-
{{>visibility}} HttpResponseMessage Response { get; }
55-
56-
{{>visibility}} HttpOperationException(HttpRequestMessage request, HttpResponseMessage response, string message)
57-
: base(message)
58-
{
59-
Request = request;
60-
Response = response;
61-
}
62-
}
6346
}

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ using {{packageName}}.{{modelPackage}};
3232
using System.Diagnostics.CodeAnalysis;
3333
{{/netStandard}}
3434
using {{packageName}}.{{package}};
35+
// DNV customization: Todo: Microsoft.Rest will be removed
36+
using Microsoft.Rest;
3537

3638
namespace {{packageName}}.{{package}}
3739
{
@@ -658,6 +660,13 @@ namespace {{packageName}}
658660

659661
DateTime requestedAtLocalVar = DateTime.UtcNow;
660662

663+
// DNV customization: Save request and response
664+
string requestContentLocalVar = string.Empty;
665+
if (httpRequestMessageLocalVar.Content != null)
666+
{
667+
requestContentLocalVar = await httpRequestMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false);
668+
httpRequestMessageLocalVar.Content = new StringContent(requestContentLocalVar, System.Text.Encoding.UTF8, "application/json");
669+
}
661670
using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false))
662671
{
663672
string responseContentLocalVar = string.Empty;
@@ -666,7 +675,11 @@ namespace {{packageName}}
666675
}
667676
if (!httpResponseMessageLocalVar.IsSuccessStatusCode)
668677
{
669-
throw new HttpOperationException(httpRequestMessageLocalVar, httpResponseMessageLocalVar, string.Format("Operation returned an invalid status code '{0}'", httpResponseMessageLocalVar.StatusCode));
678+
throw new HttpOperationException(string.Format("Operation returned an invalid status code '{0}'", httpResponseMessageLocalVar.StatusCode))
679+
{
680+
Request = new HttpRequestMessageWrapper(httpRequestMessageLocalVar, requestContentLocalVar),
681+
Response = new HttpResponseMessageWrapper(httpResponseMessageLocalVar, responseContentLocalVar)
682+
};
670683
}
671684

672685
ILogger<{{#vendorExtensions.x-duplicates}}{{.}}.{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse> apiResponseLoggerLocalVar = LoggerFactory.CreateLogger<{{#vendorExtensions.x-duplicates}}{{.}}.{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse>();

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,6 @@
101101
{{/isDiscriminator}}
102102
{{/allVars}}
103103
/// <param name="dummy">dummy to avoid duplicated ctors</param>
104-
{{^composedSchemas.anyOf}}
105-
[JsonConstructor]
106-
{{/composedSchemas.anyOf}}
107104
{{#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}}{{{baseType}}}{{>NullConditionalProperty}} {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}} {{/composedSchemas.anyOf}}{{#model.allVars}}{{^isDiscriminator}}{{{datatypeWithEnum}}}{{>NullConditionalProperty}} {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}} {{/isDiscriminator}}{{/model.allVars}}{{/lambda.joinWithComma}}, bool dummy = true){{#parent}} : base({{#lambda.joinWithComma}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}}
108105
{
109106
{{#composedSchemas.anyOf}}
@@ -112,7 +109,7 @@
112109
{{#allVars}}
113110
{{^isDiscriminator}}
114111
{{^isInherited}}
115-
{{name}} = {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}};
112+
{{name}}{{#isReadOnly}}{{^required}}Option{{/required}}{{/isReadOnly}} = {{#isReadOnly}}{{^required}}new({{/required}}{{/isReadOnly}}{{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}}{{#isReadOnly}}{{^required}}){{/required}}{{/isReadOnly}};
116113
{{/isInherited}}
117114
{{#isInherited}}
118115
{{#isNew}}

0 commit comments

Comments
 (0)