mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-21 09:06:37 +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>
365 lines
17 KiB
C#
365 lines
17 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.Threading;
|
|
using System.Threading.Tasks;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
|
|
namespace Opc.Ua.Server.Tests.NodeManager
|
|
{
|
|
/// <summary>
|
|
/// Verifies how the HistoryRead dispatch manages the session's history continuation points
|
|
/// across the operations of one request (Part 4 §7.9).
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("NodeManager")]
|
|
public sealed class HistoryReadContinuationDispatchTests
|
|
{
|
|
/// <summary>
|
|
/// Verifies that a request with more operations than MaxHistoryContinuationPoints gets
|
|
/// Bad_NoContinuationPoints for the overflow and keeps the points it returns.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task OverflowingRequestReportsNoContinuationPointsWithoutEvictingItsOwnAsync()
|
|
{
|
|
using var harness = new HistoryHarness(maxHistory: 2);
|
|
var created = new List<TrackingPoint>();
|
|
harness.SaveForEveryOperation(created);
|
|
|
|
(ArrayOf<HistoryReadResult> results, _) = await harness.ReadAsync(3).ConfigureAwait(false);
|
|
|
|
Assert.That(results, Has.Count.EqualTo(3));
|
|
Assert.That(results[0].StatusCode, Is.EqualTo(StatusCodes.Good));
|
|
Assert.That(results[1].StatusCode, Is.EqualTo(StatusCodes.Good));
|
|
Assert.That(results[2].StatusCode, Is.EqualTo(StatusCodes.BadNoContinuationPoints));
|
|
Assert.That(results[2].ContinuationPoint.IsEmpty, Is.True);
|
|
Assert.That(created[0].Disposed, Is.False);
|
|
Assert.That(created[1].Disposed, Is.False);
|
|
Assert.That(harness.Points.RestoreHistory(results[0].ContinuationPoint), Is.SameAs(created[0]));
|
|
Assert.That(harness.Points.RestoreHistory(results[1].ContinuationPoint), Is.SameAs(created[1]));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Verifies that a request may still free a continuation point from a prior request.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task RequestEvictsContinuationPointsFromPriorRequestsAsync()
|
|
{
|
|
using var harness = new HistoryHarness(maxHistory: 1);
|
|
var prior = new TrackingPoint();
|
|
harness.Points.SaveHistory(prior);
|
|
var created = new List<TrackingPoint>();
|
|
harness.SaveForEveryOperation(created);
|
|
|
|
(ArrayOf<HistoryReadResult> results, _) = await harness.ReadAsync(1).ConfigureAwait(false);
|
|
|
|
Assert.That(results[0].StatusCode, Is.EqualTo(StatusCodes.Good));
|
|
Assert.That(prior.Disposed, Is.True);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Verifies that a faulted request releases the continuation points it had already saved,
|
|
/// because the client never receives them, while points of earlier requests survive.
|
|
/// </summary>
|
|
[Test]
|
|
public void FaultedRequestReleasesItsSavedContinuationPoints()
|
|
{
|
|
using var harness = new HistoryHarness(maxHistory: 10);
|
|
var prior = new TrackingPoint();
|
|
harness.Points.SaveHistory(prior);
|
|
var created = new List<TrackingPoint>();
|
|
harness.SaveForEveryOperation(created, failAtOperation: 2);
|
|
|
|
Assert.ThrowsAsync<InvalidOperationException>(
|
|
async () => await harness.ReadAsync(3).ConfigureAwait(false));
|
|
|
|
Assert.That(created, Has.Count.EqualTo(2));
|
|
Assert.That(created[0].Disposed, Is.True);
|
|
Assert.That(created[1].Disposed, Is.True);
|
|
Assert.That(prior.Disposed, Is.False);
|
|
Assert.That(harness.Points.RestoreHistory(ToByteString(created[0].Id)), Is.Null);
|
|
Assert.That(harness.Points.RestoreHistory(ToByteString(prior.Id)), Is.SameAs(prior));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Verifies that a faulted request releases a continuation point a node manager saved
|
|
/// before it failed without assigning the point to a result, since the client never
|
|
/// receives its identifier (Part 4 §7.9).
|
|
/// </summary>
|
|
[Test]
|
|
public void FaultedRequestReleasesPointSavedWithoutResult()
|
|
{
|
|
using var harness = new HistoryHarness(maxHistory: 10);
|
|
var saved = new TrackingPoint();
|
|
harness.SaveThenThrow(saved);
|
|
|
|
Assert.ThrowsAsync<OperationCanceledException>(
|
|
async () => await harness.ReadAsync(1).ConfigureAwait(false));
|
|
|
|
Assert.That(saved.Disposed, Is.True);
|
|
Assert.That(harness.Points.RestoreHistory(ToByteString(saved.Id)), Is.Null);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Verifies that a faulted request keeps a continuation point whose identifier the client
|
|
/// supplied, even when a node manager saved it again within the request, because the
|
|
/// client still holds it.
|
|
/// </summary>
|
|
[Test]
|
|
public void FaultedRequestKeepsClientSuppliedContinuationPoint()
|
|
{
|
|
using var harness = new HistoryHarness(maxHistory: 10);
|
|
var continued = new TrackingPoint();
|
|
harness.Points.SaveHistory(continued);
|
|
harness.RestoreSaveThenThrow();
|
|
|
|
Assert.ThrowsAsync<OperationCanceledException>(
|
|
async () => await harness.ReadAsync(1, ToByteString(continued.Id)).ConfigureAwait(false));
|
|
|
|
Assert.That(continued.Disposed, Is.False);
|
|
Assert.That(harness.Points.RestoreHistory(ToByteString(continued.Id)), Is.SameAs(continued));
|
|
}
|
|
|
|
private static ByteString ToByteString(Guid id)
|
|
{
|
|
return new ByteString(id.ToByteArray());
|
|
}
|
|
|
|
/// <summary>
|
|
/// A history continuation point that records its disposal.
|
|
/// </summary>
|
|
private sealed class TrackingPoint : IHistoryContinuationPoint
|
|
{
|
|
public Guid Id { get; } = Guid.NewGuid();
|
|
|
|
public bool Disposed { get; private set; }
|
|
|
|
public void Dispose()
|
|
{
|
|
Disposed = true;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Supplies a master manager with one mocked node manager and a session continuation store.
|
|
/// </summary>
|
|
private sealed class HistoryHarness : IDisposable
|
|
{
|
|
public HistoryHarness(int maxHistory)
|
|
{
|
|
Mock<IServerInternal> server = DeterministicServerMock.Create(out m_queues);
|
|
var factory = new Mock<IMainNodeManagerFactory>();
|
|
factory.Setup(value => value.CreateConfigurationNodeManager())
|
|
.Returns(new Mock<IConfigurationNodeManager>().Object);
|
|
factory.Setup(value => value.CreateCoreNodeManager(It.IsAny<ushort>()))
|
|
.Returns(new Mock<ICoreNodeManager>().Object);
|
|
server.SetupGet(value => value.MainNodeManagerFactory).Returns(factory.Object);
|
|
var handle = new NodeHandle { NodeId = new NodeId(1, 1) };
|
|
m_nodeId = handle.NodeId;
|
|
var metadata = new NodeMetadata(handle, handle.NodeId) { NodeClass = NodeClass.Variable };
|
|
Manager.SetupGet(value => value.NamespaceUris).Returns([DeterministicServerMock.TestNamespaceUri]);
|
|
Manager.Setup(value => value.GetNodeMetadataAsync(
|
|
It.IsAny<OperationContext>(), It.IsAny<object>(),
|
|
It.IsAny<BrowseResultMask>(), It.IsAny<CancellationToken>()))
|
|
.ReturnsAsync(metadata);
|
|
Manager.Setup(value => value.GetManagerHandleAsync(
|
|
It.IsAny<NodeId>(), It.IsAny<CancellationToken>()))
|
|
.ReturnsAsync(handle);
|
|
Master = new MasterNodeManager(
|
|
server.Object,
|
|
new ApplicationConfiguration { ServerConfiguration = new ServerConfiguration() },
|
|
null,
|
|
Manager.Object);
|
|
Points = new SessionContinuationPoints(() => new NodeId(99, 1), 10, maxHistory, null);
|
|
var session = new Mock<ISession>();
|
|
session.SetupGet(value => value.EffectiveIdentity).Returns(new UserIdentity());
|
|
session.SetupGet(value => value.ContinuationPoints).Returns(Points);
|
|
Context = new OperationContext(
|
|
new RequestHeader(), null!, RequestType.HistoryRead, RequestLifetime.None, session.Object);
|
|
}
|
|
|
|
public Mock<IAsyncNodeManager> Manager { get; } = new();
|
|
|
|
public MasterNodeManager Master { get; }
|
|
|
|
public SessionContinuationPoints Points { get; }
|
|
|
|
public OperationContext Context { get; }
|
|
|
|
/// <summary>
|
|
/// Makes the node manager save a new continuation point for every operation, the way a
|
|
/// historian does when a node has more values than requested; optionally throws before
|
|
/// handling the given operation.
|
|
/// </summary>
|
|
public void SaveForEveryOperation(List<TrackingPoint> created, int failAtOperation = -1)
|
|
{
|
|
Manager.Setup(value => value.HistoryReadAsync(
|
|
It.IsAny<OperationContext>(), It.IsAny<HistoryReadDetails>(),
|
|
It.IsAny<TimestampsToReturn>(), It.IsAny<bool>(),
|
|
It.IsAny<ArrayOf<HistoryReadValueId>>(), It.IsAny<IList<HistoryReadResult>>(),
|
|
It.IsAny<IList<ServiceResult>>(), It.IsAny<CancellationToken>()))
|
|
.Returns((OperationContext context, HistoryReadDetails _, TimestampsToReturn _, bool _,
|
|
ArrayOf<HistoryReadValueId> nodesToRead, IList<HistoryReadResult> results,
|
|
IList<ServiceResult> errors, CancellationToken cancellationToken) =>
|
|
new ValueTask(SaveAllAsync(
|
|
context, nodesToRead, results, errors, created, failAtOperation, cancellationToken)));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Makes the node manager save the given point and then observe cancellation before
|
|
/// it assigns the point to a result.
|
|
/// </summary>
|
|
public void SaveThenThrow(TrackingPoint point)
|
|
{
|
|
Manager.Setup(value => value.HistoryReadAsync(
|
|
It.IsAny<OperationContext>(), It.IsAny<HistoryReadDetails>(),
|
|
It.IsAny<TimestampsToReturn>(), It.IsAny<bool>(),
|
|
It.IsAny<ArrayOf<HistoryReadValueId>>(), It.IsAny<IList<HistoryReadResult>>(),
|
|
It.IsAny<IList<ServiceResult>>(), It.IsAny<CancellationToken>()))
|
|
.Returns((OperationContext context, HistoryReadDetails _, TimestampsToReturn _, bool _,
|
|
ArrayOf<HistoryReadValueId> _, IList<HistoryReadResult> _,
|
|
IList<ServiceResult> _, CancellationToken cancellationToken) =>
|
|
new ValueTask(SaveThenThrowAsync(context, point, cancellationToken)));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Makes the node manager continue the client's point, save the same point again and
|
|
/// then observe cancellation before it assigns the point to a result.
|
|
/// </summary>
|
|
public void RestoreSaveThenThrow()
|
|
{
|
|
Manager.Setup(value => value.HistoryReadAsync(
|
|
It.IsAny<OperationContext>(), It.IsAny<HistoryReadDetails>(),
|
|
It.IsAny<TimestampsToReturn>(), It.IsAny<bool>(),
|
|
It.IsAny<ArrayOf<HistoryReadValueId>>(), It.IsAny<IList<HistoryReadResult>>(),
|
|
It.IsAny<IList<ServiceResult>>(), It.IsAny<CancellationToken>()))
|
|
.Returns((OperationContext context, HistoryReadDetails _, TimestampsToReturn _, bool _,
|
|
ArrayOf<HistoryReadValueId> nodesToRead, IList<HistoryReadResult> _,
|
|
IList<ServiceResult> _, CancellationToken cancellationToken) =>
|
|
new ValueTask(RestoreSaveThenThrowAsync(context, nodesToRead, cancellationToken)));
|
|
}
|
|
|
|
private static async Task SaveThenThrowAsync(
|
|
OperationContext context,
|
|
TrackingPoint point,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
await context.Session.ContinuationPoints
|
|
.SaveHistoryAsync(point, cancellationToken).ConfigureAwait(false);
|
|
throw new OperationCanceledException();
|
|
}
|
|
|
|
private static async Task RestoreSaveThenThrowAsync(
|
|
OperationContext context,
|
|
ArrayOf<HistoryReadValueId> nodesToRead,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
IHistoryContinuationPoint point = (await context.Session.ContinuationPoints
|
|
.RestoreHistoryAsync(nodesToRead[0].ContinuationPoint, cancellationToken)
|
|
.ConfigureAwait(false))!;
|
|
await context.Session.ContinuationPoints
|
|
.SaveHistoryAsync(point!, cancellationToken).ConfigureAwait(false);
|
|
throw new OperationCanceledException();
|
|
}
|
|
|
|
private static async Task SaveAllAsync(
|
|
OperationContext context,
|
|
ArrayOf<HistoryReadValueId> nodesToRead,
|
|
IList<HistoryReadResult> results,
|
|
IList<ServiceResult> errors,
|
|
List<TrackingPoint> created,
|
|
int failAtOperation,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
for (int ii = 0; ii < nodesToRead.Count; ii++)
|
|
{
|
|
if (ii == failAtOperation)
|
|
{
|
|
throw new InvalidOperationException("node manager failure");
|
|
}
|
|
nodesToRead[ii].Processed = true;
|
|
var point = new TrackingPoint();
|
|
created.Add(point);
|
|
try
|
|
{
|
|
await context.Session.ContinuationPoints
|
|
.SaveHistoryAsync(point, cancellationToken).ConfigureAwait(false);
|
|
results[ii] = new HistoryReadResult
|
|
{
|
|
StatusCode = StatusCodes.Good,
|
|
ContinuationPoint = ToByteString(point.Id)
|
|
};
|
|
errors[ii] = ServiceResult.Good;
|
|
}
|
|
catch (ServiceResultException e)
|
|
{
|
|
results[ii] = new HistoryReadResult { StatusCode = e.StatusCode };
|
|
errors[ii] = e.StatusCode;
|
|
}
|
|
}
|
|
}
|
|
|
|
public ValueTask<(ArrayOf<HistoryReadResult> values, ArrayOf<DiagnosticInfo> diagnosticInfos)> ReadAsync(
|
|
int count,
|
|
ByteString continuationPoint = default)
|
|
{
|
|
var nodesToRead = new HistoryReadValueId[count];
|
|
for (int ii = 0; ii < count; ii++)
|
|
{
|
|
nodesToRead[ii] = new HistoryReadValueId
|
|
{
|
|
NodeId = m_nodeId,
|
|
ContinuationPoint = continuationPoint
|
|
};
|
|
}
|
|
return Master.HistoryReadAsync(
|
|
Context,
|
|
new ExtensionObject(new ReadRawModifiedDetails()),
|
|
TimestampsToReturn.Neither,
|
|
false,
|
|
nodesToRead.ToArrayOf());
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
Points.Clear();
|
|
Context.Dispose();
|
|
Master.Dispose();
|
|
m_queues.Dispose();
|
|
}
|
|
|
|
private readonly NodeId m_nodeId;
|
|
private readonly MonitoredItemQueueFactory m_queues;
|
|
}
|
|
}
|
|
}
|