mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-23 02:00:00 +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>
253 lines
10 KiB
C#
253 lines
10 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2025 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.Linq;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Redundancy;
|
|
using Opc.Ua.Redundancy.Server;
|
|
using Opc.Ua.Server.Hosting;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Server.Tests.Redundancy
|
|
{
|
|
/// <summary>
|
|
/// Unit tests for the fluent registration extensions
|
|
/// (<see cref="DistributedServerBuilderExtensions"/>,
|
|
/// <see cref="DistributedSessionMirroringBuilderExtensions"/>,
|
|
/// <see cref="DistributedSubscriptionBuilderExtensions"/> and
|
|
/// <see cref="ServerRedundancyBuilderExtensions"/>): the null-builder guards and that the registered
|
|
/// factories resolve the expected services from dependency injection.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Distributed")]
|
|
[Parallelizable(ParallelScope.All)]
|
|
public sealed class DistributedBuilderExtensionsTests
|
|
{
|
|
[Test]
|
|
public void AddServerServiceLevelThrowsOnNullBuilder()
|
|
{
|
|
Assert.That(
|
|
() => DistributedServerBuilderExtensions.AddServerServiceLevel(
|
|
null!, new ConstantServiceLevelProvider()),
|
|
Throws.ArgumentNullException);
|
|
}
|
|
|
|
[Test]
|
|
public void AddServerServiceLevelThrowsOnNullProvider()
|
|
{
|
|
var builder = new DiTestServerBuilder();
|
|
|
|
Assert.That(
|
|
() => builder.AddServerServiceLevel(null!),
|
|
Throws.ArgumentNullException);
|
|
}
|
|
|
|
[Test]
|
|
public void AddServerServiceLevelRegistersProviderAndStartupTask()
|
|
{
|
|
var builder = new DiTestServerBuilder();
|
|
var provider = new ConstantServiceLevelProvider(123);
|
|
|
|
IOpcUaServerBuilder result = builder.AddServerServiceLevel(provider);
|
|
|
|
Assert.That(result, Is.SameAs(builder));
|
|
using ServiceProvider sp = builder.Services.BuildServiceProvider();
|
|
Assert.That(sp.GetRequiredService<IServiceLevelProvider>(), Is.SameAs(provider));
|
|
Assert.That(sp.GetServices<IServerStartupTask>().ToArray(),
|
|
Has.Some.InstanceOf<ServiceLevelStartupTask>());
|
|
}
|
|
|
|
[Test]
|
|
public async Task ServiceLevelCompositionRegistersOnlyOnePublisherAsync()
|
|
{
|
|
var builder = new DiTestServerBuilder();
|
|
var provider = new ConstantServiceLevelProvider(210);
|
|
builder.UseDistributedAddressSpace()
|
|
.AddServerServiceLevel(new ConstantServiceLevelProvider(240))
|
|
.AddServerServiceLevel(provider);
|
|
|
|
await using ServiceProvider services = builder.Services.BuildServiceProvider();
|
|
|
|
Assert.That(services.GetRequiredService<IServiceLevelProvider>(), Is.SameAs(provider));
|
|
Assert.That(services.GetServices<IServerStartupTask>().OfType<ServiceLevelStartupTask>().Count(),
|
|
Is.EqualTo(1));
|
|
}
|
|
|
|
[Test]
|
|
public void UseDistributedAddressSpaceThrowsOnNullBuilder()
|
|
{
|
|
Assert.That(
|
|
() => DistributedServerBuilderExtensions.UseDistributedAddressSpace(null!),
|
|
Throws.ArgumentNullException);
|
|
}
|
|
|
|
[Test]
|
|
public async Task UseDistributedAddressSpaceRegistersCustomRecordProtectorAsync()
|
|
{
|
|
var builder = new DiTestServerBuilder();
|
|
|
|
builder.UseDistributedAddressSpace(options =>
|
|
options.RecordProtectorFactory = _ => NullRecordProtector.Instance);
|
|
|
|
await using ServiceProvider sp = builder.Services.BuildServiceProvider();
|
|
Assert.That(sp.GetRequiredService<IRecordProtector>(), Is.SameAs(NullRecordProtector.Instance));
|
|
Assert.That(sp.GetServices<IServerStartupTask>().ToArray(), Is.Not.Empty);
|
|
}
|
|
|
|
[Test]
|
|
public async Task UseDistributedAddressSpaceRegistersDistributedValueCacheAsync()
|
|
{
|
|
var builder = new DiTestServerBuilder();
|
|
|
|
builder.UseDistributedAddressSpace();
|
|
|
|
await using ServiceProvider sp = builder.Services.BuildServiceProvider();
|
|
|
|
IDistributedValueCache cache = sp.GetRequiredService<IDistributedValueCache>();
|
|
Assert.That(cache, Is.Not.Null);
|
|
|
|
// Before the server starts, the node-state store registry is not
|
|
// populated, so the injected cache fails fast rather than silently
|
|
// dropping writes to a store that does not exist yet.
|
|
Assert.That(
|
|
async () => await cache.TryGetAsync(new NodeId("v", 1), System.TimeSpan.FromMinutes(1)).ConfigureAwait(false),
|
|
Throws.InvalidOperationException);
|
|
}
|
|
|
|
[Test]
|
|
public void UseDistributedSessionsThrowsOnNullBuilder()
|
|
{
|
|
Assert.That(
|
|
() => DistributedServerBuilderExtensions.UseDistributedSessions(null!),
|
|
Throws.ArgumentNullException);
|
|
}
|
|
|
|
[Test]
|
|
public void UseDistributedSessionsRegistersSessionManagerFactory()
|
|
{
|
|
var builder = new DiTestServerBuilder();
|
|
|
|
builder.UseDistributedSessions(options => options.EnableFastReconnect = true);
|
|
|
|
using ServiceProvider sp = builder.Services.BuildServiceProvider();
|
|
Assert.That(sp.GetRequiredService<ISessionManagerFactory>(),
|
|
Is.InstanceOf<DistributedSessionManagerFactory>());
|
|
}
|
|
|
|
[Test]
|
|
public void UseDistributedSessionMirroringThrowsOnNullBuilder()
|
|
{
|
|
Assert.That(
|
|
() => DistributedSessionMirroringBuilderExtensions.UseDistributedSessionMirroring(null!),
|
|
Throws.ArgumentNullException);
|
|
}
|
|
|
|
[Test]
|
|
public void UseDistributedSessionMirroringRegistersSessionManagerFactory()
|
|
{
|
|
var builder = new DiTestServerBuilder();
|
|
|
|
builder.UseDistributedSessionMirroring();
|
|
|
|
using ServiceProvider sp = builder.Services.BuildServiceProvider();
|
|
Assert.That(sp.GetRequiredService<ISessionManagerFactory>(),
|
|
Is.InstanceOf<DistributedSessionManagerFactory>());
|
|
}
|
|
|
|
[Test]
|
|
public void UseDistributedSubscriptionMirroringThrowsOnNullBuilder()
|
|
{
|
|
Assert.That(
|
|
() => DistributedSubscriptionBuilderExtensions.UseDistributedSubscriptionMirroring(null!),
|
|
Throws.ArgumentNullException);
|
|
}
|
|
|
|
[Test]
|
|
public async Task UseDistributedSubscriptionMirroringRegistersSubscriptionStoreAsync()
|
|
{
|
|
var builder = new DiTestServerBuilder();
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
IServiceMessageContext context = ServiceMessageContext.CreateEmpty(telemetry);
|
|
builder.Services.AddSingleton(context);
|
|
builder.Services.AddSingleton(telemetry);
|
|
|
|
builder.UseDistributedSubscriptionMirroring();
|
|
|
|
await using ServiceProvider sp = builder.Services.BuildServiceProvider();
|
|
Assert.That(sp.GetRequiredService<ISubscriptionStore>(),
|
|
Is.InstanceOf<SharedKeyValueSubscriptionStore>());
|
|
}
|
|
|
|
[Test]
|
|
public void AddServerRedundancyThrowsOnNullBuilder()
|
|
{
|
|
Assert.That(
|
|
() => ServerRedundancyBuilderExtensions.AddServerRedundancy(null!),
|
|
Throws.ArgumentNullException);
|
|
}
|
|
|
|
[Test]
|
|
public void AddRequestServerStateChangeThrowsOnNullBuilder()
|
|
{
|
|
Assert.That(
|
|
() => ServerRedundancyBuilderExtensions.AddRequestServerStateChange(null!),
|
|
Throws.ArgumentNullException);
|
|
}
|
|
|
|
[Test]
|
|
public void AddRequestServerStateChangeRegistersStartupTask()
|
|
{
|
|
var builder = new DiTestServerBuilder();
|
|
|
|
builder.AddRequestServerStateChange();
|
|
|
|
using ServiceProvider sp = builder.Services.BuildServiceProvider();
|
|
Assert.That(sp.GetServices<IServerStartupTask>().ToArray(),
|
|
Has.Some.InstanceOf<RequestServerStateChangeStartupTask>());
|
|
}
|
|
|
|
[Test]
|
|
public void AddManualFailoverDelegatesToRequestServerStateChange()
|
|
{
|
|
var builder = new DiTestServerBuilder();
|
|
|
|
#pragma warning disable CS0618 // exercising the obsolete alias on purpose
|
|
IOpcUaServerBuilder result = builder.AddManualFailover();
|
|
#pragma warning restore CS0618
|
|
|
|
Assert.That(result, Is.SameAs(builder));
|
|
using ServiceProvider sp = builder.Services.BuildServiceProvider();
|
|
Assert.That(sp.GetServices<IServerStartupTask>().ToArray(),
|
|
Has.Some.InstanceOf<RequestServerStateChangeStartupTask>());
|
|
}
|
|
}
|
|
}
|