mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-20 16:52:07 +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>
241 lines
9.5 KiB
C#
241 lines
9.5 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.Collections.Generic;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Logging;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
|
|
namespace Opc.Ua.Server.Tests.NodeManager
|
|
{
|
|
/// <summary>
|
|
/// Verifies that a sampled Bad_NodeIdUnknown produced by a real NodeManager read
|
|
/// does not permanently block a MonitoredItem queue, mirroring the read loop that
|
|
/// <see cref="SamplingGroup"/> runs for sampled data change items.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("NodeManager")]
|
|
[Category("MonitoredItem")]
|
|
[Parallelizable]
|
|
public sealed class SampledBadNodeIdUnknownRecoveryTests
|
|
{
|
|
[Test]
|
|
public async Task TransientBadNodeIdUnknownSampleRecoversToTheNextGoodValueAsync()
|
|
{
|
|
Mock<IServerInternal> server = DeterministicServerMock.Create(
|
|
out MonitoredItemQueueFactory queueFactory);
|
|
using (queueFactory)
|
|
{
|
|
var logger = new Mock<ILogger>();
|
|
using var manager = new UnresolvableNodeManager(
|
|
server.Object,
|
|
CreateConfiguration(),
|
|
logger.Object);
|
|
var asyncManager = new AsyncNodeManagerAdapter(manager);
|
|
NodeId nodeId = manager.UnresolvableNodeId;
|
|
using MonitoredItem item = CreateMonitoredItem(server.Object, asyncManager, nodeId);
|
|
|
|
manager.NodeIsResolvable = false;
|
|
(DataValue badValue, ServiceResult badError) =
|
|
await SampleAsync(asyncManager, nodeId).ConfigureAwait(false);
|
|
item.QueueValue(badValue, badError);
|
|
|
|
manager.NodeIsResolvable = true;
|
|
(DataValue goodValue, ServiceResult goodError) =
|
|
await SampleAsync(asyncManager, nodeId).ConfigureAwait(false);
|
|
item.QueueValue(goodValue, goodError);
|
|
|
|
var notifications = new Queue<MonitoredItemNotification>();
|
|
var diagnostics = new Queue<DiagnosticInfo>();
|
|
bool more = item.Publish(
|
|
new OperationContext(item),
|
|
notifications,
|
|
diagnostics,
|
|
10,
|
|
logger.Object);
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(
|
|
badError.StatusCode.Code,
|
|
Is.EqualTo(StatusCodes.BadNodeIdUnknown),
|
|
"the node manager read must produce the sampled bad status");
|
|
Assert.That(
|
|
ServiceResult.IsGood(goodError),
|
|
Is.True,
|
|
"the recovered read must succeed");
|
|
Assert.That(
|
|
goodValue.WrappedValue,
|
|
Is.EqualTo(new Variant(42)),
|
|
"the recovered read must return the node value");
|
|
Assert.That(((IDetachableMonitoredItem)item).IsDeleted, Is.False);
|
|
Assert.That(notifications, Has.Count.EqualTo(1));
|
|
Assert.That(
|
|
notifications.Peek().Value.StatusCode.Code,
|
|
Is.EqualTo(StatusCodes.Good),
|
|
"published status");
|
|
Assert.That(
|
|
notifications.Peek().Value.WrappedValue,
|
|
Is.EqualTo(new Variant(42)));
|
|
Assert.That(more, Is.False);
|
|
});
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Runs the same read and queue sequence that SamplingGroup performs per sample.
|
|
/// </summary>
|
|
private static async Task<(DataValue Value, ServiceResult Error)> SampleAsync(
|
|
AsyncNodeManagerAdapter manager,
|
|
NodeId nodeId)
|
|
{
|
|
var nodesToRead = new List<ReadValueId>
|
|
{
|
|
new() { NodeId = nodeId, AttributeId = Attributes.Value }
|
|
};
|
|
var values = new List<DataValue> { default };
|
|
var errors = new List<ServiceResult> { null! };
|
|
|
|
await manager.ReadAsync(
|
|
new OperationContext(
|
|
new RequestHeader(),
|
|
null,
|
|
RequestType.Read,
|
|
RequestLifetime.None),
|
|
0,
|
|
nodesToRead,
|
|
values,
|
|
errors).ConfigureAwait(false);
|
|
|
|
return (values[0], errors[0]);
|
|
}
|
|
|
|
private static ApplicationConfiguration CreateConfiguration()
|
|
{
|
|
return new ApplicationConfiguration
|
|
{
|
|
ServerConfiguration = new ServerConfiguration
|
|
{
|
|
MaxNotificationQueueSize = 100,
|
|
AvailableSamplingRates = []
|
|
}
|
|
};
|
|
}
|
|
|
|
private static MonitoredItem CreateMonitoredItem(
|
|
IServerInternal server,
|
|
IAsyncNodeManager nodeManager,
|
|
NodeId nodeId)
|
|
{
|
|
return new MonitoredItem(
|
|
server,
|
|
nodeManager,
|
|
new object(),
|
|
subscriptionId: 1,
|
|
id: 2,
|
|
itemToMonitor: new ReadValueId
|
|
{
|
|
NodeId = nodeId,
|
|
AttributeId = Attributes.Value
|
|
},
|
|
diagnosticsMasks: DiagnosticsMasks.None,
|
|
timestampsToReturn: TimestampsToReturn.Both,
|
|
monitoringMode: MonitoringMode.Reporting,
|
|
clientHandle: 3,
|
|
originalFilter: null,
|
|
filterToUse: null,
|
|
range: null,
|
|
samplingInterval: 0,
|
|
queueSize: 1,
|
|
discardOldest: true,
|
|
sourceSamplingInterval: 0);
|
|
}
|
|
|
|
/// <summary>
|
|
/// A NodeManager whose node resolves through the unvalidated handle path, so a
|
|
/// read reports Bad_NodeIdUnknown while the node cannot be resolved.
|
|
/// </summary>
|
|
private sealed class UnresolvableNodeManager : CustomNodeManager2
|
|
{
|
|
public UnresolvableNodeManager(
|
|
IServerInternal server,
|
|
ApplicationConfiguration configuration,
|
|
ILogger logger)
|
|
: base(server, configuration, false, logger, DeterministicServerMock.TestNamespaceUri)
|
|
{
|
|
UnresolvableNodeId = new NodeId("Sampled", NamespaceIndex);
|
|
m_node = new BaseDataVariableState(null);
|
|
m_node.CreateAsPredefinedNode(SystemContext);
|
|
m_node.NodeId = UnresolvableNodeId;
|
|
m_node.BrowseName = new QualifiedName("Sampled", NamespaceIndex);
|
|
m_node.DisplayName = new LocalizedText("Sampled");
|
|
m_node.DataType = DataTypeIds.Int32;
|
|
m_node.ValueRank = ValueRanks.Scalar;
|
|
m_node.Value = 42;
|
|
}
|
|
|
|
public NodeId UnresolvableNodeId { get; }
|
|
|
|
public bool NodeIsResolvable { get; set; }
|
|
|
|
protected override NodeHandle GetManagerHandle(
|
|
ServerSystemContext context,
|
|
NodeId nodeId,
|
|
IDictionary<NodeId, NodeState> cache)
|
|
{
|
|
if (!IsNodeIdInNamespace(nodeId) || nodeId != UnresolvableNodeId)
|
|
{
|
|
return null!;
|
|
}
|
|
|
|
// Report an unvalidated handle so the read has to resolve the node,
|
|
// exactly like a NodeManager that serves component paths.
|
|
return new NodeHandle { NodeId = nodeId, Node = null!, Validated = false };
|
|
}
|
|
|
|
protected override NodeState ValidateNode(
|
|
ServerSystemContext context,
|
|
NodeHandle handle,
|
|
IDictionary<NodeId, NodeState> cache)
|
|
{
|
|
if (!NodeIsResolvable)
|
|
{
|
|
return null!;
|
|
}
|
|
|
|
handle.Node = m_node;
|
|
handle.Validated = true;
|
|
return m_node;
|
|
}
|
|
|
|
private readonly BaseDataVariableState m_node;
|
|
}
|
|
}
|
|
} |