[Refactoring] Fixed an issue deserializing Strings when no response i…

…s declared in OpenAPI.
Cumulocity-IoT · Nov 3, 2023 · 6f1fe29 · 6f1fe29
1 parent 76946d4
commit 6f1fe29
Show file tree

Hide file tree

Showing 37 changed files with 212 additions and 270 deletions.
diff --git a/Client/Com/Cumulocity/Client/Api/AlarmsApi.cs b/Client/Com/Cumulocity/Client/Api/AlarmsApi.cs
@@ -68,7 +68,7 @@ public AlarmsApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<AlarmCollection<TAlarm>?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<AlarmCollection<TAlarm>?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -111,8 +111,7 @@ public AlarmsApi(HttpClient httpClient)
  request.Headers.TryAddWithoutValidation("Accept", "application/json");
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
- await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<string?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await response.Content.ReadAsStringAsync().ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -140,7 +139,7 @@ public AlarmsApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<TAlarm?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<TAlarm?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -170,8 +169,7 @@ public AlarmsApi(HttpClient httpClient)
  request.Headers.TryAddWithoutValidation("Accept", "application/json");
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
- await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<string?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await response.Content.ReadAsStringAsync().ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -188,7 +186,7 @@ public AlarmsApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<TAlarm?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<TAlarm?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -218,7 +216,7 @@ public AlarmsApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<TAlarm?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<TAlarm?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -246,6 +244,6 @@ public async Task<int> GetNumberOfAlarms(System.DateTime? dateFrom = null, Syste
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<int>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<int>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 }
diff --git a/Client/Com/Cumulocity/Client/Api/ApplicationBinariesApi.cs b/Client/Com/Cumulocity/Client/Api/ApplicationBinariesApi.cs
@@ -48,7 +48,7 @@ public ApplicationBinariesApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<ApplicationBinaries?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<ApplicationBinaries?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -71,7 +71,7 @@ public ApplicationBinariesApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<Application?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<Application?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -87,8 +87,7 @@ public ApplicationBinariesApi(HttpClient httpClient)
  request.Headers.TryAddWithoutValidation("Accept", "application/vnd.com.nsn.cumulocity.error+json, application/zip");
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
- await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<string?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await response.Content.ReadAsStringAsync().ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -104,7 +103,6 @@ public ApplicationBinariesApi(HttpClient httpClient)
  request.Headers.TryAddWithoutValidation("Accept", "application/json");
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
- await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<string?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await response.Content.ReadAsStringAsync().ConfigureAwait(false);
  }
 }
diff --git a/Client/Com/Cumulocity/Client/Api/ApplicationVersionsApi.cs b/Client/Com/Cumulocity/Client/Api/ApplicationVersionsApi.cs
@@ -52,7 +52,7 @@ public ApplicationVersionsApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<ApplicationVersion?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<ApplicationVersion?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -69,7 +69,7 @@ public ApplicationVersionsApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<ApplicationVersionCollection?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<ApplicationVersionCollection?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -95,7 +95,7 @@ public ApplicationVersionsApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<ApplicationVersion?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<ApplicationVersion?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -115,8 +115,7 @@ public ApplicationVersionsApi(HttpClient httpClient)
  request.Headers.TryAddWithoutValidation("Accept", "application/json");
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
- await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<string?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await response.Content.ReadAsStringAsync().ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -136,6 +135,6 @@ public ApplicationVersionsApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<ApplicationVersion?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<ApplicationVersion?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 }
diff --git a/Client/Com/Cumulocity/Client/Api/ApplicationsApi.cs b/Client/Com/Cumulocity/Client/Api/ApplicationsApi.cs
@@ -66,7 +66,7 @@ public ApplicationsApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<ApplicationCollection?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<ApplicationCollection?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -92,7 +92,7 @@ public ApplicationsApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<Application?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<Application?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -109,7 +109,7 @@ public ApplicationsApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<Application?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<Application?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -136,7 +136,7 @@ public ApplicationsApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<Application?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<Application?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -156,8 +156,7 @@ public ApplicationsApi(HttpClient httpClient)
  request.Headers.TryAddWithoutValidation("Accept", "application/json");
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
- await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<string?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await response.Content.ReadAsStringAsync().ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -179,7 +178,7 @@ public ApplicationsApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<Application?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<Application?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -196,7 +195,7 @@ public ApplicationsApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<ApplicationCollection?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<ApplicationCollection?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -213,7 +212,7 @@ public ApplicationsApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<ApplicationCollection?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<ApplicationCollection?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -236,7 +235,7 @@ public ApplicationsApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<ApplicationCollection?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<ApplicationCollection?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 
  /// <inheritdoc />
@@ -259,6 +258,6 @@ public ApplicationsApi(HttpClient httpClient)
  using var response = await _httpClient.SendAsync(request: request, cancellationToken: cToken).ConfigureAwait(false);
  await response.EnsureSuccessStatusCodeWithContentInfo().ConfigureAwait(false);
  await using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
- return await JsonSerializerWrapper.DeserializeAsync<ApplicationCollection?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);;
+ return await JsonSerializerWrapper.DeserializeAsync<ApplicationCollection?>(responseStream, cancellationToken: cToken).ConfigureAwait(false);
  }
 }