mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-17 05:11:13 +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>
150 lines
6.6 KiB
C#
150 lines
6.6 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/
|
|
* ======================================================================*/
|
|
|
|
// CA2007: tests run without a SynchronizationContext; ConfigureAwait(false)
|
|
// adds noise without a behavioural benefit. Disabled file-level for the suite.
|
|
#pragma warning disable CA2007
|
|
|
|
using System.Collections.Generic;
|
|
using System.Threading.Tasks;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Server.Tests.Redundancy
|
|
{
|
|
/// <summary>
|
|
/// Tests the <see cref="ILocalAddressSpace"/> adapter exposed by
|
|
/// <see cref="CustomNodeManager2"/>.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Distributed")]
|
|
[Parallelizable(ParallelScope.All)]
|
|
public sealed class CustomNodeManagerAddressSpaceTests
|
|
{
|
|
private const ushort NamespaceIndex = 1;
|
|
private const string NamespaceUri = "urn:test:custom-node-manager-address-space";
|
|
|
|
[Test]
|
|
public async Task CreateLocalAddressSpaceAdaptsPredefinedNodes()
|
|
{
|
|
Mock<IServerInternal> server = CreateServer();
|
|
using var nodeManager = new TestNodeManager(server.Object, NamespaceUri);
|
|
BaseDataVariableState root = NewVariable("root", null);
|
|
BaseDataVariableState child = NewVariable("child", root);
|
|
BaseDataVariableState secondRoot = NewVariable("second-root", null);
|
|
root.AddChild(child);
|
|
nodeManager.AddPredefinedNodePublic(nodeManager.SystemContext, root);
|
|
nodeManager.AddPredefinedNodePublic(nodeManager.SystemContext, secondRoot);
|
|
|
|
var source = (ILocalAddressSpaceSource)nodeManager;
|
|
ILocalAddressSpace addressSpace = source.CreateLocalAddressSpace();
|
|
|
|
Assert.That(addressSpace.Context, Is.SameAs(nodeManager.SystemContext));
|
|
Assert.That(
|
|
addressSpace.Nodes,
|
|
Has.Exactly(1).Property(nameof(NodeState.NodeId)).EqualTo(root.NodeId));
|
|
Assert.That(
|
|
addressSpace.Nodes,
|
|
Has.Exactly(1).Property(nameof(NodeState.NodeId)).EqualTo(secondRoot.NodeId));
|
|
Assert.That(addressSpace.Nodes, Has.None.Property(nameof(NodeState.NodeId)).EqualTo(child.NodeId));
|
|
Assert.That(addressSpace.TryGetNode(root.NodeId, out NodeState? found), Is.True);
|
|
Assert.That(found, Is.SameAs(root));
|
|
|
|
BaseDataVariableState added = NewVariable("added", null);
|
|
NodeState? addedEventNode = null;
|
|
addressSpace.NodeAdded += node => addedEventNode = node;
|
|
|
|
await addressSpace.AddOrUpdateNodeAsync(added).ConfigureAwait(false);
|
|
|
|
Assert.That(addedEventNode, Is.SameAs(added));
|
|
Assert.That(addressSpace.TryGetNode(added.NodeId, out NodeState? addedFound), Is.True);
|
|
Assert.That(addedFound, Is.SameAs(added));
|
|
|
|
NodeId? removedEventNodeId = null;
|
|
addressSpace.NodeRemoved += nodeId => removedEventNodeId = nodeId;
|
|
|
|
bool removed = await addressSpace.RemoveNodeAsync(added.NodeId).ConfigureAwait(false);
|
|
|
|
Assert.That(removed, Is.True);
|
|
Assert.That(removedEventNodeId, Is.EqualTo(added.NodeId));
|
|
Assert.That(addressSpace.TryGetNode(added.NodeId, out _), Is.False);
|
|
Assert.That(await addressSpace.RemoveNodeAsync(added.NodeId).ConfigureAwait(false), Is.False);
|
|
}
|
|
|
|
private static BaseDataVariableState NewVariable(string id, NodeState? parent)
|
|
{
|
|
return new BaseDataVariableState(parent)
|
|
{
|
|
NodeId = new NodeId(id, NamespaceIndex),
|
|
BrowseName = new QualifiedName(id, NamespaceIndex),
|
|
DisplayName = new LocalizedText(id),
|
|
DataType = DataTypeIds.Double,
|
|
ValueRank = ValueRanks.Scalar,
|
|
Value = new Variant(1.0)
|
|
};
|
|
}
|
|
|
|
private static Mock<IServerInternal> CreateServer()
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
var namespaceUris = new NamespaceTable();
|
|
namespaceUris.GetIndexOrAppend(NamespaceUri);
|
|
var serverUris = new StringTable();
|
|
var server = new Mock<IServerInternal>();
|
|
var masterNodeManager = new Mock<IMasterNodeManager>();
|
|
server.Setup(s => s.NamespaceUris).Returns(namespaceUris);
|
|
server.Setup(s => s.ServerUris).Returns(serverUris);
|
|
server.Setup(s => s.TypeTree).Returns(new TypeTable(namespaceUris));
|
|
server.Setup(s => s.Factory).Returns(EncodeableFactory.Create());
|
|
server.Setup(s => s.Telemetry).Returns(telemetry);
|
|
server.Setup(s => s.NodeManager).Returns(masterNodeManager.Object);
|
|
server.Setup(s => s.DefaultSystemContext).Returns(new ServerSystemContext(server.Object));
|
|
return server;
|
|
}
|
|
|
|
private sealed class TestNodeManager : CustomNodeManager2
|
|
{
|
|
public TestNodeManager(IServerInternal server, params string[] namespaceUris)
|
|
: base(server, namespaceUris)
|
|
{
|
|
}
|
|
|
|
public void AddPredefinedNodePublic(ISystemContext context, NodeState node)
|
|
{
|
|
AddPredefinedNode(context, node);
|
|
}
|
|
|
|
public override void CreateAddressSpace(IDictionary<NodeId, IList<IReference>> externalReferences)
|
|
{
|
|
}
|
|
}
|
|
}
|
|
}
|