mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-21 00:56:28 +08:00
9b034f8291
# Description Nullable reference types are now enabled once, in `common.props`, and every project in the repository builds warning-clean with them. **Configuration** - `<Nullable>enable</Nullable>` lives in `common.props`. All per-project `<Nullable>` settings are removed: 178 project files (enable, annotations, and the `disable` in the three Aot test projects). - 419 per-file `#nullable enable`/`restore` directives and the 4 `#nullable disable` directives are removed. - Kept on purpose: - The 5 `<auto-generated>` schema files (`UANodeSet.cs`, `UA Type Dictionary.cs`, `OPCBinarySchema.cs`, `SecuredApplication.cs`, `PInvokeHelper.cs`) keep `#nullable enable`. The compiler ignores the project setting in generated code, so the directive is required there. - `tests/Opc.Ua.Interop.LegacyPeer` keeps `disable`. It builds against the 1.5.378 packages and does not import the repository props. - `docs/DeveloperGuide.md` and `.github/copilot-instructions.md` now describe the central setting. **Migration** (the 43 unset and 13 annotations-only projects, roughly 10k diagnostics) - **Production code: annotated at the declarations.** Covers `tools/Opc.Ua.SourceGeneration.Core`, `src/Opc.Ua.Lds.Server` and the LDS sample. - Members, parameters and returns are nullable where null actually flows. - Null-check helpers carry `[NotNullWhen]` (`IsNull`, `IsValidXmlName`, `IsMethodTypeDesign`). - `CoreUtils.Format`, `Utils.Format`, `ITemplateWriter.WriteLine` take `params object?[]`. `Template.AddReplacement` takes `string?` (rendering already skips null replacements). - `IRegisteredServerStore.RegisterAsync` returns `Task<RegistrationEntry?>`: it returns null when a registration is removed. - Dereferences backed by an invariant (for example, the validated model) use `!`, so runtime behaviour is unchanged. - **Behavioural changes in production code** (small, deliberate): - `NodeSetToModelDesign` throws `InvalidOperationException` when the file is not a NodeSet. Before, it threw a NullReferenceException on the next line. - `ModelDesignValidator` starts its lookup tables empty instead of null. A redundant `if (m_nodes == null) return;` guard is gone. - **Test code: minimal annotations.** - `?` on values that can be null, `!` where the test asserts non-null. - `= null!` for fixture members assigned in SetUp. - `TryGetStructure<T>(out T? x)` where the inferred `T?` broke the `IEncodeable` constraint. - A few redundant `== null` checks on structs (`NodeId`, `ArrayOf<T>`) folded into the adjacent `IsNull`/`Count` checks. **Notes for reviewers** - The diff is large (~1,500 files) but almost entirely mechanical: `?`, `!` and directive removal. The non-annotation changes are listed above. - Known follow-up, not done here: `IModelDesign.Namespaces/TargetNamespace/NamespaceUris` stay non-nullable even though the validator returns null before it loads a dictionary. Making them nullable would ripple through every generator call site. ## Related Issues - Fixes #4439 ## Checklist - [ ] I have signed the [CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf) and read the [CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md) doc. - [ ] I have added tests that prove my fix is effective or that my feature works and increased code coverage. - [x] I have added all necessary documentation. - [x] I have verified that my changes do not introduce (new) build or analyzer warnings. - [ ] I ran **all** tests locally using the **UA.slnx** solution against at least .net **framework** and .net **10**, and all passed. - [ ] I fixed **all** failing and flaky tests in the CI pipelines and **all** CodeQL warnings. - [ ] I have addressed **all** PR feedback received. The "no new warnings" box covers net10.0 and net48: full non-incremental builds of `UA.slnx`, `tools/SourceGeneration.slnx`, `tools/MigrationAnalyzer.slnx` and the Aot test projects finished with 0 warnings and 0 errors under the repository's warnings-as-errors settings. net9.0 and net8.0 also had no nullable diagnostics, but they were not rebuilt after the final fixes. Tests have not been run locally yet. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
251 lines
10 KiB
C#
251 lines
10 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2026 The OPC Foundation, Inc. All rights reserved.
|
|
*
|
|
* OPC Foundation MIT License 1.00
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following
|
|
* conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* The complete license agreement can be found here:
|
|
* http://opcfoundation.org/License/MIT/1.00/
|
|
* ======================================================================*/
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Configuration;
|
|
using Microsoft.Extensions.Configuration.Memory;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Hosting;
|
|
using Microsoft.Extensions.Logging;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Configuration;
|
|
|
|
namespace Opc.Ua.Client.Tests.ClientBuilder
|
|
{
|
|
/// <summary>
|
|
/// Exercises the provider-agnostic part of the eager client
|
|
/// configuration load: the public
|
|
/// <see cref="OpcUaClientOptions.ConfigurationProvider"/> surface and
|
|
/// the <see cref="OpcUaClientOptions.LoadConfigurationOnStart"/> hosted
|
|
/// service that awaits
|
|
/// <see cref="IOpcUaApplicationConfigurationProvider.GetAsync"/> during
|
|
/// host start. The supplied-document (<c>AddClient(configurationFile)</c>)
|
|
/// cases live in <see cref="ClientConfigurationFileTests"/>.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Client")]
|
|
[Category("ClientBuilder")]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
[Parallelizable]
|
|
public sealed class ClientEagerConfigurationLoadTests
|
|
{
|
|
[Test]
|
|
public async Task LoadConfigurationOnStartAwaitsSharedProviderAsync()
|
|
{
|
|
ApplicationConfiguration configuration = CreateConfiguration();
|
|
Mock<IOpcUaApplicationConfigurationProvider> configurationProvider =
|
|
CreateProviderMock(configuration);
|
|
|
|
var services = new ServiceCollection();
|
|
services.AddLogging();
|
|
services.AddSingleton(configurationProvider.Object);
|
|
services.AddOpcUa().AddClient(options => options.LoadConfigurationOnStart = true);
|
|
|
|
await using ServiceProvider provider = services.BuildServiceProvider();
|
|
OpcUaClientOptions options = provider.GetRequiredService<OpcUaClientOptions>();
|
|
|
|
// The shared provider is exposed publicly, so an application can
|
|
// load and read the configuration back without a session.
|
|
Assert.That(
|
|
options.ConfigurationProvider,
|
|
Is.SameAs(configurationProvider.Object));
|
|
|
|
IHostedService loader = GetLoader(provider);
|
|
await loader.StartAsync(CancellationToken.None).ConfigureAwait(false);
|
|
|
|
configurationProvider.Verify(
|
|
p => p.GetAsync(It.IsAny<CancellationToken>()),
|
|
Times.Once);
|
|
Assert.That(options.Configuration, Is.SameAs(configuration));
|
|
|
|
await loader.StopAsync(CancellationToken.None).ConfigureAwait(false);
|
|
}
|
|
|
|
[Test]
|
|
public async Task LoadConfigurationOnStartIsNoOpForExplicitConfigurationAsync()
|
|
{
|
|
ApplicationConfiguration configuration = CreateConfiguration();
|
|
|
|
var services = new ServiceCollection();
|
|
services.AddLogging();
|
|
services.AddOpcUa().AddClient(options =>
|
|
{
|
|
options.Configuration = configuration;
|
|
options.LoadConfigurationOnStart = true;
|
|
});
|
|
|
|
await using ServiceProvider provider = services.BuildServiceProvider();
|
|
OpcUaClientOptions options = provider.GetRequiredService<OpcUaClientOptions>();
|
|
|
|
// Nothing to load: an explicit configuration is already complete.
|
|
Assert.That(options.ConfigurationProvider, Is.Null);
|
|
|
|
IHostedService loader = GetLoader(provider);
|
|
Assert.That(
|
|
() => loader.StartAsync(CancellationToken.None),
|
|
Throws.Nothing);
|
|
Assert.That(options.Configuration, Is.SameAs(configuration));
|
|
}
|
|
|
|
[Test]
|
|
public async Task LoadConfigurationOnStartCancellationAbortsHostStartAsync()
|
|
{
|
|
ApplicationConfiguration configuration = CreateConfiguration();
|
|
var started = new TaskCompletionSource<bool>(
|
|
TaskCreationOptions.RunContinuationsAsynchronously);
|
|
var configurationProvider =
|
|
new Mock<IOpcUaApplicationConfigurationProvider>();
|
|
configurationProvider.Setup(p => p.Configuration).Returns(configuration);
|
|
configurationProvider
|
|
.Setup(p => p.GetAsync(It.IsAny<CancellationToken>()))
|
|
.Returns(async (CancellationToken ct) =>
|
|
{
|
|
started.TrySetResult(true);
|
|
await Task.Delay(Timeout.Infinite, ct).ConfigureAwait(false);
|
|
return configuration;
|
|
});
|
|
|
|
var services = new ServiceCollection();
|
|
services.AddLogging();
|
|
services.AddSingleton(configurationProvider.Object);
|
|
services.AddOpcUa().AddClient(options => options.LoadConfigurationOnStart = true);
|
|
|
|
await using ServiceProvider provider = services.BuildServiceProvider();
|
|
IHostedService loader = GetLoader(provider);
|
|
|
|
using var cts = new CancellationTokenSource();
|
|
Task start = loader.StartAsync(cts.Token);
|
|
await started.Task.ConfigureAwait(false);
|
|
cts.Cancel();
|
|
|
|
// The host's startup token is passed through to the load.
|
|
Assert.That(
|
|
async () => await start.ConfigureAwait(false),
|
|
Throws.InstanceOf<OperationCanceledException>());
|
|
}
|
|
|
|
[Test]
|
|
public async Task LoadConfigurationOnStartBindsFromConfigurationSectionAsync()
|
|
{
|
|
IConfiguration configurationRoot = new ConfigurationBuilder()
|
|
.Add(new MemoryConfigurationSource
|
|
{
|
|
InitialData = new Dictionary<string, string?>
|
|
{
|
|
["OpcUa:Client:LoadConfigurationOnStart"] = "true"
|
|
}
|
|
})
|
|
.Build();
|
|
|
|
var services = new ServiceCollection();
|
|
services.AddLogging();
|
|
services.AddSingleton(CreateProviderMock(CreateConfiguration()).Object);
|
|
services.AddOpcUa().AddClient(configurationRoot);
|
|
|
|
await using ServiceProvider provider = services.BuildServiceProvider();
|
|
|
|
Assert.That(
|
|
provider.GetRequiredService<OpcUaClientOptions>().LoadConfigurationOnStart,
|
|
Is.True);
|
|
Assert.That(GetLoader(provider), Is.Not.Null);
|
|
}
|
|
|
|
#if NET8_0_OR_GREATER
|
|
[Test]
|
|
public async Task HostStartAsyncCompletesTheConfigurationLoadAsync()
|
|
{
|
|
ApplicationConfiguration configuration = CreateConfiguration();
|
|
Mock<IOpcUaApplicationConfigurationProvider> configurationProvider =
|
|
CreateProviderMock(configuration);
|
|
|
|
using IHost host = new HostBuilder()
|
|
.ConfigureServices((_, services) =>
|
|
{
|
|
services.AddLogging();
|
|
services.AddSingleton(configurationProvider.Object);
|
|
services.AddOpcUa().AddClient(
|
|
options => options.LoadConfigurationOnStart = true);
|
|
})
|
|
.Build();
|
|
|
|
await host.StartAsync().ConfigureAwait(false);
|
|
try
|
|
{
|
|
// When StartAsync returns the configuration is loaded and
|
|
// readable through the public options surface, which is what
|
|
// user-interface hosts need before any session exists.
|
|
OpcUaClientOptions options =
|
|
host.Services.GetRequiredService<OpcUaClientOptions>();
|
|
Assert.That(
|
|
options.ConfigurationProvider!.Configuration,
|
|
Is.SameAs(configuration));
|
|
Assert.That(options.Configuration, Is.SameAs(configuration));
|
|
configurationProvider.Verify(
|
|
p => p.GetAsync(It.IsAny<CancellationToken>()),
|
|
Times.Once);
|
|
}
|
|
finally
|
|
{
|
|
await host.StopAsync().ConfigureAwait(false);
|
|
}
|
|
}
|
|
#endif
|
|
|
|
private static IHostedService GetLoader(IServiceProvider provider)
|
|
{
|
|
return provider.GetServices<IHostedService>()
|
|
.Single(service => service is ClientConfigurationLoaderHostedService);
|
|
}
|
|
|
|
private static Mock<IOpcUaApplicationConfigurationProvider> CreateProviderMock(
|
|
ApplicationConfiguration configuration)
|
|
{
|
|
var configurationProvider =
|
|
new Mock<IOpcUaApplicationConfigurationProvider>();
|
|
configurationProvider.Setup(p => p.Configuration).Returns(configuration);
|
|
configurationProvider
|
|
.Setup(p => p.GetAsync(It.IsAny<CancellationToken>()))
|
|
.ReturnsAsync(configuration);
|
|
return configurationProvider;
|
|
}
|
|
|
|
private static ApplicationConfiguration CreateConfiguration()
|
|
{
|
|
return new ApplicationConfiguration(
|
|
Opc.Ua.Tests.NUnitTelemetryContext.Create());
|
|
}
|
|
}
|
|
}
|