Skip to content

Commit b446d06

Browse files
azchohfiazchohfi
committed
Simplified many using statements by changing the lang version to C#8 in the services project.
1 parent f53739b commit b446d06

File tree

7 files changed

+188
-260
lines changed

7 files changed

+188
-260
lines changed

‎Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
</Description>
1212
<PackageTags>UWP Community Toolkit Windows Microsoft Graph OneDrive Twitter Translator LinkedIn service login OAuth</PackageTags>
1313

14+
<LangVersion>8.0</LangVersion>
1415
<NoWarn>CS8002;CS0618</NoWarn>
1516
<DeterministicSourcePaths Condition="'$(EnableSourceLink)' == ''">false</DeterministicSourcePaths>
1617
</PropertyGroup>

‎Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs‎

Lines changed: 25 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -198,22 +198,18 @@ public async Task<IEnumerable<TSchema>> GetDataAsync<TSchema>(LinkedInDataConfig
198198

199199
var url = $"{_baseUrl}{config.Query}/~:({fields})?oauth2_access_token={Tokens.AccessToken}&format=json&count={maxRecords}&start={startRecord}";
200200

201-
using (HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, new Uri(url)))
202-
{
203-
request.Headers.Connection.TryParseAdd("Keep-Alive");
204-
205-
using (var response = await client.SendAsync(request).ConfigureAwait(false))
206-
{
207-
var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
201+
using HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, new Uri(url));
202+
request.Headers.Connection.TryParseAdd("Keep-Alive");
208203

209-
if (response.IsSuccessStatusCode && !string.IsNullOrEmpty(data))
210-
{
211-
return parser.Parse(data);
212-
}
204+
using var response = await client.SendAsync(request).ConfigureAwait(false);
205+
var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
213206

214-
throw new RequestFailedException((System.Net.HttpStatusCode)response.StatusCode, data);
215-
}
207+
if (response.IsSuccessStatusCode && !string.IsNullOrEmpty(data))
208+
{
209+
return parser.Parse(data);
216210
}
211+
212+
throw new RequestFailedException((System.Net.HttpStatusCode)response.StatusCode, data);
217213
}
218214

219215
/// <summary>
@@ -234,22 +230,18 @@ public async Task<U> ShareDataAsync<T, U>(T dataToShare)
234230

235231
var url = $"{_baseUrl}/people/~/shares?oauth2_access_token={Tokens.AccessToken}&format=json";
236232

237-
using (HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, new Uri(url)))
238-
{
239-
request.Headers.Add("x-li-format", "json");
240-
var stringContent = requestParser.Parse(shareRequest);
241-
request.Content = new StringContent(stringContent, Encoding.UTF8, "application/json");
233+
using HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, new Uri(url));
234+
request.Headers.Add("x-li-format", "json");
235+
var stringContent = requestParser.Parse(shareRequest);
236+
request.Content = new StringContent(stringContent, Encoding.UTF8, "application/json");
242237

243-
using (var response = await client.SendAsync(request).ConfigureAwait(false))
244-
{
245-
var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
238+
using var response = await client.SendAsync(request).ConfigureAwait(false);
239+
var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
246240

247-
var responseParser = new LinkedInParser<U>();
241+
var responseParser = new LinkedInParser<U>();
248242

249-
var listResults = responseParser.Parse(data) as List<U>;
250-
return listResults[0];
251-
}
252-
}
243+
var listResults = responseParser.Parse(data) as List<U>;
244+
return listResults[0];
253245
}
254246

255247
return default(U);
@@ -275,20 +267,13 @@ private async Task<string> GetAccessTokenAsync(LinkedInOAuthTokens tokens, strin
275267
+ "&client_id=" + tokens.ClientId
276268
+ "&client_secret=" + tokens.ClientSecret;
277269

278-
using (var request = new HttpRequestMessage(HttpMethod.Post, new Uri(url)))
279-
{
280-
using (var response = await client.SendAsync(request).ConfigureAwait(false))
281-
{
282-
using (var jsonStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
283-
{
284-
using (var jsonDoc = await JsonDocument.ParseAsync(jsonStream).ConfigureAwait(false))
285-
{
286-
var value = jsonDoc.RootElement.GetProperty("access_token");
287-
return value.GetString();
288-
}
289-
}
290-
}
291-
}
270+
using var request = new HttpRequestMessage(HttpMethod.Post, new Uri(url));
271+
using var response = await client.SendAsync(request).ConfigureAwait(false);
272+
using var jsonStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
273+
using var jsonDoc = await JsonDocument.ParseAsync(jsonStream).ConfigureAwait(false);
274+
275+
var value = jsonDoc.RootElement.GetProperty("access_token");
276+
return value.GetString();
292277
}
293278

294279
private async Task<string> GetAuthorizeCodeAsync(LinkedInOAuthTokens tokens, LinkedInPermissions permissions)

‎Microsoft.Toolkit.Services/Services/MicrosoftTranslator/AzureAuthToken.cs‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,24 +93,22 @@ public async Task<string> GetAccessTokenAsync()
9393
return _storedTokenValue;
9494
}
9595

96-
using (var request = new HttpRequestMessage(HttpMethod.Post, ServiceUrl))
97-
{
98-
request.Headers.Add(OcpApimSubscriptionKeyHeader, SubscriptionKey);
96+
using var request = new HttpRequestMessage(HttpMethod.Post, ServiceUrl);
97+
request.Headers.Add(OcpApimSubscriptionKeyHeader, SubscriptionKey);
9998

100-
var response = await client.SendAsync(request).ConfigureAwait(false);
101-
var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
99+
var response = await client.SendAsync(request).ConfigureAwait(false);
100+
var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
102101

103-
if (!response.IsSuccessStatusCode)
104-
{
105-
var error = JsonSerializer.Deserialize<ErrorResponse>(content);
106-
throw new TranslatorServiceException(error?.Error?.Message);
107-
}
102+
if (!response.IsSuccessStatusCode)
103+
{
104+
var error = JsonSerializer.Deserialize<ErrorResponse>(content);
105+
throw new TranslatorServiceException(error?.Error?.Message);
106+
}
108107

109-
_storedTokenTime = DateTime.Now;
110-
_storedTokenValue = $"Bearer {content}";
108+
_storedTokenTime = DateTime.Now;
109+
_storedTokenValue = $"Bearer {content}";
111110

112-
return _storedTokenValue;
113-
}
111+
return _storedTokenValue;
114112
}
115113
}
116114
}

‎Microsoft.Toolkit.Services/Services/MicrosoftTranslator/TranslatorService.cs‎

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,13 @@ public async Task<IEnumerable<DetectedLanguageResponse>> DetectLanguagesWithResp
107107
await CheckUpdateTokenAsync().ConfigureAwait(false);
108108

109109
var uriString = $"{BaseUrl}detect?{ApiVersion}";
110-
using (var request = CreateHttpRequest(uriString, HttpMethod.Post, input.Select(t => new { Text = t.Substring(0, Math.Min(t.Length, _MaxTextLengthForDetection)) })))
111-
{
112-
var response = await client.SendAsync(request).ConfigureAwait(false);
113-
var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
110+
using var request = CreateHttpRequest(uriString, HttpMethod.Post, input.Select(t => new { Text = t.Substring(0, Math.Min(t.Length, _MaxTextLengthForDetection)) }));
114111

115-
var responseContent = JsonSerializer.Deserialize<IEnumerable<DetectedLanguageResponse>>(content);
116-
return responseContent;
117-
}
112+
var response = await client.SendAsync(request).ConfigureAwait(false);
113+
var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
114+
115+
var responseContent = JsonSerializer.Deserialize<IEnumerable<DetectedLanguageResponse>>(content);
116+
return responseContent;
118117
}
119118

120119
/// <inheritdoc/>
@@ -131,24 +130,23 @@ public async Task<IEnumerable<ServiceLanguage>> GetLanguageNamesAsync(string lan
131130
await CheckUpdateTokenAsync().ConfigureAwait(false);
132131

133132
var uriString = $"{BaseUrl}languages?scope=translation&{ApiVersion}";
134-
using (var request = CreateHttpRequest(uriString))
133+
using var request = CreateHttpRequest(uriString);
134+
135+
language = language ?? Language;
136+
if (!string.IsNullOrWhiteSpace(language))
135137
{
136-
language = language ?? Language;
137-
if (!string.IsNullOrWhiteSpace(language))
138-
{
139-
// If necessary, adds the Accept-Language header in order to get localized language names.
140-
request.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(language));
141-
}
138+
// If necessary, adds the Accept-Language header in order to get localized language names.
139+
request.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(language));
140+
}
142141

143-
var response = await client.SendAsync(request).ConfigureAwait(false);
144-
var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
142+
var response = await client.SendAsync(request).ConfigureAwait(false);
143+
var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
145144

146-
var jsonContent = JsonDocument.Parse(content).RootElement.GetProperty("translation");
147-
var responseContent = JsonSerializer.Deserialize<Dictionary<string, ServiceLanguage>>(jsonContent.ToString()).ToList();
148-
responseContent.ForEach(r => r.Value.Code = r.Key);
145+
var jsonContent = JsonDocument.Parse(content).RootElement.GetProperty("translation");
146+
var responseContent = JsonSerializer.Deserialize<Dictionary<string, ServiceLanguage>>(jsonContent.ToString()).ToList();
147+
responseContent.ForEach(r => r.Value.Code = r.Key);
149148

150-
return responseContent.Select(r => r.Value).OrderBy(r => r.Name).ToList();
151-
}
149+
return responseContent.Select(r => r.Value).OrderBy(r => r.Name).ToList();
152150
}
153151

154152
/// <inheritdoc/>
@@ -215,14 +213,13 @@ public async Task<IEnumerable<TranslationResponse>> TranslateWithResponseAsync(I
215213

216214
var toQueryString = string.Join("&", to.Select(t => $"to={t}"));
217215
var uriString = (string.IsNullOrWhiteSpace(from) ? $"{BaseUrl}translate?{toQueryString}" : $"{BaseUrl}translate?from={from}&{toQueryString}") + $"&{ApiVersion}";
218-
using (var request = CreateHttpRequest(uriString, HttpMethod.Post, input.Select(t => new { Text = t })))
219-
{
220-
var response = await client.SendAsync(request).ConfigureAwait(false);
221-
var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
216+
using var request = CreateHttpRequest(uriString, HttpMethod.Post, input.Select(t => new { Text = t }));
222217

223-
var responseContent = JsonSerializer.Deserialize<IEnumerable<TranslationResponse>>(content);
224-
return responseContent;
225-
}
218+
var response = await client.SendAsync(request).ConfigureAwait(false);
219+
var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
220+
221+
var responseContent = JsonSerializer.Deserialize<IEnumerable<TranslationResponse>>(content);
222+
return responseContent;
226223
}
227224

228225
/// <inheritdoc/>

‎Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -592,18 +592,16 @@ private async Task<bool> InitializeRequestAccessTokensAsync(string twitterCallba
592592

593593
using (var request = new HttpRequestMessage(HttpMethod.Get, new Uri(twitterUrl)))
594594
{
595-
using (var response = await _client.SendAsync(request).ConfigureAwait(false))
595+
using var response = await _client.SendAsync(request).ConfigureAwait(false);
596+
var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
597+
if (response.IsSuccessStatusCode)
596598
{
597-
var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
598-
if (response.IsSuccessStatusCode)
599-
{
600-
getResponse = data;
601-
}
602-
else
603-
{
604-
Debug.WriteLine("HttpHelper call failed trying to retrieve Twitter Request Tokens. Message: {0}", data);
605-
return false;
606-
}
599+
getResponse = data;
600+
}
601+
else
602+
{
603+
Debug.WriteLine("HttpHelper call failed trying to retrieve Twitter Request Tokens. Message: {0}", data);
604+
return false;
607605
}
608606
}
609607

@@ -676,10 +674,8 @@ private async Task<bool> ExchangeRequestTokenForAccessTokenAsync(string webAuthR
676674
{
677675
request.Headers.Authorization = new AuthenticationHeaderValue("OAuth", authorizationHeaderParams);
678676

679-
using (var response = await _client.SendAsync(request).ConfigureAwait(false))
680-
{
681-
data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
682-
}
677+
using var response = await _client.SendAsync(request).ConfigureAwait(false);
678+
data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
683679
}
684680

685681
var screenName = ExtractTokenFromResponse(data, TwitterOAuthTokenType.ScreenName);

0 commit comments

Comments
 (0)