Skip to content

Commit 73f2b26

Browse files
authored
Fix warnings in extension projects (#3260)
1 parent 11143ec commit 73f2b26

File tree

6 files changed

+14
-10
lines changed

6 files changed

+14
-10
lines changed

extensions/Worker.Extensions.CosmosDB/src/Config/CosmosDBBindingOptionsSetup.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ public void Configure(CosmosDBBindingOptions options)
3131
Configure(Options.DefaultName, options);
3232
}
3333

34-
public void Configure(string connectionName, CosmosDBBindingOptions options)
34+
public void Configure(string? connectionName, CosmosDBBindingOptions options)
3535
{
36+
// TODO: evaluate defaulting to CosmosDB connection name.
37+
connectionName ??= Options.DefaultName;
3638
IConfigurationSection connectionSection = _configuration.GetWebJobsConnectionStringSection(connectionName);
3739

3840
if (!connectionSection.Exists())

extensions/Worker.Extensions.CosmosDB/src/CosmosDBConverter.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private async ValueTask<ConversionResult> ConvertFromBindingDataAsync(ConverterC
5353
throw new InvalidBindingSourceException(modelBindingData.Source, Constants.CosmosExtensionName);
5454
}
5555

56-
var cosmosAttribute = GetBindingDataContent(modelBindingData);
56+
CosmosDBInputAttribute cosmosAttribute = GetBindingDataContent(modelBindingData);
5757
object result = await ToTargetTypeAsync(context.TargetType, cosmosAttribute);
5858

5959
return ConversionResult.Success(result);
@@ -77,7 +77,8 @@ private CosmosDBInputAttribute GetBindingDataContent(ModelBindingData bindingDat
7777

7878
return bindingData.ContentType switch
7979
{
80-
Constants.JsonContentType => bindingData.Content.ToObjectFromJson<CosmosDBInputAttribute>(),
80+
Constants.JsonContentType => bindingData.Content.ToObjectFromJson<CosmosDBInputAttribute>()
81+
?? throw new InvalidOperationException("CosmosDB binding data content could not be retrieved."),
8182
_ => throw new InvalidContentTypeException(bindingData.ContentType, Constants.JsonContentType)
8283
};
8384
}

extensions/Worker.Extensions.Storage.Blobs/src/Config/BlobStorageBindingOptionsSetup.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ public void Configure(BlobStorageBindingOptions options)
2929
Configure(Options.DefaultName, options);
3030
}
3131

32-
public void Configure(string name, BlobStorageBindingOptions options)
32+
public void Configure(string? name, BlobStorageBindingOptions options)
3333
{
3434
if (string.IsNullOrWhiteSpace(name))
3535
{
3636
name = Constants.Storage; // default
3737
}
3838

39-
IConfigurationSection connectionSection = _configuration.GetWebJobsConnectionStringSection(name);
39+
IConfigurationSection connectionSection = _configuration.GetWebJobsConnectionStringSection(name!);
4040

4141
if (!connectionSection.Exists())
4242
{
@@ -61,4 +61,4 @@ public void Configure(string name, BlobStorageBindingOptions options)
6161
options.Credential = _componentFactory.CreateTokenCredential(connectionSection);
6262
}
6363
}
64-
}
64+
}

extensions/Worker.Extensions.Tables/src/Config/TablesBindingOptionsSetup.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ public void Configure(TablesBindingOptions options)
2424
Configure(Options.DefaultName, options);
2525
}
2626

27-
public void Configure(string name, TablesBindingOptions options)
27+
public void Configure(string? name, TablesBindingOptions options)
2828
{
2929
if (string.IsNullOrWhiteSpace(name))
3030
{
3131
name = Constants.Storage; // default
3232
}
3333

34-
IConfigurationSection connectionSection = _configuration.GetWebJobsConnectionStringSection(name);
34+
IConfigurationSection connectionSection = _configuration.GetWebJobsConnectionStringSection(name!);
3535

3636
if (!connectionSection.Exists())
3737
{

extensions/Worker.Extensions.Tables/src/TypeConverters/TableConverterBase.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ protected TableData GetBindingDataContent(ModelBindingData? bindingData)
5555

5656
return bindingData.ContentType switch
5757
{
58-
Constants.JsonContentType => bindingData.Content.ToObjectFromJson<TableData>(),
58+
Constants.JsonContentType => bindingData.Content.ToObjectFromJson<TableData>()
59+
?? throw new InvalidOperationException("Table binding data content could not be deserialized."),
5960
_ => throw new InvalidContentTypeException(bindingData.ContentType, Constants.JsonContentType)
6061
};
6162
}

test/E2ETests/E2ETests/AspNetCore/CancellationEndToEndTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ await TestUtility.RetryAsync(() =>
5555
Assert.Contains(_fixture.TestLogs.CoreToolsLogs, log => log.Contains(expectedMessage, StringComparison.OrdinalIgnoreCase));
5656

5757
// TODO: 2/3 of the test invocations will fail until the host with the ForwarderProxy fix is released - uncomment this line when the fix is released
58-
Assert.NotEqual(null, invocationResult); // just here to 'use' invocationResult to avoid a warning.
58+
Assert.NotNull(invocationResult); // just here to 'use' invocationResult to avoid a warning.
5959
// Assert.Contains(_fixture.TestLogs.CoreToolsLogs, log => log.Contains($"'Functions.{functionName}' ({invocationResult}", StringComparison.OrdinalIgnoreCase));
6060
}
6161

0 commit comments

Comments
 (0)