mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-23 10:23: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>
377 lines
18 KiB
C#
377 lines
18 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.Collections.Generic;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Server.AliasNames;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Server.Tests.AliasNames
|
|
{
|
|
/// <summary>
|
|
/// Verifies opt-in alias materialization through the normal configuration
|
|
/// node manager and its factory without starting a network listener.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("AliasNames")]
|
|
[Parallelizable]
|
|
public sealed class StandardAliasMaterializationOptionsTests
|
|
{
|
|
[SetUp]
|
|
public async Task SetUpAsync()
|
|
{
|
|
m_registry = new AliasNameStoreRegistry();
|
|
m_store = new InMemoryAliasNameStore(
|
|
[
|
|
new AliasNameCategoryDescriptor(
|
|
ObjectIds.TagVariables,
|
|
new QualifiedName(BrowseNames.TagVariables),
|
|
AliasNameCapabilities.All)
|
|
]);
|
|
m_registry.Register(m_store);
|
|
await m_store.AddAliasesAsync(
|
|
ObjectIds.TagVariables,
|
|
[
|
|
new AliasAddRequest(
|
|
kAliasName,
|
|
new ExpandedNodeId(kTargetName, 1),
|
|
null,
|
|
ReferenceTypeIds.AliasFor)
|
|
],
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
|
|
m_server = CreateServer();
|
|
m_configuration = new ApplicationConfiguration
|
|
{
|
|
ServerConfiguration = new ServerConfiguration(),
|
|
SecurityConfiguration = new SecurityConfiguration()
|
|
};
|
|
}
|
|
|
|
[TearDown]
|
|
public void TearDown()
|
|
{
|
|
m_server?.Dispose();
|
|
m_registry?.Dispose();
|
|
m_store?.Dispose();
|
|
}
|
|
|
|
[Test]
|
|
public void MaterializationIsDisabledByDefault()
|
|
{
|
|
var options = new AliasNameServerOptions();
|
|
|
|
Assert.That(options.MaterializeAliasNodes, Is.False);
|
|
}
|
|
|
|
[Test]
|
|
public async Task MaterializedStandardAliasesRefreshByDefaultAsync()
|
|
{
|
|
await using var manager = new ConfigurationNodeManager(
|
|
m_server,
|
|
m_configuration,
|
|
NullLogger.Instance,
|
|
timeProvider: null,
|
|
coordinator: null,
|
|
pendingKeyStore: null,
|
|
keyGenerator: null,
|
|
trustListEffectHandler: null,
|
|
serverConfigurationOptions: null,
|
|
aliasNameOptions: new AliasNameServerOptions { MaterializeAliasNodes = true });
|
|
await AssertMaterializationAsync(manager, enabled: true).ConfigureAwait(false);
|
|
AliasNameCategoryState category =
|
|
manager.FindPredefinedNode<AliasNameCategoryState>(ObjectIds.TagVariables);
|
|
ushort ns = m_server.NamespaceUris.GetIndexOrAppend(Ua.Namespaces.OpcUa + "Diagnostics");
|
|
var aliasId = new NodeId(Utils.Format("{0}.Added", ObjectIds.TagVariables), ns);
|
|
var published = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
|
|
category.OnStateChanged += (_, _, _) =>
|
|
{
|
|
if (manager.FindPredefinedNode<AliasNameState>(aliasId) != null)
|
|
{
|
|
published.TrySetResult(true);
|
|
}
|
|
};
|
|
|
|
await m_store.AddAliasesAsync(ObjectIds.TagVariables,
|
|
[new AliasAddRequest("Added", new ExpandedNodeId(kTargetName, 1), null, ReferenceTypeIds.AliasFor)])
|
|
.ConfigureAwait(false);
|
|
await published.Task.WaitAsync(TimeSpan.FromSeconds(10)).ConfigureAwait(false);
|
|
Assert.That(category.ReferenceExists(ReferenceTypeIds.Organizes, false, aliasId), Is.True);
|
|
AliasNameState alias = manager.FindPredefinedNode<AliasNameState>(aliasId);
|
|
Assert.That(alias.ReferenceExists(
|
|
ReferenceTypeIds.AliasFor, false, new NodeId(kTargetName, 1)), Is.True);
|
|
|
|
var removed = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
|
|
category.OnStateChanged += (_, _, _) =>
|
|
{
|
|
if (manager.FindPredefinedNode<AliasNameState>(aliasId) == null)
|
|
{
|
|
removed.TrySetResult(true);
|
|
}
|
|
};
|
|
await m_store.DeleteAliasesAsync(ObjectIds.TagVariables,
|
|
[new AliasDeleteRequest("Added", new ExpandedNodeId(kTargetName, 1))]).ConfigureAwait(false);
|
|
await removed.Task.WaitAsync(TimeSpan.FromSeconds(10)).ConfigureAwait(false);
|
|
|
|
Assert.That(manager.FindPredefinedNode<AliasNameState>(aliasId), Is.Null);
|
|
Assert.That(category.ReferenceExists(ReferenceTypeIds.Organizes, false, aliasId), Is.False);
|
|
}
|
|
|
|
[TestCase(false)]
|
|
[TestCase(true)]
|
|
public async Task ConfigurationManagerHonorsMaterializationOptionAsync(bool enabled)
|
|
{
|
|
using var manager = new ConfigurationNodeManager(
|
|
m_server,
|
|
m_configuration,
|
|
NullLogger.Instance,
|
|
timeProvider: null,
|
|
coordinator: null,
|
|
pendingKeyStore: null,
|
|
keyGenerator: null,
|
|
trustListEffectHandler: null,
|
|
serverConfigurationOptions: new ServerConfigurationOptions { HasSecureElement = true },
|
|
aliasNameOptions: new AliasNameServerOptions { MaterializeAliasNodes = enabled });
|
|
|
|
await AssertMaterializationAsync(manager, enabled).ConfigureAwait(false);
|
|
|
|
ServerConfigurationState configuration =
|
|
manager.FindPredefinedNode<ServerConfigurationState>(ObjectIds.ServerConfiguration);
|
|
Assert.That(configuration.HasSecureElement, Is.Not.Null,
|
|
"The new overload must also retain the existing ServerConfiguration options.");
|
|
}
|
|
|
|
[TestCase(false)]
|
|
[TestCase(true)]
|
|
public async Task FactoryPropagatesMaterializationOptionAsync(bool enabled)
|
|
{
|
|
var factory = new MainNodeManagerFactory(
|
|
m_configuration,
|
|
m_server,
|
|
coordinator: null,
|
|
pendingKeyStore: null,
|
|
keyGenerator: null,
|
|
trustListEffectHandler: null,
|
|
serverConfigurationOptions: new ServerConfigurationOptions { HasSecureElement = true },
|
|
aliasNameOptions: new AliasNameServerOptions { MaterializeAliasNodes = enabled });
|
|
using var manager = (ConfigurationNodeManager)factory.CreateConfigurationNodeManager();
|
|
|
|
await AssertMaterializationAsync(manager, enabled).ConfigureAwait(false);
|
|
|
|
ServerConfigurationState configuration =
|
|
manager.FindPredefinedNode<ServerConfigurationState>(ObjectIds.ServerConfiguration);
|
|
Assert.That(configuration.HasSecureElement, Is.Not.Null,
|
|
"The factory must continue forwarding the existing ServerConfiguration options.");
|
|
}
|
|
|
|
[TestCase(false)]
|
|
[TestCase(true)]
|
|
public async Task NullOptionsLeaveMaterializationDisabledAsync(bool throughFactory)
|
|
{
|
|
using ConfigurationNodeManager manager = throughFactory
|
|
? (ConfigurationNodeManager)new MainNodeManagerFactory(
|
|
m_configuration,
|
|
m_server,
|
|
coordinator: null,
|
|
pendingKeyStore: null,
|
|
keyGenerator: null,
|
|
trustListEffectHandler: null,
|
|
serverConfigurationOptions: null,
|
|
aliasNameOptions: null).CreateConfigurationNodeManager()
|
|
: new ConfigurationNodeManager(
|
|
m_server,
|
|
m_configuration,
|
|
NullLogger.Instance,
|
|
timeProvider: null,
|
|
coordinator: null,
|
|
pendingKeyStore: null,
|
|
keyGenerator: null,
|
|
trustListEffectHandler: null,
|
|
serverConfigurationOptions: null,
|
|
aliasNameOptions: null);
|
|
|
|
await AssertMaterializationAsync(manager, enabled: false).ConfigureAwait(false);
|
|
}
|
|
|
|
[TestCase(2)]
|
|
[TestCase(3)]
|
|
[TestCase(4)]
|
|
[TestCase(9)]
|
|
public async Task ExistingConfigurationConstructorsLeaveMaterializationDisabledAsync(int parameterCount)
|
|
{
|
|
using ConfigurationNodeManager manager = parameterCount switch
|
|
{
|
|
2 => new ConfigurationNodeManager(m_server, m_configuration),
|
|
3 => new ConfigurationNodeManager(m_server, m_configuration, NullLogger.Instance),
|
|
4 => new ConfigurationNodeManager(m_server, m_configuration, NullLogger.Instance, timeProvider: null),
|
|
9 => new ConfigurationNodeManager(
|
|
m_server,
|
|
m_configuration,
|
|
NullLogger.Instance,
|
|
timeProvider: null,
|
|
coordinator: null,
|
|
pendingKeyStore: null,
|
|
keyGenerator: null,
|
|
trustListEffectHandler: null,
|
|
serverConfigurationOptions: null),
|
|
_ => throw new ArgumentOutOfRangeException(nameof(parameterCount))
|
|
};
|
|
|
|
await AssertMaterializationAsync(manager, enabled: false).ConfigureAwait(false);
|
|
}
|
|
|
|
[TestCase(2)]
|
|
[TestCase(3)]
|
|
[TestCase(7)]
|
|
public async Task ExistingFactoryConstructorsLeaveMaterializationDisabledAsync(int parameterCount)
|
|
{
|
|
MainNodeManagerFactory factory = parameterCount switch
|
|
{
|
|
2 => new MainNodeManagerFactory(m_configuration, m_server),
|
|
3 => new MainNodeManagerFactory(m_configuration, m_server, coordinator: null),
|
|
7 => new MainNodeManagerFactory(
|
|
m_configuration,
|
|
m_server,
|
|
coordinator: null,
|
|
pendingKeyStore: null,
|
|
keyGenerator: null,
|
|
trustListEffectHandler: null,
|
|
serverConfigurationOptions: null),
|
|
_ => throw new ArgumentOutOfRangeException(nameof(parameterCount))
|
|
};
|
|
using var manager = (ConfigurationNodeManager)factory.CreateConfigurationNodeManager();
|
|
|
|
await AssertMaterializationAsync(manager, enabled: false).ConfigureAwait(false);
|
|
}
|
|
|
|
private IServerInternal CreateServer()
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
var namespaces = new NamespaceTable();
|
|
namespaces.Append("urn:opcfoundation.org:tests:standard-alias-materialization");
|
|
var serverUris = new StringTable();
|
|
var factory = EncodeableFactory.Create();
|
|
var server = new Mock<IServerInternal>();
|
|
server.As<IAliasNameStoreRegistryProvider>()
|
|
.Setup(provider => provider.AliasNameStoreRegistry)
|
|
.Returns(m_registry);
|
|
server.Setup(instance => instance.Telemetry).Returns(telemetry);
|
|
server.Setup(instance => instance.NamespaceUris).Returns(namespaces);
|
|
server.Setup(instance => instance.ServerUris).Returns(serverUris);
|
|
server.Setup(instance => instance.TypeTree).Returns(new TypeTable(namespaces));
|
|
server.Setup(instance => instance.Factory).Returns(factory);
|
|
server.Setup(instance => instance.MessageContext)
|
|
.Returns(new ServiceMessageContext(telemetry, factory)
|
|
{
|
|
NamespaceUris = namespaces,
|
|
ServerUris = serverUris
|
|
});
|
|
server.Setup(instance => instance.CoreNodeManager).Returns(Mock.Of<ICoreNodeManager>());
|
|
server.Setup(instance => instance.NodeManager).Returns(Mock.Of<IMasterNodeManager>());
|
|
server.Setup(instance => instance.SubscriptionManager).Returns(Mock.Of<ISubscriptionManager>());
|
|
server.Setup(instance => instance.DefaultSystemContext)
|
|
.Returns(new ServerSystemContext(server.Object));
|
|
return server.Object;
|
|
}
|
|
|
|
private async Task AssertMaterializationAsync(ConfigurationNodeManager manager, bool enabled)
|
|
{
|
|
var externalReferences = new Dictionary<NodeId, IList<IReference>>();
|
|
await manager.CreateAddressSpaceAsync(externalReferences, CancellationToken.None).ConfigureAwait(false);
|
|
|
|
AliasNameCategoryState category =
|
|
manager.FindPredefinedNode<AliasNameCategoryState>(ObjectIds.TagVariables);
|
|
Assert.That(category, Is.Not.Null);
|
|
Assert.That(category.FindAlias, Is.Not.Null);
|
|
Assert.That(category.FindAlias.OnCallAsync, Is.Not.Null,
|
|
"Alias query methods must remain available independently of materialization.");
|
|
|
|
ushort namespaceIndex = m_server.NamespaceUris.GetIndexOrAppend(Ua.Namespaces.OpcUa + "Diagnostics");
|
|
var aliasId = new NodeId(Utils.Format("{0}.{1}", ObjectIds.TagVariables, kAliasName), namespaceIndex);
|
|
AliasNameState alias = manager.FindPredefinedNode<AliasNameState>(aliasId);
|
|
var targetId = new NodeId(kTargetName, 1);
|
|
|
|
if (enabled)
|
|
{
|
|
Assert.That(alias, Is.Not.Null);
|
|
Assert.That(alias.TypeDefinitionId, Is.EqualTo(ObjectTypeIds.AliasNameType));
|
|
Assert.That(alias.BrowseName, Is.EqualTo(new QualifiedName(kAliasName, namespaceIndex)));
|
|
Assert.That(category.ReferenceExists(ReferenceTypeIds.Organizes, false, aliasId), Is.True);
|
|
Assert.That(alias.ReferenceExists(ReferenceTypeIds.AliasFor, false, targetId), Is.True);
|
|
Assert.That(externalReferences.TryGetValue(targetId, out IList<IReference>? references), Is.True);
|
|
Assert.That(references, Has.Count.EqualTo(1));
|
|
Assert.That(references[0].ReferenceTypeId, Is.EqualTo(ReferenceTypeIds.AliasFor));
|
|
Assert.That(references[0].IsInverse, Is.True);
|
|
Assert.That(references[0].TargetId, Is.EqualTo(new ExpandedNodeId(aliasId)));
|
|
Assert.That(category.FindAliasVerbose?.OnCallAsync, Is.Not.Null);
|
|
Assert.That(category.AddAliasesToCategory?.OnCallAsync, Is.Not.Null);
|
|
Assert.That(category.DeleteAliasesFromCategory?.OnCallAsync, Is.Not.Null);
|
|
Assert.That(category.LastChange, Is.Not.Null);
|
|
}
|
|
else
|
|
{
|
|
Assert.That(alias, Is.Null);
|
|
Assert.That(externalReferences.ContainsKey(targetId), Is.False);
|
|
Assert.That(category.FindAliasVerbose, Is.Null);
|
|
Assert.That(category.AddAliasesToCategory, Is.Null);
|
|
Assert.That(category.DeleteAliasesFromCategory, Is.Null);
|
|
}
|
|
|
|
var output = new List<Variant>();
|
|
ServiceResult result = await category.FindAlias.CallAsync(
|
|
manager.SystemContext,
|
|
category.NodeId,
|
|
[new Variant(kAliasName), new Variant(NodeId.Null)],
|
|
[],
|
|
output,
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(ServiceResult.IsGood(result), Is.True);
|
|
Assert.That(output, Has.Count.EqualTo(1));
|
|
Assert.That(output[0].TryGetStructure(out ArrayOf<AliasNameDataType> aliases), Is.True);
|
|
Assert.That(aliases.Count, Is.EqualTo(1));
|
|
Assert.That(aliases[0].AliasName.Name, Is.EqualTo(kAliasName));
|
|
Assert.That(aliases[0].ReferencedNodes, Is.EqualTo(new[] { new ExpandedNodeId(targetId) }));
|
|
}
|
|
|
|
private const string kAliasName = "Temperature";
|
|
private const string kTargetName = "TemperatureValue";
|
|
|
|
private AliasNameStoreRegistry m_registry;
|
|
private InMemoryAliasNameStore m_store;
|
|
private IServerInternal m_server;
|
|
private ApplicationConfiguration m_configuration;
|
|
}
|
|
}
|