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>
222 lines
10 KiB
C#
222 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.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Options;
|
|
using Microsoft.Extensions.Time.Testing;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Client.TestFramework;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Client.Tests.ClientBuilder
|
|
{
|
|
/// <summary>
|
|
/// Covers recovery-timeout resolution, construction paths, and per-cycle session budgets.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Parallelizable]
|
|
public sealed class ChannelReconnectTimeoutTests
|
|
{
|
|
/// <summary>
|
|
/// Automatic recovery uses the largest usable setting and clamps arithmetic overflow.
|
|
/// </summary>
|
|
[TestCase(1000, 60000, 10000, 60000)]
|
|
[TestCase(30000, 60000, 10000, 90000)]
|
|
[TestCase(1000, 60000, 90000, 90000)]
|
|
[TestCase(1000, double.NaN, 2000, 3000)]
|
|
[TestCase(1000, double.PositiveInfinity, 2000, 3000)]
|
|
[TestCase(0, -1, -1, 3)]
|
|
[TestCase(int.MaxValue, 60000, int.MaxValue, 4294967294d)]
|
|
[TestCase(1000, double.MaxValue, 10000, 4294967294d)]
|
|
public void AutomaticTimeoutUsesLargestFiniteSettingWithoutOverflow(
|
|
int keepAliveInterval,
|
|
double sessionTimeout,
|
|
int operationTimeout,
|
|
double expectedMilliseconds)
|
|
{
|
|
TimeSpan timeout = ManagedSessionOptions.ResolveChannelReconnectTimeout(
|
|
null, keepAliveInterval, sessionTimeout, operationTimeout);
|
|
|
|
Assert.That(timeout, Is.EqualTo(TimeSpan.FromMilliseconds(expectedMilliseconds)));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Finite and infinite overrides take precedence and remain configurable through the builder.
|
|
/// </summary>
|
|
[TestCase(1L)]
|
|
[TestCase(10000L)]
|
|
[TestCase(42949672940000L)]
|
|
[TestCase(-10000L)]
|
|
public void ExplicitTimeoutOverridesAutomaticCalculation(long ticks)
|
|
{
|
|
var timeout = TimeSpan.FromTicks(ticks);
|
|
Assert.That(ManagedSessionOptions.ResolveChannelReconnectTimeout(
|
|
timeout, int.MaxValue, double.MaxValue, int.MaxValue), Is.EqualTo(timeout));
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
var builder = new ManagedSessionBuilder(CreateConfiguration(telemetry), telemetry);
|
|
|
|
Assert.That(builder.WithChannelReconnectTimeout(timeout), Is.SameAs(builder));
|
|
Assert.That(builder.Build().ChannelReconnectTimeout, Is.EqualTo(timeout));
|
|
Assert.That(builder.WithChannelReconnectTimeout(null).Build().ChannelReconnectTimeout, Is.Null);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Invalid timeout values fail consistently before fluent, direct, or DI construction connects.
|
|
/// </summary>
|
|
[TestCase(0L)]
|
|
[TestCase(-1L)]
|
|
[TestCase(-10001L)]
|
|
[TestCase(42949672940001L)]
|
|
[TestCase(long.MaxValue)]
|
|
[TestCase(long.MinValue)]
|
|
public async Task InvalidTimeoutIsRejectedByFluentDirectAndDiConstructionAsync(long ticks)
|
|
{
|
|
var timeout = TimeSpan.FromTicks(ticks);
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
ApplicationConfiguration configuration = CreateConfiguration(telemetry);
|
|
var options = new ManagedSessionOptions { ChannelReconnectTimeout = timeout };
|
|
var builder = new ManagedSessionBuilder(configuration, telemetry);
|
|
|
|
Assert.That(() => builder.WithChannelReconnectTimeout(timeout),
|
|
Throws.TypeOf<ArgumentOutOfRangeException>());
|
|
await Assert.ThatAsync(
|
|
() => Client.ManagedSession.CreateAsync(options, configuration, Mock.Of<ISessionFactory>()),
|
|
Throws.TypeOf<ArgumentOutOfRangeException>()).ConfigureAwait(false);
|
|
|
|
var services = new ServiceCollection();
|
|
services.AddOpcUa().AddClient(client =>
|
|
{
|
|
client.Configuration = configuration;
|
|
client.Session = options;
|
|
});
|
|
using ServiceProvider provider = services.BuildServiceProvider();
|
|
Assert.That(
|
|
() => provider.GetRequiredService<IOptions<OpcUaClientOptions>>().Value,
|
|
Throws.TypeOf<OptionsValidationException>()
|
|
.With.Property(nameof(OptionsValidationException.Failures))
|
|
.Some.Contains("ChannelReconnectTimeout"));
|
|
}
|
|
|
|
/// <summary>
|
|
/// DI passes automatic, infinite, and finite timeout settings to the connection builder.
|
|
/// </summary>
|
|
[TestCase(null)]
|
|
[TestCase(-1)]
|
|
[TestCase(1000)]
|
|
public async Task DiConstructionAppliesAutomaticInfiniteAndFiniteTimeoutsAsync(int? milliseconds)
|
|
{
|
|
TimeSpan? timeout = milliseconds.HasValue
|
|
? TimeSpan.FromMilliseconds(milliseconds.Value)
|
|
: null;
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
var services = new ServiceCollection();
|
|
services.AddOpcUa().AddClient(client =>
|
|
{
|
|
client.Configuration = CreateConfiguration(telemetry);
|
|
client.Session = new ManagedSessionOptions
|
|
{
|
|
ChannelReconnectTimeout = timeout,
|
|
Endpoint = new ConfiguredEndpoint(null!, new EndpointDescription
|
|
{
|
|
EndpointUrl = "opc.tcp://localhost:4840",
|
|
SecurityMode = MessageSecurityMode.None,
|
|
SecurityPolicyUri = SecurityPolicies.None
|
|
})
|
|
};
|
|
});
|
|
await using ServiceProvider provider = services.BuildServiceProvider();
|
|
ManagedSessionOptions options = provider.GetRequiredService<IOptions<OpcUaClientOptions>>().Value.Session;
|
|
TimeSpan? configuredTimeout = null;
|
|
bool configured = false;
|
|
|
|
await Assert.ThatAsync(
|
|
() => provider.ConnectManagedSessionAsync(options, builder =>
|
|
{
|
|
configuredTimeout = builder.Build().ChannelReconnectTimeout;
|
|
configured = true;
|
|
throw new InvalidOperationException("Stop before connecting.");
|
|
}, CancellationToken.None),
|
|
Throws.TypeOf<InvalidOperationException>().With.Message.EqualTo("Stop before connecting."))
|
|
.ConfigureAwait(false);
|
|
Assert.That(configured, Is.True);
|
|
Assert.That(configuredTimeout, Is.EqualTo(timeout));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Raw sessions impose no budget, and configured sessions sample changed settings only for a new cycle.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task SessionBudgetsPreserveRawDefaultsAndResampleOnlyOnTheNextCycleAsync()
|
|
{
|
|
var time = new FakeTimeProvider();
|
|
await using var session = SessionMock.Create();
|
|
session.Channel.SetupGet(channel => channel.OperationTimeout).Returns(1000);
|
|
session.KeepAliveInterval = 500;
|
|
var participant = (IReconnectParticipant)session;
|
|
Assert.That(participant.CreateReconnectBudget(time), Is.Null);
|
|
|
|
session.ConfigureChannelReconnectTimeout(null, requestedSessionTimeout: 5000);
|
|
IRetryBudget first = participant.CreateReconnectBudget(time)!;
|
|
Assert.That(first.TryConsume(out TimeSpan initial), Is.True);
|
|
Assert.That(initial, Is.EqualTo(TimeSpan.FromSeconds(5)));
|
|
|
|
time.Advance(TimeSpan.FromSeconds(1));
|
|
session.KeepAliveInterval = 10000;
|
|
Assert.That(first.TryConsume(out TimeSpan remaining), Is.True);
|
|
Assert.That(remaining, Is.EqualTo(TimeSpan.FromSeconds(4)));
|
|
IRetryBudget next = participant.CreateReconnectBudget(time)!;
|
|
Assert.That(next.TryConsume(out TimeSpan resampled), Is.True);
|
|
Assert.That(resampled, Is.EqualTo(TimeSpan.FromSeconds(30)));
|
|
|
|
session.ConfigureChannelReconnectTimeout(Timeout.InfiniteTimeSpan, requestedSessionTimeout: 5000);
|
|
IRetryBudget unlimited = participant.CreateReconnectBudget(time)!;
|
|
Assert.That(unlimited.TryConsume(out TimeSpan unbounded), Is.True);
|
|
Assert.That(unbounded, Is.EqualTo(TimeSpan.MaxValue));
|
|
time.Advance(TimeSpan.FromDays(100));
|
|
Assert.That(unlimited.IsExhausted, Is.False);
|
|
Assert.That(first.IsExhausted, Is.True);
|
|
Assert.That(next.IsExhausted, Is.True);
|
|
}
|
|
|
|
private static ApplicationConfiguration CreateConfiguration(ITelemetryContext telemetry)
|
|
{
|
|
return new ApplicationConfiguration(telemetry)
|
|
{
|
|
ApplicationUri = "urn:test:channel-reconnect-timeout",
|
|
ApplicationName = "channel-reconnect-timeout",
|
|
ClientConfiguration = new ClientConfiguration()
|
|
};
|
|
}
|
|
}
|
|
}
|