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>
226 lines
9.7 KiB
C#
226 lines
9.7 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 Microsoft.Extensions.DependencyInjection;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Server.Hosting;
|
|
|
|
namespace Opc.Ua.Server.Tests.Hosting
|
|
{
|
|
/// <summary>
|
|
/// Tests the precedence rules that
|
|
/// <see cref="DependencyInjectionStandardServer.ResolveServerConfigurationOptions"/>
|
|
/// uses to select the Optional OPC 10000-12 §7.10.3
|
|
/// <c>ServerConfiguration</c> value options and merge standalone provider
|
|
/// services into them.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Server")]
|
|
[Category("Hosting")]
|
|
[Parallelizable]
|
|
public sealed class ServerConfigurationOptionsResolutionTests
|
|
{
|
|
[Test]
|
|
public void DirectlyRegisteredInstanceExposesConfiguredValuesAndProviders()
|
|
{
|
|
IServerConfigurationResetProvider resetProvider = Mock.Of<IServerConfigurationResetProvider>();
|
|
IApplicationConfigurationFileProvider fileProvider =
|
|
Mock.Of<IApplicationConfigurationFileProvider>();
|
|
var instance = new ServerConfigurationOptions
|
|
{
|
|
HasSecureElement = true,
|
|
InApplicationSetup = false,
|
|
ConfigurationFileActivityTimeout = 12345.0,
|
|
ResetShutdownDelay = TimeSpan.FromSeconds(42),
|
|
ResetProvider = resetProvider,
|
|
ConfigurationFileProvider = fileProvider
|
|
};
|
|
|
|
var services = new ServiceCollection();
|
|
services.AddSingleton(instance);
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
|
|
ServerConfigurationOptions? resolved =
|
|
DependencyInjectionStandardServer.ResolveServerConfigurationOptions(sp);
|
|
|
|
Assert.That(resolved, Is.SameAs(instance));
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(resolved!.HasSecureElement, Is.True);
|
|
Assert.That(resolved.InApplicationSetup, Is.False);
|
|
Assert.That(resolved.ConfigurationFileActivityTimeout, Is.EqualTo(12345.0));
|
|
Assert.That(resolved.ResetShutdownDelay, Is.EqualTo(TimeSpan.FromSeconds(42)));
|
|
Assert.That(resolved.ResetProvider, Is.SameAs(resetProvider));
|
|
Assert.That(resolved.ConfigurationFileProvider, Is.SameAs(fileProvider));
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public void DirectlyRegisteredInstanceTakesPrecedenceOverOptionsPattern()
|
|
{
|
|
var instance = new ServerConfigurationOptions { HasSecureElement = true };
|
|
|
|
var services = new ServiceCollection();
|
|
services.AddSingleton(instance);
|
|
services.AddOptions<ServerConfigurationOptions>()
|
|
.Configure(o =>
|
|
{
|
|
o.HasSecureElement = false;
|
|
o.InApplicationSetup = true;
|
|
});
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
|
|
ServerConfigurationOptions? resolved =
|
|
DependencyInjectionStandardServer.ResolveServerConfigurationOptions(sp);
|
|
|
|
Assert.That(resolved, Is.SameAs(instance),
|
|
"a directly-registered instance must win over the options-pattern value");
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(resolved!.HasSecureElement, Is.True);
|
|
Assert.That(resolved.InApplicationSetup, Is.Null,
|
|
"the options-pattern configuration must not leak into the direct instance");
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public void OptionsPatternOnlyPathResolvesConfiguredValue()
|
|
{
|
|
var services = new ServiceCollection();
|
|
services.AddOptions<ServerConfigurationOptions>()
|
|
.Configure(o =>
|
|
{
|
|
o.HasSecureElement = true;
|
|
o.ConfigurationFileActivityTimeout = 999.0;
|
|
});
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
|
|
ServerConfigurationOptions? resolved =
|
|
DependencyInjectionStandardServer.ResolveServerConfigurationOptions(sp);
|
|
|
|
Assert.That(resolved, Is.Not.Null);
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(resolved!.HasSecureElement, Is.True);
|
|
Assert.That(resolved.ConfigurationFileActivityTimeout, Is.EqualTo(999.0));
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public void StandaloneProvidersCreateAndAugmentDefaultOptions()
|
|
{
|
|
IServerConfigurationResetProvider resetProvider = Mock.Of<IServerConfigurationResetProvider>();
|
|
IApplicationConfigurationFileProvider fileProvider =
|
|
Mock.Of<IApplicationConfigurationFileProvider>();
|
|
|
|
var services = new ServiceCollection();
|
|
services.AddSingleton(resetProvider);
|
|
services.AddSingleton(fileProvider);
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
|
|
ServerConfigurationOptions? resolved =
|
|
DependencyInjectionStandardServer.ResolveServerConfigurationOptions(sp);
|
|
|
|
Assert.That(resolved, Is.Not.Null,
|
|
"standalone providers must produce a default options object to carry them");
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(resolved!.ResetProvider, Is.SameAs(resetProvider));
|
|
Assert.That(resolved.ConfigurationFileProvider, Is.SameAs(fileProvider));
|
|
Assert.That(resolved.HasSecureElement, Is.Null,
|
|
"no value options were registered, so the defaults must remain unset");
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public void StandaloneProvidersAugmentDirectlyRegisteredInstance()
|
|
{
|
|
IServerConfigurationResetProvider resetProvider = Mock.Of<IServerConfigurationResetProvider>();
|
|
IApplicationConfigurationFileProvider fileProvider =
|
|
Mock.Of<IApplicationConfigurationFileProvider>();
|
|
var instance = new ServerConfigurationOptions { HasSecureElement = true };
|
|
|
|
var services = new ServiceCollection();
|
|
services.AddSingleton(instance);
|
|
services.AddSingleton(resetProvider);
|
|
services.AddSingleton(fileProvider);
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
|
|
ServerConfigurationOptions? resolved =
|
|
DependencyInjectionStandardServer.ResolveServerConfigurationOptions(sp);
|
|
|
|
Assert.That(resolved, Is.SameAs(instance));
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(resolved!.ResetProvider, Is.SameAs(resetProvider),
|
|
"a standalone provider must be merged into the selected options");
|
|
Assert.That(resolved.ConfigurationFileProvider, Is.SameAs(fileProvider));
|
|
Assert.That(resolved.HasSecureElement, Is.True);
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public void InstanceProvidersAreNotOverwrittenByStandaloneProviders()
|
|
{
|
|
IServerConfigurationResetProvider ownResetProvider =
|
|
Mock.Of<IServerConfigurationResetProvider>();
|
|
IServerConfigurationResetProvider standaloneResetProvider =
|
|
Mock.Of<IServerConfigurationResetProvider>();
|
|
var instance = new ServerConfigurationOptions { ResetProvider = ownResetProvider };
|
|
|
|
var services = new ServiceCollection();
|
|
services.AddSingleton(instance);
|
|
services.AddSingleton(standaloneResetProvider);
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
|
|
ServerConfigurationOptions? resolved =
|
|
DependencyInjectionStandardServer.ResolveServerConfigurationOptions(sp);
|
|
|
|
Assert.That(resolved, Is.SameAs(instance));
|
|
Assert.That(resolved!.ResetProvider, Is.SameAs(ownResetProvider),
|
|
"a provider already set on the options must not be replaced by a standalone one");
|
|
}
|
|
|
|
[Test]
|
|
public void NoOptionsOrProvidersReturnsNull()
|
|
{
|
|
var services = new ServiceCollection();
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
|
|
ServerConfigurationOptions? resolved =
|
|
DependencyInjectionStandardServer.ResolveServerConfigurationOptions(sp);
|
|
|
|
Assert.That(resolved, Is.Null,
|
|
"with nothing registered the default identity-properties-only path must be used");
|
|
}
|
|
}
|
|
}
|