mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-22 01:26:20 +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>
292 lines
12 KiB
C#
292 lines
12 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/
|
|
* ======================================================================*/
|
|
|
|
#pragma warning disable CA2000
|
|
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using Microsoft.Extensions.Logging;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Server.Fluent;
|
|
|
|
namespace Opc.Ua.Server.Tests.Fluent
|
|
{
|
|
/// <summary>
|
|
/// Verifies that fluent create-if-missing paths register new children with a real
|
|
/// <see cref="AsyncCustomNodeManager"/> (the mock-backed tests exercise
|
|
/// only the node-attachment path).
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Fluent")]
|
|
public class FluentNodeRegistrationTests
|
|
{
|
|
private const string TestNamespaceUri = "http://test.org/UA/FluentRegistration/";
|
|
|
|
[Test]
|
|
public void WithPropertyCreateRegistersNewPropertyWithManager()
|
|
{
|
|
using Harness h = CreateHarness();
|
|
ushort ns = h.Manager.NamespaceIndexes[0];
|
|
var rootId = new NodeId("Root", ns);
|
|
|
|
INodeBuilder nb = h.Builder.Node(rootId);
|
|
nb.WithProperty("NewProp", 42);
|
|
|
|
// the NodeId is whatever the manager's factory minted, so the
|
|
// property is located by browse name rather than by a literal id.
|
|
PropertyState created = FindRegisteredProperty(h, "NewProp");
|
|
Assert.That(created, Is.Not.Null);
|
|
Assert.That(created!.WrappedValue.AsBoxedObject(), Is.EqualTo(42));
|
|
Assert.That(created.DataType, Is.EqualTo(DataTypeIds.Int32));
|
|
}
|
|
|
|
[Test]
|
|
public void WithPropertyCreateWithConfigureRegistersWritableProperty()
|
|
{
|
|
using Harness h = CreateHarness();
|
|
ushort ns = h.Manager.NamespaceIndexes[0];
|
|
|
|
INodeBuilder nb = h.Builder.Node(new NodeId("Root", ns));
|
|
nb.WithProperty("Flag", Variant.From(true), p => p.Writable());
|
|
|
|
PropertyState created = FindRegisteredProperty(h, "Flag");
|
|
Assert.That(created, Is.Not.Null);
|
|
Assert.That(
|
|
created!.AccessLevel & AccessLevels.CurrentWrite,
|
|
Is.EqualTo(AccessLevels.CurrentWrite));
|
|
}
|
|
|
|
[Test]
|
|
public void WithUnitsCreatesAndRegistersReadableAnalogProperties()
|
|
{
|
|
using Harness h = CreateHarness();
|
|
var units = new EUInformation(
|
|
"Pa",
|
|
"Pascal",
|
|
"http://www.opcfoundation.org/UA/units/un/cefact");
|
|
IVariableBuilder<double> variable = h.Builder.Variable<double>(h.Analog.NodeId);
|
|
|
|
variable.WithUnits(units, min: 0, max: 1_000_000);
|
|
|
|
PropertyState<EUInformation> engineeringUnits = h.Analog.EngineeringUnits!;
|
|
PropertyState<Range> euRange = h.Analog.EURange!;
|
|
AssertRegisteredProperty(
|
|
h,
|
|
engineeringUnits,
|
|
BrowseNames.EngineeringUnits,
|
|
DataTypeIds.EUInformation);
|
|
AssertRegisteredProperty(
|
|
h,
|
|
euRange,
|
|
BrowseNames.EURange,
|
|
DataTypeIds.Range);
|
|
Assert.That(engineeringUnits.Value, Is.SameAs(units));
|
|
Assert.That(euRange.Value.Low, Is.Zero);
|
|
Assert.That(euRange.Value.High, Is.EqualTo(1_000_000));
|
|
|
|
int predefinedNodeCount = h.Manager.PredefinedNodes.Count;
|
|
var replacementUnits = new EUInformation("K", "Kelvin", "http://unit.test/");
|
|
|
|
variable.WithUnits(replacementUnits, min: 100, max: 200);
|
|
|
|
Assert.That(h.Analog.EngineeringUnits, Is.SameAs(engineeringUnits));
|
|
Assert.That(h.Analog.EURange, Is.SameAs(euRange));
|
|
Assert.That(h.Manager.PredefinedNodes, Has.Count.EqualTo(predefinedNodeCount));
|
|
Assert.That(engineeringUnits.Value, Is.SameAs(replacementUnits));
|
|
Assert.That(euRange.Value.Low, Is.EqualTo(100));
|
|
Assert.That(euRange.Value.High, Is.EqualTo(200));
|
|
|
|
var children = new List<BaseInstanceState>();
|
|
h.Analog.GetChildren(h.Manager.SystemContext, children);
|
|
Assert.That(
|
|
children
|
|
.Where(child => child.BrowseName.Name == BrowseNames.EngineeringUnits)
|
|
.ToList(),
|
|
Has.Count.EqualTo(1));
|
|
Assert.That(
|
|
children
|
|
.Where(child => child.BrowseName.Name == BrowseNames.EURange)
|
|
.ToList(),
|
|
Has.Count.EqualTo(1));
|
|
}
|
|
|
|
private static void AssertRegisteredProperty<TValue>(
|
|
Harness harness,
|
|
PropertyState<TValue> property,
|
|
string browseName,
|
|
NodeId dataType)
|
|
{
|
|
Assert.That(property.NodeClass, Is.EqualTo(NodeClass.Variable));
|
|
Assert.That(property.BrowseName, Is.EqualTo(new QualifiedName(browseName)));
|
|
Assert.That(property.TypeDefinitionId, Is.EqualTo(VariableTypeIds.PropertyType));
|
|
Assert.That(property.DataType, Is.EqualTo(dataType));
|
|
Assert.That(property.ValueRank, Is.EqualTo(ValueRanks.Scalar));
|
|
Assert.That(
|
|
harness.Manager.FindPredefinedNodePublic<PropertyState<TValue>>(property.NodeId),
|
|
Is.SameAs(property));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns the property the fluent surface registered under the
|
|
/// supplied browse name, whatever NodeId the manager minted for it.
|
|
/// </summary>
|
|
private static PropertyState FindRegisteredProperty(Harness h, string browseName)
|
|
{
|
|
foreach (NodeState node in h.Manager.PredefinedNodes.Values)
|
|
{
|
|
if (node is PropertyState property &&
|
|
property.BrowseName.Name == browseName)
|
|
{
|
|
return property;
|
|
}
|
|
}
|
|
|
|
// returning null here would surface as a NullReferenceException
|
|
// somewhere in the caller's assertions rather than as the real
|
|
// failure, which is that the property was never registered.
|
|
Assert.Fail($"No registered property named '{browseName}'.");
|
|
return null!;
|
|
}
|
|
|
|
private static Harness CreateHarness()
|
|
{
|
|
var mockServer = new Mock<IServerInternal>();
|
|
var mockLogger = new Mock<ILogger>();
|
|
var mockMasterNodeManager = new Mock<IMasterNodeManager>();
|
|
var mockConfigurationNodeManager = new Mock<IConfigurationNodeManager>();
|
|
|
|
var namespaceTable = new NamespaceTable();
|
|
namespaceTable.Append(TestNamespaceUri);
|
|
|
|
mockServer.Setup(s => s.NamespaceUris).Returns(namespaceTable);
|
|
mockServer.Setup(s => s.ServerUris).Returns(new StringTable());
|
|
mockServer.Setup(s => s.TypeTree).Returns(new TypeTable(namespaceTable));
|
|
mockServer.Setup(s => s.Factory).Returns(EncodeableFactory.Create());
|
|
mockServer.Setup(s => s.NodeManager).Returns(mockMasterNodeManager.Object);
|
|
mockMasterNodeManager.Setup(m => m.ConfigurationNodeManager)
|
|
.Returns(mockConfigurationNodeManager.Object);
|
|
|
|
var mockTelemetry = new Mock<ITelemetryContext>();
|
|
mockServer.Setup(s => s.Telemetry).Returns(mockTelemetry.Object);
|
|
|
|
var serverSystemContext = new ServerSystemContext(mockServer.Object);
|
|
mockServer.Setup(s => s.DefaultSystemContext).Returns(serverSystemContext);
|
|
|
|
var configuration = new ApplicationConfiguration
|
|
{
|
|
ServerConfiguration = new ServerConfiguration()
|
|
};
|
|
|
|
var manager = new FluentRegistrationTestNodeManager(
|
|
mockServer.Object, configuration, mockLogger.Object, TestNamespaceUri);
|
|
|
|
ushort ns = manager.NamespaceIndexes[0];
|
|
var root = new BaseObjectState(null)
|
|
{
|
|
NodeId = new NodeId("Root", ns),
|
|
BrowseName = new QualifiedName("Root", ns),
|
|
DisplayName = new LocalizedText("Root")
|
|
};
|
|
|
|
var analog = AnalogItemState<double>.With<VariantBuilder>(root);
|
|
analog.NodeId = new NodeId("Root.Analog", ns);
|
|
analog.BrowseName = new QualifiedName("Analog", ns);
|
|
analog.DisplayName = new LocalizedText("Analog");
|
|
analog.DataType = DataTypeIds.Double;
|
|
analog.ValueRank = ValueRanks.Scalar;
|
|
root.AddChild(analog);
|
|
|
|
manager.AddPredefinedNodeSynchronouslyPublic(root);
|
|
|
|
var builder = new NodeManagerBuilder(
|
|
serverSystemContext,
|
|
nodeManager: manager,
|
|
defaultNamespaceIndex: ns,
|
|
rootResolver: q => manager.PredefinedNodes.Values
|
|
.FirstOrDefault(node => node.BrowseName == q)!,
|
|
nodeIdResolver: id => manager.PredefinedNodes.TryGetValue(
|
|
id,
|
|
out NodeState? node) ? node : null!,
|
|
typeIdResolver: _ => []);
|
|
|
|
return new Harness(manager, builder, analog);
|
|
}
|
|
|
|
private sealed class Harness : System.IDisposable
|
|
{
|
|
public Harness(
|
|
FluentRegistrationTestNodeManager manager,
|
|
NodeManagerBuilder builder,
|
|
AnalogItemState<double> analog)
|
|
{
|
|
Manager = manager;
|
|
Builder = builder;
|
|
Analog = analog;
|
|
}
|
|
|
|
public FluentRegistrationTestNodeManager Manager { get; }
|
|
|
|
public NodeManagerBuilder Builder { get; }
|
|
|
|
public AnalogItemState<double> Analog { get; }
|
|
|
|
public void Dispose()
|
|
{
|
|
Manager.Dispose();
|
|
}
|
|
}
|
|
|
|
private sealed class FluentRegistrationTestNodeManager : AsyncCustomNodeManager
|
|
{
|
|
public FluentRegistrationTestNodeManager(
|
|
IServerInternal server,
|
|
ApplicationConfiguration configuration,
|
|
ILogger logger,
|
|
params string[] namespaceUris)
|
|
: base(server, configuration, logger, namespaceUris)
|
|
{
|
|
}
|
|
|
|
public new NodeIdDictionary<NodeState> PredefinedNodes => base.PredefinedNodes;
|
|
|
|
public void AddPredefinedNodeSynchronouslyPublic(NodeState node)
|
|
{
|
|
AddPredefinedNodeSynchronously(node);
|
|
}
|
|
|
|
public TNode FindPredefinedNodePublic<TNode>(NodeId nodeId)
|
|
where TNode : NodeState
|
|
{
|
|
return FindPredefinedNode<TNode>(nodeId)!;
|
|
}
|
|
}
|
|
}
|
|
}
|