mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 06:31:35 +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>
264 lines
10 KiB
C#
264 lines
10 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/
|
|
* ======================================================================*/
|
|
|
|
using System;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using BenchmarkDotNet.Attributes;
|
|
using Microsoft.Extensions.Logging;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Client.TestFramework;
|
|
|
|
namespace Opc.Ua.Client.ComplexTypes.Tests
|
|
{
|
|
/// <summary>
|
|
/// Node cache resolver tests.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Client")]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
[TestFixtureSource(nameof(FixtureArgs))]
|
|
[MemoryDiagnoser]
|
|
[DisassemblyDiagnoser]
|
|
public class NodeCacheResolverTests : ClientTestFramework
|
|
{
|
|
public NodeCacheResolverTests()
|
|
: base(Utils.UriSchemeOpcTcp)
|
|
{
|
|
}
|
|
|
|
public NodeCacheResolverTests(string uriScheme = Utils.UriSchemeOpcTcp)
|
|
: base(uriScheme)
|
|
{
|
|
}
|
|
|
|
public static readonly NodeId[] TypeSystems =
|
|
[
|
|
ObjectIds.OPCBinarySchema_TypeSystem,
|
|
ObjectIds.XmlSchema_TypeSystem
|
|
];
|
|
|
|
/// <summary>
|
|
/// Set up a Server and a Client instance.
|
|
/// </summary>
|
|
[OneTimeSetUp]
|
|
public override Task OneTimeSetUpAsync()
|
|
{
|
|
SupportsExternalServerUrl = true;
|
|
return base.OneTimeSetUpAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tear down the Server and the Client.
|
|
/// </summary>
|
|
[OneTimeTearDown]
|
|
public override Task OneTimeTearDownAsync()
|
|
{
|
|
return base.OneTimeTearDownAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Test setup.
|
|
/// </summary>
|
|
[SetUp]
|
|
public override Task SetUpAsync()
|
|
{
|
|
return base.SetUpAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Test teardown.
|
|
/// </summary>
|
|
[TearDown]
|
|
public override Task TearDownAsync()
|
|
{
|
|
return base.TearDownAsync();
|
|
}
|
|
|
|
[Test]
|
|
[Order(100)]
|
|
public async Task LoadStandardDataTypeSystemAsync()
|
|
{
|
|
var nodeResolver = new NodeCacheResolver(Session, Telemetry);
|
|
ServiceResultException sre = Assert
|
|
.ThrowsAsync<ServiceResultException>(async () =>
|
|
{
|
|
System.Collections.Generic.IReadOnlyDictionary<NodeId, DataDictionary> t
|
|
= await nodeResolver
|
|
.LoadDataTypeSystem(ObjectIds.ObjectAttributes_Encoding_DefaultBinary)
|
|
.ConfigureAwait(false);
|
|
});
|
|
Assert.That(sre.StatusCode, Is.EqualTo(StatusCodes.BadNodeIdInvalid));
|
|
System.Collections.Generic.IReadOnlyDictionary<NodeId, DataDictionary> typeSystem
|
|
= await nodeResolver
|
|
.LoadDataTypeSystem()
|
|
.ConfigureAwait(false);
|
|
Assert.That(typeSystem, Is.Not.Null);
|
|
typeSystem = await nodeResolver
|
|
.LoadDataTypeSystem(ObjectIds.OPCBinarySchema_TypeSystem)
|
|
.ConfigureAwait(false);
|
|
Assert.That(typeSystem, Is.Not.Null);
|
|
typeSystem = await nodeResolver.LoadDataTypeSystem(ObjectIds.XmlSchema_TypeSystem)
|
|
.ConfigureAwait(false);
|
|
Assert.That(typeSystem, Is.Not.Null);
|
|
}
|
|
|
|
[Test]
|
|
public async Task LoadDataTypesAsyncStopsOnCyclicSubtypeGraphAsync()
|
|
{
|
|
var root = new NodeId("Root", 2);
|
|
var childA = new NodeId("A", 2);
|
|
var childB = new NodeId("B", 2);
|
|
|
|
var nodeCache = new Mock<INodeCache>(MockBehavior.Strict);
|
|
nodeCache.SetupGet(x => x.NamespaceUris).Returns(Session.NamespaceUris);
|
|
nodeCache.Setup(x => x.GetReferencesAsync(
|
|
It.IsAny<ArrayOf<NodeId>>(),
|
|
It.IsAny<ArrayOf<NodeId>>(),
|
|
false,
|
|
false,
|
|
It.IsAny<CancellationToken>()))
|
|
.Returns((ArrayOf<NodeId> ids, ArrayOf<NodeId> _, bool _, bool _, CancellationToken _) =>
|
|
{
|
|
var result = new System.Collections.Generic.List<INode>();
|
|
foreach (NodeId nodeId in ids)
|
|
{
|
|
if (nodeId == root)
|
|
{
|
|
result.Add(new Node { NodeId = childA, BrowseName = new QualifiedName("A") });
|
|
}
|
|
else if (nodeId == childA)
|
|
{
|
|
result.Add(new Node { NodeId = childB, BrowseName = new QualifiedName("B") });
|
|
}
|
|
else if (nodeId == childB)
|
|
{
|
|
result.Add(new Node { NodeId = childA, BrowseName = new QualifiedName("A") });
|
|
}
|
|
}
|
|
return new ValueTask<ArrayOf<INode>>(
|
|
new ArrayOf<INode>(result.ToArray().AsMemory()));
|
|
});
|
|
|
|
var nodeResolver = new NodeCacheResolver(Session, nodeCache.Object, Telemetry);
|
|
ArrayOf<INode> dataTypes = await nodeResolver.LoadDataTypesAsync(
|
|
NodeId.ToExpandedNodeId(root, Session.NamespaceUris),
|
|
nestedSubTypes: true,
|
|
filterUATypes: false,
|
|
ct: CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(dataTypes.Count, Is.EqualTo(2));
|
|
Assert.That(dataTypes[0].BrowseName.Name, Is.EqualTo("A"));
|
|
Assert.That(dataTypes[1].BrowseName.Name, Is.EqualTo("B"));
|
|
}
|
|
|
|
[Test]
|
|
public async Task GetEnumTypeArrayAsyncUsesNamedPropertyAsync()
|
|
{
|
|
var typeId = new NodeId("MyEnum", 2);
|
|
var unrelatedPropertyId = new NodeId("NodeVersion", 2);
|
|
var enumValuesPropertyId = new NodeId("EnumValues", 2);
|
|
|
|
var expected = new ArrayOf<ExtensionObject>();
|
|
var nodeCache = new Mock<INodeCache>(MockBehavior.Strict);
|
|
nodeCache.SetupGet(x => x.NamespaceUris).Returns(Session.NamespaceUris);
|
|
nodeCache.Setup(x => x.GetReferencesAsync(
|
|
typeId,
|
|
ReferenceTypeIds.HasProperty,
|
|
false,
|
|
false,
|
|
It.IsAny<CancellationToken>()))
|
|
.Returns(new ValueTask<ArrayOf<INode>>(new ArrayOf<INode>(
|
|
new INode[]
|
|
{
|
|
new Node { NodeId = unrelatedPropertyId, BrowseName = new QualifiedName("NodeVersion") },
|
|
new Node { NodeId = enumValuesPropertyId, BrowseName = new QualifiedName("EnumValues") }
|
|
}.AsMemory())));
|
|
nodeCache.Setup(x => x.GetValueAsync(
|
|
enumValuesPropertyId,
|
|
It.IsAny<CancellationToken>()))
|
|
.Returns(new ValueTask<DataValue>(new DataValue(new Variant(expected))));
|
|
|
|
var resolver = new NodeCacheResolver(Session, nodeCache.Object, Telemetry);
|
|
Variant result = await resolver.GetEnumTypeArrayAsync(
|
|
NodeId.ToExpandedNodeId(typeId, Session.NamespaceUris),
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(result.TryGetValue(out ArrayOf<ExtensionObject> actual), Is.True);
|
|
Assert.That(actual, Is.EqualTo(expected));
|
|
}
|
|
|
|
[Test]
|
|
[Order(110)]
|
|
[TestCaseSource(nameof(TypeSystems))]
|
|
public async Task LoadAllServerDataTypeSystemsAsync(NodeId dataTypeSystem)
|
|
{
|
|
// find the dictionary for the description.
|
|
var browser = new Browser(Session)
|
|
{
|
|
BrowseDirection = BrowseDirection.Forward,
|
|
ReferenceTypeId = ReferenceTypeIds.HasComponent,
|
|
IncludeSubtypes = false,
|
|
NodeClassMask = 0
|
|
};
|
|
|
|
ArrayOf<ReferenceDescription> references =
|
|
await browser.BrowseAsync(dataTypeSystem).ConfigureAwait(false);
|
|
Assert.That(references.IsNull, Is.False);
|
|
|
|
ILogger logger = Telemetry.CreateLogger<NodeCacheResolverTests>();
|
|
if (logger.IsEnabled(LogLevel.Information))
|
|
{
|
|
logger.LogInformation(" Found {Count} references", references.Count);
|
|
}
|
|
|
|
// read all type dictionaries in the type system
|
|
var nodeResolver = new NodeCacheResolver(Session, Telemetry);
|
|
foreach (ReferenceDescription r in references.ToList())
|
|
{
|
|
var dictionaryId = ExpandedNodeId.ToNodeId(r.NodeId, Session.NamespaceUris);
|
|
if (logger.IsEnabled(LogLevel.Information))
|
|
{
|
|
logger.LogInformation(" ReadDictionary {Name} {Id}", r.BrowseName.Name, dictionaryId);
|
|
}
|
|
DataDictionary dictionaryToLoad = await nodeResolver
|
|
.LoadDictionaryAsync(dictionaryId, r.BrowseName.Name!)
|
|
.ConfigureAwait(false);
|
|
|
|
// internal API for testing only
|
|
byte[] dictionary = await nodeResolver.ReadDictionaryAsync(dictionaryId)
|
|
.ConfigureAwait(false);
|
|
dictionaryToLoad.Validate(dictionary, true, logger);
|
|
}
|
|
}
|
|
}
|
|
}
|