mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-20 08:41:51 +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>
243 lines
9.2 KiB
C#
243 lines
9.2 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/
|
|
* ======================================================================*/
|
|
|
|
#pragma warning disable CA2007
|
|
|
|
using System;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Server.Tests.NodeManager
|
|
{
|
|
[TestFixture]
|
|
[Category("NodeManager")]
|
|
[Parallelizable]
|
|
public class PredefinedNodesAddressSpaceTests
|
|
{
|
|
[Test]
|
|
public void NodesSkipsInstanceChildrenWhoseParentIsAlsoPredefined()
|
|
{
|
|
NodeIdDictionary<NodeState> predefinedNodes = [];
|
|
BaseObjectState parent = CreateObject("Parent");
|
|
BaseObjectState child = CreateObject("Child", parent);
|
|
predefinedNodes[parent.NodeId] = parent;
|
|
predefinedNodes[child.NodeId] = child;
|
|
|
|
PredefinedNodesAddressSpace addressSpace = CreateAddressSpace(predefinedNodes);
|
|
|
|
NodeState[] nodes = [.. addressSpace.Nodes];
|
|
|
|
Assert.That(nodes, Has.Length.EqualTo(1));
|
|
Assert.That(nodes[0], Is.SameAs(parent));
|
|
}
|
|
|
|
[Test]
|
|
public async Task AddOrUpdateNodeAsyncInvokesDelegateAndRaisesEventAsync()
|
|
{
|
|
NodeState? added = null;
|
|
NodeState? observed = null;
|
|
BaseObjectState node = CreateObject("Added");
|
|
NodeIdDictionary<NodeState> predefinedNodes = [];
|
|
var addressSpace = new PredefinedNodesAddressSpace(
|
|
CreateContext(),
|
|
predefinedNodes,
|
|
(n, _) =>
|
|
{
|
|
added = n;
|
|
predefinedNodes[n.NodeId] = n;
|
|
return default;
|
|
},
|
|
(_, _) => new ValueTask<bool>(false));
|
|
addressSpace.NodeAdded += n => observed = n;
|
|
|
|
await addressSpace.AddOrUpdateNodeAsync(node).ConfigureAwait(false);
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(added, Is.SameAs(node));
|
|
Assert.That(observed, Is.SameAs(node));
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public async Task AddOrUpdateNodeAsyncPublishesRegisteredActiveNodeAsync()
|
|
{
|
|
NodeIdDictionary<NodeState> predefinedNodes = [];
|
|
BaseObjectState input = CreateObject("Replaced");
|
|
var active = new FolderState(null)
|
|
{
|
|
NodeId = input.NodeId,
|
|
BrowseName = input.BrowseName
|
|
};
|
|
NodeState? observed = null;
|
|
var addressSpace = new PredefinedNodesAddressSpace(
|
|
CreateContext(),
|
|
predefinedNodes,
|
|
(_, _) =>
|
|
{
|
|
predefinedNodes[active.NodeId] = active;
|
|
return default;
|
|
},
|
|
(_, _) => new ValueTask<bool>(false));
|
|
addressSpace.NodeAdded += node => observed = node;
|
|
|
|
await addressSpace.AddOrUpdateNodeAsync(input).ConfigureAwait(false);
|
|
|
|
Assert.That(observed, Is.SameAs(active));
|
|
Assert.That(addressSpace.TryGetNode(active.NodeId, out NodeState? registered), Is.True);
|
|
Assert.That(observed, Is.SameAs(registered));
|
|
}
|
|
|
|
[Test]
|
|
public async Task AddOrUpdateNodeAsyncRejectsUnregisteredResultAsync()
|
|
{
|
|
PredefinedNodesAddressSpace addressSpace = CreateAddressSpace([]);
|
|
bool notified = false;
|
|
addressSpace.NodeAdded += _ => notified = true;
|
|
|
|
await Assert.ThatAsync(
|
|
async () => await addressSpace.AddOrUpdateNodeAsync(CreateObject("Missing")).ConfigureAwait(false),
|
|
Throws.InvalidOperationException.With.Message.Contains("without registering")).ConfigureAwait(false);
|
|
|
|
Assert.That(notified, Is.False);
|
|
}
|
|
|
|
[Test]
|
|
public async Task AddOrUpdateRangeAsyncInvokesDelegateForEachNodeAsync()
|
|
{
|
|
int count = 0;
|
|
var addressSpace = new PredefinedNodesAddressSpace(
|
|
CreateContext(),
|
|
[],
|
|
(_, ct) =>
|
|
{
|
|
ct.ThrowIfCancellationRequested();
|
|
count++;
|
|
return default;
|
|
},
|
|
(_, _) => new ValueTask<bool>(false));
|
|
|
|
await addressSpace.AddOrUpdateRangeAsync(
|
|
[CreateObject("One"), CreateObject("Two")],
|
|
CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(count, Is.EqualTo(2));
|
|
}
|
|
|
|
[Test]
|
|
public async Task RemoveNodeAsyncRaisesEventOnlyWhenDelegateRemovesNodeAsync()
|
|
{
|
|
NodeId nodeId = new("Removed", 2);
|
|
NodeId? observed = null;
|
|
var addressSpace = new PredefinedNodesAddressSpace(
|
|
CreateContext(),
|
|
[],
|
|
(_, _) => default,
|
|
(id, _) => new ValueTask<bool>(id == nodeId));
|
|
addressSpace.NodeRemoved += id => observed = id;
|
|
|
|
bool removed = await addressSpace.RemoveNodeAsync(nodeId).ConfigureAwait(false);
|
|
bool missing = await addressSpace.RemoveNodeAsync(new NodeId("Missing", 2)).ConfigureAwait(false);
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(removed, Is.True);
|
|
Assert.That(missing, Is.False);
|
|
Assert.That(observed, Is.EqualTo(nodeId));
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public void TryGetNodeReturnsNodeFromDictionary()
|
|
{
|
|
NodeIdDictionary<NodeState> predefinedNodes = [];
|
|
BaseObjectState node = CreateObject("Lookup");
|
|
predefinedNodes[node.NodeId] = node;
|
|
PredefinedNodesAddressSpace addressSpace = CreateAddressSpace(predefinedNodes);
|
|
|
|
bool found = addressSpace.TryGetNode(node.NodeId, out NodeState? result);
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(found, Is.True);
|
|
Assert.That(result, Is.SameAs(node));
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public void ConstructorValidatesRequiredArguments()
|
|
{
|
|
ISystemContext context = CreateContext();
|
|
NodeIdDictionary<NodeState> predefinedNodes = [];
|
|
static ValueTask addAsync(NodeState node, CancellationToken ct) => default;
|
|
static ValueTask<bool> removeAsync(NodeId nodeId, CancellationToken ct) => new(false);
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.Throws<ArgumentNullException>(() =>
|
|
new PredefinedNodesAddressSpace(null!, predefinedNodes, addAsync, removeAsync));
|
|
Assert.Throws<ArgumentNullException>(() =>
|
|
new PredefinedNodesAddressSpace(context, null!, addAsync, removeAsync));
|
|
Assert.Throws<ArgumentNullException>(() =>
|
|
new PredefinedNodesAddressSpace(context, predefinedNodes, null!, removeAsync));
|
|
Assert.Throws<ArgumentNullException>(() =>
|
|
new PredefinedNodesAddressSpace(context, predefinedNodes, addAsync, null!));
|
|
});
|
|
}
|
|
|
|
private static PredefinedNodesAddressSpace CreateAddressSpace(
|
|
NodeIdDictionary<NodeState> predefinedNodes)
|
|
{
|
|
return new PredefinedNodesAddressSpace(
|
|
CreateContext(),
|
|
predefinedNodes,
|
|
(_, _) => default,
|
|
(_, _) => new ValueTask<bool>(false));
|
|
}
|
|
|
|
private static SystemContext CreateContext()
|
|
{
|
|
return new SystemContext(NUnitTelemetryContext.Create());
|
|
}
|
|
|
|
private static BaseObjectState CreateObject(string name, NodeState? parent = null)
|
|
{
|
|
return new BaseObjectState(parent)
|
|
{
|
|
NodeId = new NodeId(name, 2),
|
|
BrowseName = new QualifiedName(name, 2),
|
|
DisplayName = new LocalizedText(name)
|
|
};
|
|
}
|
|
}
|
|
}
|