mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-20 00:31:32 +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>
241 lines
8.7 KiB
C#
241 lines
8.7 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/
|
|
* ======================================================================*/
|
|
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Server.Tests
|
|
{
|
|
/// <summary>
|
|
/// Tests for <see cref="AggregateManager"/>.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Aggregators")]
|
|
[Parallelizable]
|
|
public class AggregateManagerTests
|
|
{
|
|
private ITelemetryContext m_telemetry;
|
|
private Mock<IServerInternal> m_server;
|
|
private Mock<IDiagnosticsNodeManager> m_diagnostics;
|
|
|
|
[SetUp]
|
|
public void SetUp()
|
|
{
|
|
m_telemetry = NUnitTelemetryContext.Create();
|
|
m_diagnostics = new Mock<IDiagnosticsNodeManager>();
|
|
m_diagnostics
|
|
.Setup(d => d.AddAggregateFunctionAsync(
|
|
It.IsAny<NodeId>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()))
|
|
.Returns(new ValueTask());
|
|
m_server = new Mock<IServerInternal>();
|
|
m_server.SetupGet(s => s.Telemetry).Returns(m_telemetry);
|
|
m_server.SetupGet(s => s.DiagnosticsNodeManager).Returns(m_diagnostics.Object);
|
|
}
|
|
|
|
private AggregateManager CreateManager()
|
|
{
|
|
return new AggregateManager(m_server.Object);
|
|
}
|
|
|
|
[Test]
|
|
public void IsSupportedReturnsFalseForNullAggregateId()
|
|
{
|
|
using AggregateManager manager = CreateManager();
|
|
|
|
Assert.That(manager.IsSupported(NodeId.Null), Is.False);
|
|
}
|
|
|
|
[Test]
|
|
public void IsSupportedReturnsFalseForUnknownAggregateId()
|
|
{
|
|
using AggregateManager manager = CreateManager();
|
|
|
|
Assert.That(manager.IsSupported(new NodeId(9999)), Is.False);
|
|
}
|
|
|
|
[Test]
|
|
public void MinimumProcessingIntervalRoundTrips()
|
|
{
|
|
using AggregateManager manager = CreateManager();
|
|
|
|
Assert.That(manager.MinimumProcessingInterval, Is.EqualTo(1000));
|
|
|
|
manager.MinimumProcessingInterval = 250;
|
|
|
|
Assert.That(manager.MinimumProcessingInterval, Is.EqualTo(250));
|
|
}
|
|
|
|
[Test]
|
|
public void GetDefaultConfigurationReturnsPart13Defaults()
|
|
{
|
|
using AggregateManager manager = CreateManager();
|
|
|
|
AggregateConfiguration configuration = manager.GetDefaultConfiguration(NodeId.Null);
|
|
|
|
Assert.That(configuration.TreatUncertainAsBad, Is.True);
|
|
Assert.That(configuration.PercentDataBad, Is.EqualTo(100));
|
|
Assert.That(configuration.PercentDataGood, Is.EqualTo(100));
|
|
Assert.That(configuration.UseSlopedExtrapolation, Is.False);
|
|
}
|
|
|
|
[Test]
|
|
public void SetDefaultConfigurationIsReturnedByGetDefaultConfiguration()
|
|
{
|
|
using AggregateManager manager = CreateManager();
|
|
var custom = new AggregateConfiguration
|
|
{
|
|
PercentDataBad = 50,
|
|
PercentDataGood = 60,
|
|
TreatUncertainAsBad = false,
|
|
UseSlopedExtrapolation = true,
|
|
UseServerCapabilitiesDefaults = false
|
|
};
|
|
|
|
manager.SetDefaultConfiguration(custom);
|
|
|
|
Assert.That(manager.GetDefaultConfiguration(NodeId.Null), Is.SameAs(custom));
|
|
}
|
|
|
|
[Test]
|
|
public void CreateCalculatorReturnsNullForNullAggregateId()
|
|
{
|
|
using AggregateManager manager = CreateManager();
|
|
|
|
IAggregateCalculator calculator = manager.CreateCalculator(
|
|
NodeId.Null,
|
|
new DateTimeUtc(2024, 1, 1, 0, 0, 0),
|
|
new DateTimeUtc(2024, 1, 1, 0, 1, 0),
|
|
1000,
|
|
false,
|
|
manager.GetDefaultConfiguration(NodeId.Null))!;
|
|
|
|
Assert.That(calculator, Is.Null);
|
|
}
|
|
|
|
[Test]
|
|
public void CreateCalculatorReturnsNullForUnknownAggregateId()
|
|
{
|
|
using AggregateManager manager = CreateManager();
|
|
|
|
IAggregateCalculator calculator = manager.CreateCalculator(
|
|
new NodeId(9999),
|
|
new DateTimeUtc(2024, 1, 1, 0, 0, 0),
|
|
new DateTimeUtc(2024, 1, 1, 0, 1, 0),
|
|
1000,
|
|
false,
|
|
manager.GetDefaultConfiguration(NodeId.Null))!;
|
|
|
|
Assert.That(calculator, Is.Null);
|
|
}
|
|
|
|
[Test]
|
|
public async Task RegisterFactoryAsyncMakesAggregateSupportedAndCreatable()
|
|
{
|
|
using AggregateManager manager = CreateManager();
|
|
NodeId aggregateId = ObjectIds.AggregateFunction_Average;
|
|
var configuration = new AggregateConfiguration
|
|
{
|
|
PercentDataBad = 100,
|
|
PercentDataGood = 100,
|
|
TreatUncertainAsBad = false,
|
|
UseSlopedExtrapolation = false,
|
|
UseServerCapabilitiesDefaults = false
|
|
};
|
|
|
|
await manager.RegisterFactoryAsync(
|
|
aggregateId,
|
|
"Average",
|
|
(a, s, e, p, stepped, c, t) => new AverageAggregateCalculator(a, s, e, p, stepped, c, t),
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(manager.IsSupported(aggregateId), Is.True);
|
|
|
|
IAggregateCalculator calculator = manager.CreateCalculator(
|
|
aggregateId,
|
|
new DateTimeUtc(2024, 1, 1, 0, 0, 0),
|
|
new DateTimeUtc(2024, 1, 1, 0, 1, 0),
|
|
1000,
|
|
false,
|
|
configuration)!;
|
|
|
|
Assert.That(calculator, Is.Not.Null);
|
|
m_diagnostics.Verify(
|
|
d => d.AddAggregateFunctionAsync(aggregateId, "Average", true, It.IsAny<CancellationToken>()),
|
|
Times.Once);
|
|
}
|
|
|
|
[Test]
|
|
public async Task CreateCalculatorUsesServerCapabilitiesDefaultsWhenRequested()
|
|
{
|
|
using AggregateManager manager = CreateManager();
|
|
NodeId aggregateId = ObjectIds.AggregateFunction_Average;
|
|
await manager.RegisterFactoryAsync(
|
|
aggregateId,
|
|
"Average",
|
|
(a, s, e, p, stepped, c, t) => new AverageAggregateCalculator(a, s, e, p, stepped, c, t),
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
|
|
var configuration = new AggregateConfiguration
|
|
{
|
|
UseServerCapabilitiesDefaults = true
|
|
};
|
|
|
|
IAggregateCalculator calculator = manager.CreateCalculator(
|
|
aggregateId,
|
|
new DateTimeUtc(2024, 1, 1, 0, 0, 0),
|
|
new DateTimeUtc(2024, 1, 1, 0, 1, 0),
|
|
1000,
|
|
false,
|
|
configuration)!;
|
|
|
|
Assert.That(calculator, Is.Not.Null);
|
|
}
|
|
|
|
[Test]
|
|
public async Task RegisterFactoryRemovesAggregateSupport()
|
|
{
|
|
using AggregateManager manager = CreateManager();
|
|
NodeId aggregateId = ObjectIds.AggregateFunction_Average;
|
|
await manager.RegisterFactoryAsync(
|
|
aggregateId,
|
|
"Average",
|
|
(a, s, e, p, stepped, c, t) => new AverageAggregateCalculator(a, s, e, p, stepped, c, t),
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
Assert.That(manager.IsSupported(aggregateId), Is.True);
|
|
|
|
manager.RegisterFactory(aggregateId);
|
|
|
|
Assert.That(manager.IsSupported(aggregateId), Is.False);
|
|
}
|
|
}
|
|
}
|